Changeset 34153 for main/trunk/gli/src/org/greenstone/gatherer/remote/ActionQueue.java

Timestamp:

2020-06-12T21:23:42+12:00 (4 years ago)

Author:

ak19

Message:

While trying to debug client-gli to remote issues, found some more bugs when connecting client-GLI against local remote server on same machine. While debugging that, am adding little improvements that make life easier for me (easy to forget though what I was actually trying to do). This commit now adds a scroll pane around the build log that is displayed in a JOptionPane when an error happens during building/activating a collection.

File:

• main/trunk/gli/src/org/greenstone/gatherer/remote/ActionQueue.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/remote/ActionQueue.java

@@ -79 +79 @@
     }
     
+    // We often end up with giant blotted remote build error messages when things blow up
+    // These messages appear in pop ups that take up the entire screen and we can't even see the OK button
+    // This method therefore adds a scrollPane around error messages when displaying them.
+    // https://alvinalexander.com/java/joptionpane-showmessagedialog-example-scrolling/
+    private JScrollPane getMsgInScrollPane(String msg) {
+    // create a JTextArea
+    JTextArea textArea = new JTextArea(20, 70);
+    textArea.setText(msg);
+    textArea.setEditable(false);
+    // wrap a scrollpane around message
+    JScrollPane scrollPane = new JScrollPane(textArea);
+    return scrollPane;
+    }
     
     synchronized public void addAction(RemoteGreenstoneServerAction remote_greenstone_server_action)
@@ -148 +161 @@
             DebugStream.printStackTrace(exception);
         }
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("RemoteGreenstoneServer.Error", exception.getMessage()), Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.ERROR_MESSAGE);
+        JScrollPane scrollPane = getMsgInScrollPane(Dictionary.get("RemoteGreenstoneServer.Error", exception.getMessage()));
+        JOptionPane.showMessageDialog(Gatherer.g_man, scrollPane, Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.ERROR_MESSAGE);
         remote_greenstone_server_action.processed_successfully = false;         
         }
@@ -156 +170 @@
         exit = true;
         DebugStream.printStackTrace(exception);
+        JScrollPane scrollPane = getMsgInScrollPane(Dictionary.get("RemoteGreenstoneServer.Error", 
+                                 "No gliserver.pl found. " + exception.getMessage()));
         JOptionPane.showMessageDialog(Gatherer.g_man, 
-                          Dictionary.get("RemoteGreenstoneServer.Error", 
-                                 "No gliserver.pl found. " + exception.getMessage()), 
+                          scrollPane, 
                           Dictionary.get("RemoteGreenstoneServer.Error_Title"), 
                           JOptionPane.ERROR_MESSAGE);
@@ -165 +180 @@
         catch (Exception exception) {
         DebugStream.printStackTrace(exception);
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("RemoteGreenstoneServer.Error", exception.getMessage()), Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.ERROR_MESSAGE);
+        JScrollPane scrollPane = getMsgInScrollPane(Dictionary.get("RemoteGreenstoneServer.Error", exception.getMessage()));
+        JOptionPane.showMessageDialog(Gatherer.g_man, scrollPane, Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.ERROR_MESSAGE);
         remote_greenstone_server_action.processed_successfully = false;
         }