Changeset 9677 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2005-04-14T13:53:14+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now output from exploding metadata databases is displayed correctly.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/ExplodeMetadataPrompt.java (modified) (3 diffs)

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

@@ -156 +156 @@
     public synchronized void message(GShellEvent event) {
     String message = event.getMessage();
-    if (message.startsWith("other>")) {
+    if (message.startsWith("explode_metadata_database.pl>")) {
         message = message.substring(6);
         error_message.append(message);
@@ -253 +253 @@
 
     this.error_message = new StringBuffer();
-    GShell process = new GShell(args, GShell.OTHER, 3, this, null, GShell.GSHELL_OTHER);
+    GShell process = new GShell(args, GShell.EXPLODE, 3, this, null, GShell.GSHELL_EXPLODE);
     //process.start();
     process.run();
@@ -263 +263 @@
     }
 
-    private void resultPrompt(boolean success, String message) {
-    
-    String title;
-    String label;
+    private void resultPrompt(boolean success, String message)
+    {
     if (success) {
-        title = Dictionary.get("ExplodeMetadataPrompt.Successful_Title");
-        label = Dictionary.get("ExplodeMetadataPrompt.Successful_Explode", metadata_file.getName());
-    } else {
-        title = Dictionary.get("ExplodeMetadataPrompt.Failed_Title");
-        label = Dictionary.get("ExplodeMetadataPrompt.Failed_Explode", metadata_file.getName());
-    }
-    SimpleResultDialog result_dialog = new SimpleResultDialog(title, label, message);
-    result_dialog.setVisible(true); // Blocks
-    result_dialog.dispose();
-    result_dialog = null;
-
-    }
+        // !!! TO DO: Get explode_metadata_database.pl strings translated and use SimpleResultDialog below
+        JOptionPane.showMessageDialog(null, Dictionary.get("ExplodeMetadataPrompt.Successful_Explode", metadata_file.getName()), Dictionary.get("ExplodeMetadataPrompt.Successful_Title"), JOptionPane.INFORMATION_MESSAGE);
+    }
+    else {
+        String title = Dictionary.get("ExplodeMetadataPrompt.Failed_Title");
+        String label = Dictionary.get("ExplodeMetadataPrompt.Failed_Explode", metadata_file.getName());
+        SimpleResultDialog result_dialog = new SimpleResultDialog(title, label, message);
+        result_dialog.setVisible(true); // Blocks
+        result_dialog.dispose();
+        result_dialog = null;
+    }
+    }
+
     private class CancelListener
     implements ActionListener {