Changeset 61

Show
Ignore:
Timestamp:
03/04/10 22:17:08 (6 months ago)
Author:
jd
Message:

- bugfix in breakpoint editor

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • kahina/trunk/src/org/kahina/gui/breakpoint/BooleanConnectorPanel.java

    r38 r61  
    2222import org.kahina.control.event.KahinaEvent; 
    2323 
    24 public class BooleanConnectorPanel extends JPanel implements MouseListener, 
    25         KahinaListener 
     24public class BooleanConnectorPanel extends JPanel implements MouseListener, KahinaListener 
    2625{ 
    27     KahinaController control; 
    28      
    29     SingleNodeConstraintPanel nodeConstPanel; 
    30      
    31     Map<TreeNodePattern, Integer> xCoord; 
    32      
     26    KahinaController control;  
     27    SingleNodeConstraintPanel nodeConstPanel;    
     28    Map<TreeNodePattern, Integer> xCoord;  
    3329    Map<TreeNodePattern, Integer> yCoord; 
    3430     
    35     int xDim; 
    36      
     31    int xDim;  
    3732    int yDim; 
    3833     
    …… 
    4237    private int nodeSelectionMode; 
    4338     
    44     public BooleanConnectorPanel(SingleNodeConstraintPanel nodeConstPanel, 
    45             KahinaController control) 
     39    public BooleanConnectorPanel(SingleNodeConstraintPanel nodeConstPanel, KahinaController control) 
    4640    { 
    4741        this.control = control; 
    …… 
    10397                    break; 
    10498                } 
    105                     // boolean connectives with two arguments 
    106                     // (since atomic pattern should already have received their 
    107                     // coordinates) 
     99                // this only concerns boolean connectives with two arguments 
     100                // (since atomic pattern should already have received their 
     101                // coordinates) 
    108102                default: 
    109103                { 
    …… 
    365359                            nodeConstPanel.hint("Add or a remove a constraint, or select a connective."); 
    366360                        } 
    367                         control.processEvent(new BreakpointEditorEvent(BreakpointEditorEvent.CHANGE_NODE_SELECTION_MODE,BreakpointEditPanel.NO_PENDING_OPERATION)); 
     361                        control.processEvent(new BreakpointEditorEvent(BreakpointEditorEvent.CHANGE_NODE_SELECTION_MODE, BreakpointEditPanel.NO_PENDING_OPERATION)); 
    368362                    } 
    369363                    else if (nodeSelectionMode == BreakpointEditPanel.PENDING_OR_OPERATION) 

  • kahina/trunk/src/org/kahina/gui/breakpoint/SingleNodeConstraintPanel.java

    r40 r61  
    369369        boolPanel.markedPattern = neg; 
    370370        displayChangeInConnectiveStructure(); 
     371        announceUpdate(); 
     372        synchronizeEditors(); 
    371373    } 
    372374     
    …… 
    462464        TreeNodePattern rightAncestor = arg2; 
    463465        if (rightAncestor == arg1) return false; 
    464         while (rightAncestor == null && rightAncestor != getRootPattern()) 
     466        while (rightAncestor != null && rightAncestor != getRootPattern()) 
    465467        { 
    466468            rightAncestor = parentPatterns.get(rightAncestor); 
    …… 
    479481    private void removeFromStructureWithoutBreakingIt(TreeNodePattern arg1) 
    480482    { 
     483        if (getRootPattern() == arg1 && arg1.getLeftArgument() == null) 
     484        { 
     485            virtualRootPattern = new TreeNodePattern(); 
     486            parentPatterns.remove(arg1); 
     487            return; 
     488        } 
    481489        TreeNodePattern node = arg1; 
    482490        TreeNodePattern parent = parentPatterns.get(arg1);