Changeset 32695 for main/trunk

Timestamp:

2018-12-16T20:59:37+13:00 (5 years ago)

Author:

ak19

Message:

Simplifying setNamesRecursively and its usage. And printComponentNames is now automatically called by new version of now-overloaded setNamesRecursively(), but only if new flag DEBUGGING_TEST_MODE set

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• gui/GUIManager.java (modified) (1 diff)
• gui/TestingPreparation.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -761 +761 @@
     }*/
 
-        // if we're tutorial testing GLI, want names assigned to the GUI components
-        if(TestingPreparation.TEST_MODE) {
-            g_man.setName("GUIManager"); // g_man has a name "frame0" assigned automatically
-            // setNamesRecursively won't assign a name if one is already set
-            // Setting explicitly since GUIManager is preferred for its name
-            TestingPreparation.setNamesRecursively("", g_man);
-            TestingPreparation.printComponentNames(g_man, "");
-        }
+        // if we're tutorial testing GLI, want names assigned to the GUI components 
+        TestingPreparation.setNamesRecursively(g_man);
+        
         
         // If there was a collection left open last time, reopen it 

main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -960 +960 @@
     {
     OpenCollectionDialog dialog = new OpenCollectionDialog();
+    TestingPreparation.setNamesRecursively(dialog);
+    
         dialog.setComponentOrientation(Dictionary.getOrientation());
     if (dialog.display() == OpenCollectionDialog.OK_OPTION) {

main/trunk/gli/src/org/greenstone/gatherer/gui/TestingPreparation.java

@@ -6 +6 @@
 
 public class TestingPreparation {
-    public static boolean TEST_MODE = false;
-    
+    public static boolean TEST_MODE = true; // TODO: set to true for debugging. Reset to false when committing to svn
+    public static boolean DEBUGGING_TEST_MODE = true;
     
     /*
@@ -21 +21 @@
       - https://stackoverflow.com/questions/28639294/in-java-how-to-get-name-of-component-which-is-clicked
     */
+    public static void setNamesRecursively(Component root) {
+    if(!TEST_MODE) return;
+
+    // setNamesRecursively won't assign a name if one is already set
+    // But GUIManager for instance g_man has a name "frame0" assigned automatically
+    // Setting explicitly since GUIManager is preferred for its name
+    
+    // Workaround to force replacement of non-informative names like frame0 for GUIManager
+    // and dialog0 for OpenCollectioNDialog
+    // Workaround is to not check if name already set for root, but to set it ourselves
+    String className = root.getClass().getSimpleName();
+    root.setName(className);
+
+    setNamesRecursively("", root);
+    if (DEBUGGING_TEST_MODE) printComponentNames(root, "");
+    }
+    
     public static void setNamesRecursively(String prefix, Component root) {
     if(!TEST_MODE) return;
@@ -110 +127 @@
 
     
-    // For debugging swing Component names assigned with Container's setName()
+    // For debugging swing Component names assigned with Container's setName()    
     public static void printComponentNames(Component root, String tabbing) {
     if(!TEST_MODE) return;