Changeset 22035

Timestamp:

2010-05-05T13:34:01+12:00 (14 years ago)

Author:

sjm84

Message:

The "Local Collection Analysis" check box now starts mat.sh if checked and opens a web browser if it is not checked

File:

• gs3-extensions/mat/trunk/src/org/greenstone/admin/guiext/ControlPanel.java (modified) (6 diffs)

gs3-extensions/mat/trunk/src/org/greenstone/admin/guiext/ControlPanel.java

@@ -21 +21 @@
 import java.awt.event.ItemListener;
 
+import java.util.Properties;
+
+import java.io.FileInputStream;
+
+import org.greenstone.server.BrowserLauncher;
+
 import org.greenstone.admin.guiext.BasePanel;
 
@@ -28 +34 @@
 {
     JPanel _controlPanel = null;
+    JCheckBox _localAnalysis = null;
     
     public ControlPanel()
@@ -70 +77 @@
     web_tool_checkbox.setVisible(false);
 
-    JCheckBox java_tool_checkbox = new JCheckBox("Local Collection Analysis");
-    java_tool_checkbox.addItemListener(new checkBoxStatus(mat));
-    java_tool_checkbox.setBorder(BorderFactory.createEmptyBorder(0,0,0,0));
+    _localAnalysis = new JCheckBox("Local Collection Analysis");
+    _localAnalysis.setBorder(BorderFactory.createEmptyBorder(0,0,0,0));
     
     GridLayout gridLayout3 = new GridLayout(3,3);
@@ -92 +98 @@
     control_pane.setLayout(new BoxLayout(control_pane, BoxLayout.Y_AXIS));
 
-    control_content_pane.add(java_tool_checkbox);
+    control_content_pane.add(_localAnalysis);
     control_content_pane.add(Box.createRigidArea(new Dimension(10,5)));
     control_content_pane.add(Box.createRigidArea(new Dimension(10,5)));
@@ -130 +136 @@
     }
 
-    class checkBoxStatus implements ItemListener{
-
-    private Mat adaptee;
-    
-    public checkBoxStatus(Mat adaptee){
-        
-        this.adaptee = adaptee;
-    }
-    
-    public void itemStateChanged(ItemEvent e) {
-        
-        JCheckBox source = (JCheckBox)e.getItemSelectable();
-        
-        if (source == adaptee.java_tool_checkbox) {
-        if(source.isSelected()){
-            adaptee.start_button.setEnabled(true);
-        }
-        else{
-            adaptee.start_button.setEnabled(false);
-        }
-        } 
-        else{
-        }
-    }
-    }
-
     class aListener implements ActionListener {
     
@@ -169 +149 @@
     
         if(button.getName().equalsIgnoreCase("Analyse")){
-        execute_application();
+        if(_localAnalysis.isSelected()){
+            execute_application();
+        }
+        else{
+            try{
+            Properties properties = new Properties();
+            FileInputStream fis = new FileInputStream(GAI.getGSDL3Home() + System.getProperty("file.separator") + "build.properties");
+            properties.load(fis);
+            fis.close();
+            Thread bl = new BrowserLauncher("", "http://" + properties.getProperty("tomcat.server") + ":" + properties.getProperty("tomcat.port") + "/mat/analyse");
+            bl.run();
+            }
+            catch(Exception ex){
+            ex.printStackTrace();
+            }
+        }
         }
     }