Changeset 20789

Timestamp:

2009-10-07T15:52:04+13:00 (15 years ago)

Author:

ak19

Message:

If the proxy host is not set but Use Proxy Connection is turned on, we don't let the user store the preferences and close the dialog just yet. Shows up a message.

Location:

gli/trunk

Files:

• classes/dictionary.properties (modified) (1 diff)
• src/org/greenstone/gatherer/gui/Preferences.java (modified) (1 diff)

gli/trunk/classes/dictionary.properties

@@ -923 +923 @@
 Preferences.Connection.Proxy_Port:Proxy Port:
 Preferences.Connection.Proxy_Port_Tooltip:The port number of your proxy server
+Preferences.Connection.Proxy_Host_Missing:Enter a value for the proxy host or turn off Use Proxy Connection in the Connection tab.
 Preferences.Connection.Servlet:Servlet:
 Preferences.Connection.Servlet_Tooltip:The servlet to use to view your site

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

@@ -906 +906 @@
         Gatherer.refresh(Gatherer.PREFERENCES_CHANGED);
 
-        // Hide dialog
-        if (close) {
-        self.dispose();
+        // If proxy is on but proxy details are incomplete, then can't continue 
+        if (use_proxy_checkbox.isSelected() && proxy_host_field.getText().equals("")) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Preferences.Connection.Proxy_Host_Missing"),
+                          Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        } else {
+        // Hide dialog
+        if (close) {
+            self.dispose();
+        }
         }