Changeset 21934 for main

Timestamp:

2010-04-22T10:05:01+12:00 (14 years ago)

Author:

sjm84

Message:

Added a filter box to the GAI log pane

File:

• main/trunk/greenstone3/src/java/org/greenstone/admin/gui/LogPane.java (modified) (10 diffs)

main/trunk/greenstone3/src/java/org/greenstone/admin/gui/LogPane.java

@@ -93 +93 @@
     private JPanel control_pane = null;
 
-    private File log_file = null;
+    private ArrayList logFiles = new ArrayList();
+    private File currentlySelectedFile = null;
       
     /** The various sizes for the screen layout*/
@@ -102 +103 @@
     //Constructor
     public LogPane() {
-    
+
+    logFiles.add(new File (GAI.tomcat_home+File.separatorChar+"logs"+File.separatorChar+"catalina.out"));
+    logFiles.add(new File (GAI.getGSDL3ExtensionHome() + File.separatorChar + "logs" + File.separatorChar + "ext.log"));
+
     // create all the necessary panes
     control_pane = new JPanel();
@@ -210 +214 @@
     logContent_pane.add(control_pane, BorderLayout.SOUTH);
     
+    JPanel filterPanel = new JPanel();
+    filterPanel.setLayout(new BorderLayout());
+
+    JTextField filterField = new JTextField();
+    filterPanel.add(filterField, BorderLayout.CENTER);
+    
+    JButton filterButton = new JButton("Filter");
+    filterButton.addActionListener(new FilterButtonListener(filterField));
+    filterPanel.add(filterButton, BorderLayout.EAST);
+
+    JPanel contentFilterPanel = new JPanel();
+    contentFilterPanel.setLayout(new BorderLayout());
+    contentFilterPanel.add(logContent_pane, BorderLayout.CENTER);
+    contentFilterPanel.add(filterPanel, BorderLayout.NORTH);
+
     main_log_pane.add(logList_pane, JSplitPane.LEFT);
-    main_log_pane.add(logContent_pane, JSplitPane.RIGHT);
+    main_log_pane.add(contentFilterPanel, JSplitPane.RIGHT);
     main_log_pane.setDividerLocation(LIST_SIZE.width - 10);
     
@@ -217 +236 @@
     this.add(main_log_pane, BorderLayout.CENTER);
     //this.add(control_pane, BorderLayout.SOUTH);
+    }
+
+    public class FilterButtonListener implements ActionListener
+    {
+    JTextField _filterField = null;
+
+    public FilterButtonListener(JTextField filterField)
+    {
+        _filterField = filterField;
+    }
+    
+    public void actionPerformed(ActionEvent e)
+    {
+        readFile(currentlySelectedFile.getPath(), _filterField.getText());
+    }
     }
 
@@ -300 +334 @@
         reload_button.setEnabled(true);
         clear_button.setEnabled(true);
-        updateLogsContent(log_file.getPath());
+        updateLogsContent(currentlySelectedFile.getPath());
     }
     }
@@ -307 +341 @@
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-        if (!log_file.exists()){
-        JOptionPane.showMessageDialog((Component) null,log_file.getPath() + " log file does not exist");
+        if (!currentlySelectedFile.exists()){
+        JOptionPane.showMessageDialog((Component) null,currentlySelectedFile.getPath() + " log file does not exist");
         return;
         } else {
         ClearLogFilePrompt cfp  = new ClearLogFilePrompt();
-        boolean file_cleared = cfp.display(log_file);
+        boolean file_cleared = cfp.display(currentlySelectedFile);
         if (file_cleared) {
             log_textarea.setText("");
@@ -322 +356 @@
     
     public void updateLogsContent(String filename){
-    if (!log_file.exists()){ 
+    if (!currentlySelectedFile.exists()){ 
         log_textarea.setText("");
         JOptionPane.showMessageDialog((Component) null, filename+" log file does not exist");  
         clear_button.setEnabled(false);
     } else {
-        readFile(filename);
-    }
-    }
-
-    public void readFile (String filename) {
+        readFile(filename, "");
+    }
+    }
+
+    public void readFile (String filename, String filter) {
     log_textarea.setText("");
     String fileLine;
@@ -337 +371 @@
         BufferedReader in = new BufferedReader(new FileReader(filename));
         while ((fileLine = in.readLine()) != null) {
-        log_textarea.append(fileLine);
-        log_textarea.append("\n");
+        if(fileLine.contains(filter)){
+            log_textarea.append(fileLine);
+            log_textarea.append("\n");
+        }
         }
     } catch (Exception e) {
@@ -351 +387 @@
             //no selection
         } else if (log_list.getSelectedIndex () == 0 ) {
-            log_file = new File (GAI.tomcat_home+File.separatorChar+"logs"+File.separatorChar+"catalina.out");
+            File log_file = (File)logFiles.get(0);
+            currentlySelectedFile = log_file;
             String filename = log_file.getPath();
             updateLogsContent(filename);
@@ -357 +394 @@
             clear_button.setEnabled(true);
         } else if (log_list.getSelectedIndex () == 1) {
-            log_file = new File (GAI.getGSDL3ExtensionHome() + File.separatorChar + "logs" + File.separatorChar + "ext.log");
+            File log_file = (File)logFiles.get(1);
+            currentlySelectedFile = log_file;
             String filename = log_file.getPath();
             updateLogsContent(filename);