Changeset 5033 for trunk/gli/src/org/greenstone/gatherer/gui/OptionsPane.java

Timestamp:

2003-07-25T16:29:35+12:00 (21 years ago)

Author:

jmt12

Message:

Halved log textarea memory use by sharing Document model between both the process and the history text areas. Its not enough though.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/OptionsPane.java (modified) (4 diffs)

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

@@ -50 +50 @@
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.util.Utility;
-import org.w3c.dom.*;
+//import org.w3c.dom.*;
 /** This class serves as the data holder for all subclasses of option panes, such as Import options or All options. It also contains methods for creating each of the option lines as they would appear in the subpane. Futhermore it has a method for considering all the arguments and generating a <strong>String[]</strong> to allow you to pass them to the <strong>GShell</strong>.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -88 +88 @@
 
      /** The default constructor creates the few session length options, but either retrieves the rest from the current collection, or creates a default set of options. */
-    public OptionsPane(JTextArea log, BuildOptions build_options) {
-    this.log_display = log;
+    public OptionsPane(JTextArea message_log, BuildOptions build_options) {
+    this.log_display = new JTextArea(message_log.getDocument());
     this.build_options = build_options;
     this.log_change_listener = new LogChangeListener();
@@ -230 +230 @@
 
         }
+
         log_pane.add(new JScrollPane(log_display), BorderLayout.CENTER);
         JLabel log_history_label = new JLabel(get("LogHistory"));
         JPanel log_history_pane = new JPanel();
+
         log_history_pane.setLayout(new BorderLayout());
         log_history_pane.add(log_history_label, BorderLayout.NORTH);
         log_history_pane.add(list_scroller, BorderLayout.SOUTH);
+        
         log_pane.add(log_history_pane, BorderLayout.SOUTH);
     }
@@ -281 +284 @@
     public void loadSelectedLog(FileEntry fe) {
     ///ystem.out.println("load selected log");
-    if (is_log_changed) {
-        saveLogFile(displayed_log.getFile());
-    } else {
-        log_display.getDocument().removeDocumentListener(log_change_listener);
+    if(displayed_log != null) {
+        if (is_log_changed) {
+        saveLogFile(displayed_log.getFile());
+        } else {
+        log_display.getDocument().removeDocumentListener(log_change_listener);
+        }
     }