Changeset 2146 for trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModel.java

Timestamp:

05/19/17 11:31:29 (7 years ago)

Author:

pharms

Message:

• refactored GUI model so that hierarchical event target structures can also be used and created by plugins not being strictly for GUIs

File:

• trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModel.java (modified) (3 diffs)

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModel.java

@@ -25 +25 @@
 
 import de.ugoe.cs.autoquest.CommandHelpers;
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
@@ -445 +446 @@
                 //System.out.println(indent + "merging " + mergeResult + " and " +
                 //                   similarGUIElements.get(1).similarGUIElement);
-                mergeResult = model.mergeGUIElements
+                mergeResult = model.mergeEventTargets
                         (mergeResult, similarGUIElements.remove(1).similarGUIElement, false);
             }
@@ -492 +493 @@
         
         //System.out.println(indent + "grouping: " + guiElementsToGroup);
-        IGUIElement group = model.groupGUIElements(guiElementsToGroup, getGroupName(cluster));
+        IGUIElement group = model.groupEventTargets
+            (guiElementsToGroup, getGroupName(cluster), GUIElementFactory.getInstance());
         //System.out.println(indent + "  created group for " + cluster + ": " + group);