Changeset 10953

Timestamp:

2005-11-25T14:07:14+13:00 (18 years ago)

Author:

kjdon

Message:

fixed up some paths. still needs more tidying...

Location:

trunk/gsdl3/src/java/org/greenstone/admin

Files:

• Configuration.java (modified) (3 diffs)
• GAI.java (modified) (4 diffs)
• GAIFirstSettingFrame.java (modified) (1 diff)
• GAIManager.java (modified) (3 diffs)
• gui/ConfPane.java (modified) (6 diffs)
• gui/LogPane.java (modified) (1 diff)
• gui/SetServerPane.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/admin/Configuration.java

@@ -39 +39 @@
 
 // eventually this class will hold configuration settings from a config file. For now, lets use static info
-// loosely based around Gatherer Configuration
+// loosely copied from Gatherer Configuration
 public class Configuration {
     
@@ -63 +63 @@
     hash.put("coloring.workspace_selection_foreground", "0, 0, 0");
     hash.put("coloring.workspace_selection_background", "176, 208, 176");
-    hash.put("coloring.table_noneditable_background", "");
-    hash.put("coloring.table_editable_background", "");
+    hash.put("coloring.table_noneditable_background", "255, 255, 255");
+    hash.put("coloring.table_editable_background", "255, 255, 255");
     hash.put("coloring.collection_tree_background", "224, 240, 224");
     hash.put("coloring.collection_tree_foreground", "0, 0, 0");
@@ -114 +114 @@
     Color result = Color.white; // Default
     String raw = (String)hash.get(property);
-    if (raw == null) {
+    if (raw == null || raw.equals("")) {
         return result;
     }

trunk/gsdl3/src/java/org/greenstone/admin/GAI.java

@@ -2 +2 @@
  *#########################################################################
  *
- * A component of the Gatherer application, part of the Greenstone digital
+ * A component of the Greenstone Administrator Interface, part of the Greenstone digital
  * library suite from the New Zealand Digital Library Project at the
  * University of Waikato, New Zealand.
@@ -55 +55 @@
     public static String gsdl3_src_home;
     public static String gsdl3_web_home;
+    public static String tomcat_home;
     
     public static File build_properties_file;
 
-    public static String admin_path;
-    public static String tomcat_file_path;
     public static String images_path;
-    public static File build_file;
-    public static File site_conf;
-    public static File interface_conf;
     /** A public reference to the GAIManager. */
     static public GAIManager ga_man;
@@ -81 +77 @@
     this.dictionary = new Dictionary("gai", Configuration.getLocale("general.locale"));
     this.build_properties_file = new File(this.gsdl3_src_home, "build.properties");
-    this.images_path = this.gsdl3_src_home+File.separatorChar+"resources"+File.separatorChar+"images";
+    // this may change if using preinstalled tomcat
+    this.tomcat_home = this.gsdl3_src_home+File.separatorChar+"packages"+File.separatorChar+"tomcat";
+    
+    // should come from classpath ??
+    this.images_path = this.gsdl3_src_home+File.separatorChar+"resources"+File.separatorChar+"images"+File.separatorChar;
     // start the GAIManager
     ga_man  = new GAIManager(screen_size);
     ga_man.display();
 
-    //this.admin_path = this.gsdl3_path + "/src/java/org/greenstone/admin/";
-    //this.tomcat_file_path = this.gsdl3_path + "/comms/jakarta/tomcat/logs/";
-    //this.images_path = this.admin_path + "images/";
-        //this.build_file = new File(gsdl3_path, "build.properties"); 
-    //this.site_conf = new File (gsdl3_path,"/web/sites/localsite/siteConfig.xml");
-    //this.interface_conf = new File (gsdl3_path, "/web/interfaces/default/interfaceConfig.xml");
-    //init();
     }
     
@@ -116 +109 @@
     GAI gai = new GAI(args[0], args[1]);
 
-    //  gsdl3_path = args[0];
-    //admin_path = gsdl3_path + "/src/java/org/greenstone/admin/";
-    //new Configuration (admin_path);
-    //GAI gai = new GAI();
-    
-    //ga_man  = new GAIManager(screen_size);
-    //ga_man.display();
     }
 

trunk/gsdl3/src/java/org/greenstone/admin/GAIFirstSettingFrame.java

@@ -101 +101 @@
     
     // ImagesIcon for the buttons
-    ImageIcon setYesButtonIcon = new ImageIcon(GAI.admin_path + "images/toolbarButtonGraphics/general/Refresh16.gif");
-    ImageIcon setNoButtonIcon = new ImageIcon(GAI.admin_path + "images/toolbarButtonGraphics/general/exit16.gif");
+    ImageIcon setYesButtonIcon = new ImageIcon(GAI.images_path + "refresh.gif");
+    ImageIcon setNoButtonIcon = new ImageIcon(GAI.images_path + "exit.gif");
     
     fset_yes_button = new JButton("Yes", setYesButtonIcon);

trunk/gsdl3/src/java/org/greenstone/admin/GAIManager.java

@@ -100 +100 @@
    public void display(){
     CONF_ICON = new ImageIcon (GAI.images_path + "create.gif");
-    EXT_ICON = new ImageIcon (GAI.images_path + "toolbarButtonGraphics/general/Information16.gif"); 
-    MONITOR_ICON = new ImageIcon (GAI.images_path + "toolbarButtonGraphics/general/Zoom16.gif");
-    LOG_ICON = new ImageIcon (GAI.images_path + "toolbarButtonGraphics/general/History16.gif");
+    EXT_ICON = new ImageIcon (GAI.images_path + "information.gif"); 
+    MONITOR_ICON = new ImageIcon (GAI.images_path + "zoom.gif");
+    LOG_ICON = new ImageIcon (GAI.images_path + "history.gif");
     content_pane = (JPanel) this.getContentPane();
 
@@ -164 +164 @@
     public void actionPerformed (ActionEvent event){
     Object esrc = event.getSource();
-    boolean project_conf_changed = false;
-    boolean site_conf_changed = false;
-    boolean interface_conf_changed = false;
     if (esrc == menu_bar.file_exit){
-        project_conf_changed = conf_pane.ProjectConfChanged();
-        site_conf_changed = conf_pane.site_conf.confChanged();
-        interface_conf_changed = conf_pane.interface_conf.confChanged();
-        /* Check if the Project and Site configuration files have been changed,
-         * if changed, prompt to users if they want to save*/ 
-        if (project_conf_changed || site_conf_changed || interface_conf_changed) {
+        if (conf_pane.configurationChanged()) {
+        // prompt users for save
         int result = JOptionPane.showConfirmDialog((Component) null, "The Configuration files have been changed, do you want to save the change", "Save Confirmation", JOptionPane.YES_NO_OPTION);
         if ( result == JOptionPane.YES_OPTION) {
-            conf_pane.saveProjectConf(GAI.build_file);
-            conf_pane.site_conf.saveFile(GAI.site_conf);
-            conf_pane.interface_conf.saveFile(GAI.interface_conf);
+            conf_pane.save();   
         } 
         }
@@ -185 +176 @@
     else if (esrc == menu_bar.file_save){
         /* sliently and Globally save Project and Site configuration*/
-        project_conf_changed = conf_pane.ProjectConfChanged();
-        site_conf_changed = conf_pane.site_conf.confChanged();
-        interface_conf_changed = conf_pane.interface_conf.confChanged();
-        if (project_conf_changed) {
-        conf_pane.saveProjectConf(GAI.build_file);
-        }
-        if (site_conf_changed){
-        conf_pane.site_conf.saveFile(GAI.site_conf);
-        }
-        if (interface_conf_changed) {
-        conf_pane.interface_conf.saveFile(GAI.interface_conf);
-        }
+        conf_pane.save();
     }
     else if (esrc == menu_bar.help_conf){

trunk/gsdl3/src/java/org/greenstone/admin/gui/ConfPane.java

@@ -61 +61 @@
 import org.greenstone.admin.gui.SiteConfSetting;
 import org.greenstone.core.ParsingProgress;
+import org.greenstone.gsdl3.util.GSFile;
 
 /** The Configuration pane is to view the status of relevant configure files in GSIII
@@ -155 +156 @@
     
     //Site configuration
-    public File site_conf_file = GAI.site_conf;
-    public File interface_conf_file = GAI.interface_conf;
+    // TODO!! there are more than one site and interface - need to extend this
+    public File site_conf_file = new File(GSFile.siteConfigFile(GSFile.siteHome(GAI.gsdl3_web_home, "localsite")));
+    public File interface_conf_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GAI.gsdl3_web_home, "default")));
     public boolean  project_conf_changed = false;
 
@@ -220 +222 @@
     RestartMysqlButtonListener rmbl = new RestartMysqlButtonListener();
         
-    ImageIcon startupTomcatButtonIcon = new ImageIcon(GAI.images_path + "toolbarButtonGraphics/general/redo16.gif");
-    ImageIcon shutdownTomcatButtonIcon = new ImageIcon(GAI.images_path + "toolbarButtonGraphics/general/stop16.gif");
-    ImageIcon restartTomcatButtonIcon = new ImageIcon(GAI.images_path + "toolbarButtonGraphics/general/stop16.gif");
-    
-    ImageIcon startupMysqlButtonIcon = new ImageIcon(GAI.images_path + "toolbarButtonGraphics/general/redo16.gif");
-    ImageIcon shutdownMysqlButtonIcon = new ImageIcon(GAI.images_path + "toolbarButtonGraphics/general/stop16.gif");
-    ImageIcon restartMysqlButtonIcon = new ImageIcon(GAI.images_path + "toolbarButtonGraphics/general/stop16.gif");
-    ImageIcon saveButtonIcon = new ImageIcon(GAI.images_path  + "toolbarButtonGraphics/general/Save16.gif");
+    ImageIcon startupTomcatButtonIcon = new ImageIcon(GAI.images_path + "redo.gif");
+    ImageIcon shutdownTomcatButtonIcon = new ImageIcon(GAI.images_path + "stop.gif");
+    ImageIcon restartTomcatButtonIcon = new ImageIcon(GAI.images_path + "stop.gif");
+    
+    ImageIcon startupMysqlButtonIcon = new ImageIcon(GAI.images_path + "redo.gif");
+    ImageIcon shutdownMysqlButtonIcon = new ImageIcon(GAI.images_path + "stop.gif");
+    ImageIcon restartMysqlButtonIcon = new ImageIcon(GAI.images_path + "stop.gif");
+    ImageIcon saveButtonIcon = new ImageIcon(GAI.images_path  + "save.gif");
 
     startup_tomcat_button = new JButton();  
@@ -318 +320 @@
     confContent_label.setBackground(Configuration.getColor("coloring.workspace_selection_background"));
     confContent_label.setForeground(Configuration.getColor("coloring.workspace_selection_foreground"));
-    confContent_label.setText(GAI.dictionary.get("ConfPane.Conf_List"));
+    confContent_label.setText(GAI.dictionary.get("ConfPane.Conf_Content"));
         
     conf_table_model = new ConfSettingTableModel();
@@ -427 +429 @@
     this.add(main_conf_pane, BorderLayout.CENTER);
     }
-    
+
+    public void save() {
+    if (project_conf_changed) {
+        saveProjectConf(GAI.build_properties_file);
+    }
+    if (site_conf.confChanged()){
+        site_conf.saveFile(site_conf_file);
+    }
+    if (interface_conf.confChanged()) {
+        interface_conf.saveFile(interface_conf_file);
+    }
+    
+
+    }
+    
+    public boolean configurationChanged() {
+    return (project_conf_changed || site_conf.confChanged() ||
+        interface_conf.confChanged());
+
+    }
+
     private class StartupTomcatButtonListener
     implements ActionListener {
@@ -594 +616 @@
     }
 
-    public boolean ProjectConfChanged() {
+    public boolean projectConfChanged() {
     return project_conf_changed;
     }

trunk/gsdl3/src/java/org/greenstone/admin/gui/LogPane.java

@@ -351 +351 @@
             //no selection
         } else if (log_list.getSelectedIndex () == 0 ) {
-            log_file = new File (GAI.tomcat_file_path+"catalina.out");
+            log_file = new File (GAI.tomcat_home+File.separatorChar+"logs"+File.separatorChar+"catalina.out");
             String filename = log_file.getPath();
             updateLogsContent(filename);

trunk/gsdl3/src/java/org/greenstone/admin/gui/SetServerPane.java

@@ -112 +112 @@
     
     // ImagesIcon for the buttons
-    ImageIcon SaveButtonIcon = new ImageIcon(GAI.admin_path + "images/toolbarButtonGraphics/general/Refresh16.gif");
-    ImageIcon InstallButtonIcon = new ImageIcon(GAI.admin_path + "images/toolbarButtonGraphics/general/exit16.gif");
-    ImageIcon ExitButtonIcon = new ImageIcon(GAI.admin_path + "images/toolbarButtonGraphics/general/exit16.gif");
+    ImageIcon SaveButtonIcon = new ImageIcon(GAI.images_path + "refresh.gif");
+    ImageIcon InstallButtonIcon = new ImageIcon(GAI.images_path + "exit.gif");
+    ImageIcon ExitButtonIcon = new ImageIcon(GAI.images_path + "exit.gif");
 
     save_button = new JButton("Save Setting", SaveButtonIcon);