Changeset 588 for trunk

Timestamp:

08/23/12 09:08:47 (12 years ago)

Author:

sherbold

Message:

• updated JFC GUI mappings
• changed JFCGUIElementSpec to store the elementHash as String instead of int. The reason for this is a problem that Integer.parseInt() that can occur with handling of negative hexadecimal values.

Location:

trunk/quest-plugin-jfc

Files:

• data/guimappings/guimapping-argouml.txt (modified) (1 diff)
• data/guimappings/guimapping-swing.txt (modified) (1 diff)
• src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java (modified) (2 diffs)
• src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElement.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElementSpec.java (modified) (4 diffs)

trunk/quest-plugin-jfc/data/guimappings/guimapping-argouml.txt

@@ -18 +18 @@
 org.argouml.core.propertypanels.ui.UMLTextField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
 org.argouml.core.propertypanels.ui.UMLComboBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+org.argouml.ui.explorer.DnDExplorerTree = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+org.argouml.ui.NavigatorPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+org.argouml.ui.explorer.PerspectiveComboBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement

trunk/quest-plugin-jfc/data/guimappings/guimapping-swing.txt

@@ -15 +15 @@
 sun.swing.FilePane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
 sun.swing.FilePane$3 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+javax.swing.plaf.metal.MetalComboBoxButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+javax.swing.JButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCButton

trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java

@@ -347 +347 @@
                     }
                     else if ("hash".equals(atts.getValue("name"))) {
-                        currentGuiElementSpec.setElementHash
-                            (Integer.parseInt(atts.getValue("value"), 16));
+                        currentGuiElementSpec.setElementHash(atts.getValue("value"));
                     }
                 }
@@ -654 +653 @@
             currentGuiElementSpec.setIcon("unknown");
             currentGuiElementSpec.setIndex(-1);
-            currentGuiElementSpec.setElementHash(-1);
+            currentGuiElementSpec.setElementHash("-1");
         }
         catch (Exception e)

trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElement.java

@@ -75 +75 @@
      * @return the hashCode
      */
-    int getElementHash() {
+    String getElementHash() {
         return specification.getElementHash();
     }

trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElementSpec.java

@@ -19 +19 @@
 
     /** */
-    private String name;
+    private String name = null;
     
     /** */
-    private String type;
+    private String type = null;
     
     /** */
-    private String icon;
+    private String icon = null;
     
     /** */
-    private int index;
+    private int index = -1;
     
     /** */
-    private int elementHash;
+    private String elementHash = null;
     
     /* (non-Javadoc)
@@ -67 +67 @@
         }
 
-        if (elementHash == otherSpec.elementHash) {
+        if (elementHash == otherSpec.elementHash || ((elementHash!=null) && elementHash.equals(otherSpec.elementHash))) {
             result += 15;
         }
@@ -129 +129 @@
      * @return the elementHash
      */
-    public int getElementHash() {
+    public String getElementHash() {
         return elementHash;
     }
@@ -164 +164 @@
      * @param elementHash the elementHash to set
      */
-    public void setElementHash(int elementHash) {
+    public void setElementHash(String elementHash) {
         this.elementHash = elementHash;
     }