Changeset 8035

Timestamp:

2004-08-24T15:03:16+12:00 (20 years ago)

Author:

mdewsnip

Message:

Moving some code around in preparation for removing the entire msm package.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/GUIManager.java (modified) (4 diffs)
• msm/MetadataSetManager.java (modified) (1 diff)

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

@@ -40 +40 @@
 import java.awt.datatransfer.*;
 import java.awt.event.*;
-import java.io.*;
+import java.io.File;
 import java.lang.*;
 import java.net.*;
@@ -46 +46 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import javax.swing.filechooser.*;
 import javax.swing.plaf.*;
 import javax.swing.text.*;
@@ -73 +74 @@
 import org.greenstone.gatherer.help.HelpFrame;
 import org.greenstone.gatherer.mem.MetadataEditorManager;
+import org.greenstone.gatherer.msm.MDSFileFilter;
 import org.greenstone.gatherer.shell.GShell;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -306 +308 @@
         help.setView("previewingthecollection");
     }
+
     // *****************
     // Metadata Options.
     // *****************
-    else if(esrc == menu_bar.metadata_import) {
-        Gatherer.c_man.getCollection().msm.importMDS();
+    else if (esrc == menu_bar.metadata_import) {
+        JFileChooser chooser = new JFileChooser(new File(Utility.METADATA_DIR));
+        FileFilter filter = new MDSFileFilter();
+        chooser.setFileFilter(filter);
+        int returnVal = chooser.showDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.File_Import"));
+        if (returnVal == JFileChooser.APPROVE_OPTION) {
+        Gatherer.c_man.getCollection().msm.importMDS(chooser.getSelectedFile(), true);
+        }
     }
     else if(esrc == menu_bar.metadata_edit) {

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java

@@ -537 +537 @@
     return value_tree;
     }
-    /** This method is called to import a metadata set. First a prompt is displayed to gather necessary details such as which metadata set to import. Once this information is gathered the method <i>importMDS(File)</i> is called with the appropriate filename.
-     * @return A boolean which is <i>true</i> if the metadata set has been imported successfully, <i>false</i> otherwise.
-     */
-    public boolean importMDS() {
-    JFileChooser chooser = new JFileChooser(new File(Utility.METADATA_DIR));
-    javax.swing.filechooser.FileFilter filter = new MDSFileFilter();
-    chooser.setFileFilter(filter);
-    int returnVal = chooser.showDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.File_Import"));
-    if(returnVal == JFileChooser.APPROVE_OPTION) {
-        return importMDS(chooser.getSelectedFile(), true);
-    }
-    return false;
-    }
 
     public boolean importMDS(File mds_file, boolean user_driven) {