Changeset 32706 for main/trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

Timestamp:

2018-12-17T23:38:02+13:00 (5 years ago)

Author:

ak19

Message:

Committing the non-EDT related changes to GLI. More changes to setNamesRecursively: for GLI GUI buttons (class GLIButton) these are still standalone rather than compound widgets that contain further widgets within them. So want to set names of GLIButtons (and JButtons) to be their container-class.GLIButton.button-membervar-name. 2. Preferences dialog nulls member handles to important widgets whose names I want to set before the widget is even made visible. In testing mode, I want to prevent these from being set to null so I can set their names in order to access them.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java (modified) (1 diff)

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

@@ -172 +172 @@
         tab_pane.setSelectedComponent(general_preferences);
     }
-    
-    // Clean up
-    general_preferences = null;
-    connection_preferences = null;
-    frame_location = null;
-    frame_size = null;
-    cancel_button = null;
-    ok_button = null;
-    button_pane = null;
-    tab_pane = null;
-    content_pane = null;
-
+
+    // Clean up if not in GLI GUI test mode
+    // If in test mode, I need widgets like tab_pane and buttons to exist
+    if(!TestingPreparation.TEST_MODE) {
+        general_preferences = null;
+        connection_preferences = null;
+        frame_location = null;
+        frame_size = null;
+        cancel_button = null;
+        ok_button = null;
+        button_pane = null;
+        tab_pane = null;
+        content_pane = null;
+    }
+
+    TestingPreparation.setNamesRecursively(this);
+    
     setVisible(true);
     }