Creating CogTool's first unit tests

java/edu/cmu/cs/hcii/cogtool/model/Design.java

@@ -666,7 +666,7 @@ public static class FrameSetChange extends EventObject
          * Initialize the semantic change representing an add or a remove.
          *
          * @param design    the design that was modified
-         * @param frames    the frames added or removed
+         * @param frameChg    the frames added or removed
          * @param add       a flag indicating whether the change is an add
          *                  or a remove
          * @author mlh

java/edu/cmu/cs/hcii/cogtool/model/DesignTest.java

@@ -0,0 +1,27 @@
+package edu.cmu.cs.hcii.cogtool.model;
+
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+public class DesignTest {
+
+    private String designName = "My First Design";
+    Set<DeviceType> deviceTypeSet = new HashSet<DeviceType>();
+    private Design aDesign = new Design(designName, deviceTypeSet);
+
+    @Test
+    public void getName() {
+        assertEquals(designName, aDesign.getName());
+    }
+
+    @Test
+    public void setName() {
+        String designName = "My Second Design";
+        aDesign.setName(designName);
+        assertEquals(designName, aDesign.name);
+    }
+}

java/edu/cmu/cs/hcii/cogtool/ui/DesignEditorUI.java

@@ -168,7 +168,7 @@ protected class FrameNameEditor extends SWTTextEditor
     {
         public FrameNameEditor()
         {
-            super(view.getEditor().getSWTEditorSubstrate(), CENTER_TEXT);
+            super(DesignEditorUI.this.view.getEditor().getSWTEditorSubstrate(), CENTER_TEXT);
         }
 
         @Override

java/edu/cmu/cs/hcii/cogtool/ui/DesignEditorUITest.java

@@ -0,0 +1,26 @@
+package edu.cmu.cs.hcii.cogtool.ui;
+
+import edu.cmu.cs.hcii.cogtool.model.Design;
+import edu.cmu.cs.hcii.cogtool.model.DeviceType;
+import edu.cmu.cs.hcii.cogtool.model.Project;
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+public class DesignEditorUITest {
+
+    @Test
+    public void buildWindowMenuLabel() {
+        Project aProject = new Project("My First Project");
+
+        String designName = "My First Design";
+        Set<DeviceType> deviceTypeSet = new HashSet<DeviceType>();
+        Design aDesign = new Design(designName, deviceTypeSet);
+
+        DesignEditorUI anEditorUI = new DesignEditorUI(aDesign,aProject, null);
+        assertEquals("Design: " + designName, anEditorUI.buildWindowMenuLabel(aDesign));
+    }
+}

java/edu/cmu/cs/hcii/cogtool/ui/FrameEditorUI.java

@@ -1055,7 +1055,7 @@ protected class WidgetTitleEditor extends SWTTextEditor
     {
         public WidgetTitleEditor()
         {
-            super(view.getEditor().getSWTEditorSubstrate(), LEFT_JUSTIFY);
+            super(FrameEditorUI.this.view.getEditor().getSWTEditorSubstrate(), LEFT_JUSTIFY);
         }
 
         @Override

java/edu/cmu/cs/hcii/cogtool/ui/UI.java

@@ -671,7 +671,6 @@ public void setEnabled(CogToolLID id, Boolean availability, boolean enable)
      * @param newLabel if not null, the new label to use for the user interface
      *                 widgets associated with the given id that support labels
      * @author mlh
-     * @see ListenerIdentifierMap.getWidgets
      */
 
     public void setEnabled(CogToolLID id,
@@ -700,7 +699,6 @@ public void setEnabled(CogToolLID id,
      *                 widgets associated with the given id that support labels
      * @param selected for all associated widgets that are MenuItems set
      *                 their selection state to this
-     * @see ListenerIdentifierMap.getWidgets
      */
     public void setEnabled(CogToolLID id,
                            Boolean availability,
@@ -1250,8 +1248,6 @@ protected boolean doesIDCommitChanges(ListenerIdentifier lid)
      * from the appropriate IUndoableEdit from the given undo manager.
      *
      * @param lid the CogTool command being queried
-     * @param undoMgr the window's undo manager in case the given LID is
-     *                CogToolLID.Undo or CogToolLID.Redo
      * @return whether the given LID is a CogToolLID that
      *         can cause selection
      */

java/edu/cmu/cs/hcii/cogtool/view/ActionPropertySet.java

@@ -1169,7 +1169,7 @@ protected void onFocus()
                 {
                     super.onFocus();
 
-                    view.getTransmuter().setLIDEnabledState();
+                    ActionPropertySet.this.view.getTransmuter().setLIDEnabledState();
                 }
 
                 @Override
@@ -1182,7 +1182,7 @@ protected boolean doChangeAction()
                         labelSelection = null;
                     }
 
-                    if (view.performAction(DesignEditorLID.ChangeDelay)) {
+                    if (ActionPropertySet.this.view.performAction(DesignEditorLID.ChangeDelay)) {
                         if (labelSelection != null) {
                             setSelection(labelSelection);
                         }
@@ -1208,7 +1208,7 @@ protected void onFocus()
                 {
                     super.onFocus();
 
-                    view.getTransmuter().setLIDEnabledState();
+                    ActionPropertySet.this.view.getTransmuter().setLIDEnabledState();
                 }
 
                 @Override
@@ -1229,7 +1229,7 @@ protected boolean doChangeAction()
                         delaySelection = null;
                     }
 
-                    if (view.performAction(DesignEditorLID.ChangeDelay)) {
+                    if (ActionPropertySet.this.view.performAction(DesignEditorLID.ChangeDelay)) {
                         if (delaySelection != null) {
                             setSelection(delaySelection);
                         }
@@ -1340,7 +1340,7 @@ protected void onFocus()
                 {
                     super.onFocus();
 
-                    view.getTransmuter().setLIDEnabledState();
+                    ActionPropertySet.this.view.getTransmuter().setLIDEnabledState();
                 }
 
                 @Override
@@ -1351,7 +1351,7 @@ protected boolean doChangeAction()
                     DesignEditorUI.DesignRenameParameters parms =
                         new DesignEditorUI.DesignRenameParameters(design, designName.getText());
 
-                    boolean changed = view.performAction(ProjectLID.RenameDesign,
+                    boolean changed = ActionPropertySet.this.view.performAction(ProjectLID.RenameDesign,
                                                          parms,
                                                          true);
 

java/edu/cmu/cs/hcii/cogtool/view/FramePropertiesPane.java

@@ -155,13 +155,17 @@ public class FramePropertiesPane extends Composite
     private TreeItemUpdater<FrameElementGroup, FrameElement> eltGroupUpdater;
     private TreeItemUpdater<SimpleWidgetGroup, IWidget> implicitGroupUpdater;
 
+    protected View view;
+
     public FramePropertiesPane(Composite parent, int style, View view)
     {
         super(parent, style);
 
         setLayout(new FormLayout());
 
-        createWidgets(view);
+        this.view = view;
+
+        createWidgets();
         layOutWidgets();
     }
 
@@ -234,7 +238,7 @@ protected void layOutWidgets()
         }
     }
 
-    protected void createWidgets(final View view)
+    protected void createWidgets()
     {
         ListenerIdentifierMap lidMap = view.getLIDMap();
 
@@ -249,7 +253,7 @@ protected void onFocus()
                 {
                     super.onFocus();
 
-                    view.getTransmuter().setLIDEnabledState();
+                    FramePropertiesPane.this.view.getTransmuter().setLIDEnabledState();
                 }
 
                 @Override
@@ -259,7 +263,7 @@ protected boolean doChangeAction()
                     DesignEditorUI.FrameRenameParameters evt =
                         new DesignEditorUI.FrameRenameParameters(frame, getText());
                     boolean changed =
-                        view.performAction(DesignEditorLID.RenameFrame,
+                        FramePropertiesPane.this.view.performAction(DesignEditorLID.RenameFrame,
                                            evt,
                                            true);
 

java/edu/cmu/cs/hcii/cogtool/view/WidgetPropertiesPane.java

@@ -164,7 +164,7 @@ public WidgetChangeText(Composite parent,
          * If no widgets are selected, suppresses the event.
          *
          * IE: raise an LID event.
-         * @param e
+         * @param focusRule
          */
         @Override
         public boolean confirm(int focusRule)
@@ -563,9 +563,9 @@ protected boolean doChangeAction()
 
                     FrameEditorUI.SetRemoteLabelTypeParms setTypeParms =
                         new FrameEditorUI.SetRemoteLabelTypeParms(widgetTypeChoices[selectedType],
-                                                    view.selection.getSelectedIWidgets()[0]);
+                                WidgetPropertiesPane.this.view.selection.getSelectedIWidgets()[0]);
 
-                    return view.performAction(FrameEditorLID.SetRemoteLabelType,
+                    return WidgetPropertiesPane.this.view.performAction(FrameEditorLID.SetRemoteLabelType,
                                               setTypeParms,
                                               true);
                 }