Changeset 2168 for trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowGuiModelDialog.java

Timestamp:

09/07/17 16:26:46 (7 years ago)

Author:

pharms

Message:

• changes for first VR oriented usability evaluation

File:

• trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowGuiModelDialog.java (modified) (3 diffs)

trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowGuiModelDialog.java

@@ -28 +28 @@
 import org.eclipse.swt.widgets.TreeItem;
 
+import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetModel;
 import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTarget;
 import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 import de.ugoe.cs.util.console.Console;
 
@@ -91 +90 @@
         btnCollapseAll.setText("Collapse all");
         
-        if (model instanceof GUIModel) {
+        if (model instanceof HierarchicalEventTargetModel) {
             Button btnCondense = new Button(shell, SWT.NONE);
             btnCondense.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {
-                    ((GUIModel) model).condenseModel();
+                    ((HierarchicalEventTargetModel<?>) model).condenseModel();
                     targetTree.removeAll();
                     buildTargetTree();
@@ -189 +188 @@
         try {
             // try to merge the elements
-            IGUIElement firstElement = (IGUIElement) selectedNodes[0].getData();
+            T firstElement = (T) selectedNodes[0].getData();
             for( int i=1 ; i<selectedNodes.length ; i++ ) {
-                ((GUIModel) model).mergeEventTargets
-                    (firstElement, (IGUIElement) selectedNodes[i].getData());
+                ((HierarchicalEventTargetModel<T>) model).mergeEventTargets
+                    (firstElement, (T) selectedNodes[i].getData());
             }
         }