Changeset 606

Timestamp:

08/23/12 14:46:41 (12 years ago)

Author:

sherbold

Message:

• reimplemented toString() JFCGUIElement and all its children. The output is now very verbose and detailed.

Location:

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

Files:

• JFCButton.java (modified) (1 diff)
• JFCCanvas.java (modified) (1 diff)
• JFCDialog.java (modified) (1 diff)
• JFCFrame.java (modified) (1 diff)
• JFCGUIElement.java (modified) (1 diff)
• JFCMenu.java (modified) (1 diff)
• JFCMenuBar.java (modified) (1 diff)
• JFCMenuButton.java (modified) (1 diff)
• JFCPanel.java (modified) (1 diff)
• JFCScrollBar.java (modified) (1 diff)
• JFCScrollPane.java (modified) (1 diff)
• JFCShape.java (modified) (1 diff)
• JFCSplitPane.java (modified) (1 diff)
• JFCTabbedPane.java (modified) (1 diff)
• JFCTextField.java (modified) (1 diff)
• JFCToolBar.java (modified) (1 diff)

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "Button(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "Button";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "Canvas(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "Canvas";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "Dialog(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "Dialog";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "Frame(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "Frame";
     }
 

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

@@ -91 +91 @@
         }
     }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        String str = getElementDescriptor() + "(" + getName() + ", " + getElementHash() + "," + getIcon() + "," + getIndex() +")";
+        if( getParent()!=null ) {
+            return getParent().toString() + "->" + str;
+        }
+        return str;
+    }
+    
+    protected String getElementDescriptor() {
+        return "Default";
+    }
 
 }

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "MenuBar(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "Menu";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "MenuBar(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "MenuBar";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "MenuButton(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "MenuButton";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "Panel(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "Panel";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "ScrollBar(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "ScrollBar";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "ScrollPane(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "ScrollPane";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "Shape(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "Shape";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "SplitPane(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "SplitPane";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "TabbedPane(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "TabbedPane";
     }
 

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "TextField(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "TextField";
     }
-
 }

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

@@ -33 +33 @@
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
-    public String toString() {
-        return "ToolBar(" + super.getName() + ", " + super.getElementHash() + ")";
+    protected String getElementDescriptor() {
+        return "ToolBar";
     }