Changeset 29509 for main/trunk/gli

Timestamp:

2014-12-01T19:11:34+13:00 (9 years ago)

Author:

ak19

Message:

Kathy suggested a confirmation dialog to the reset format statement button might prevent unintentional resets.

Location:

main/trunk/gli

Files:

• classes/dictionary.properties (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/FormatManager.java (modified) (3 diffs)

main/trunk/gli/classes/dictionary.properties

@@ -113 +113 @@
 CDM.FormatManager.AllFeatures:All Features
 CDM.FormatManager.AllParts:All Components
+CDM.FormatManager.Default_Warning:Are you sure you want to reset the format statement to its default?
 CDM.FormatManager.Default:Reset to Default
 CDM.FormatManager.Default_Tooltip:Reset the selected format command to its default value 

main/trunk/gli/src/org/greenstone/gatherer/cdm/FormatManager.java

@@ -40 +40 @@
 import org.greenstone.gatherer.gui.DesignPaneHeader;
 import org.greenstone.gatherer.gui.GLIButton;
+import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.metadata.MetadataElement;
 import org.greenstone.gatherer.metadata.MetadataSetManager;
@@ -991 +992 @@
       
       public void actionPerformed(ActionEvent event) {
+      
+      // ensure that the user didn't accidentally press the Reset to Default button
+      int user_choice = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("CDM.FormatManager.Default_Warning"), Dictionary.get("General.Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+      if(user_choice == JOptionPane.CANCEL_OPTION) {
+          return;
+      }
+      
         newtext = false;
         if(!ignore_event) {
@@ -1035 +1043 @@
           }
           
-        }
+    }
       }