Changeset 10943

Timestamp:

2005-11-24T17:29:41+13:00 (18 years ago)

Author:

kjdon

Message:

I got rid of all the core files - they were mainly not used. some I have created new versions, or now use teh gs3 version. updated all these files to reflect the changes

Location:

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

Files:

• GAI.java (modified) (4 diffs)
• GAIFirstSettingFrame.java (modified) (4 diffs)
• GAIManager.java (modified) (4 diffs)
• gui/ClearLogFilePrompt.java (modified) (2 diffs)
• gui/ConfPane.java (modified) (13 diffs)
• gui/DeleteLogFilePrompt.java (modified) (2 diffs)
• gui/LogPane.java (modified) (5 diffs)
• gui/MenuBar.java (modified) (7 diffs)
• gui/SaveChangePrompt.java (modified) (1 diff)
• gui/SetServerPane.java (modified) (9 diffs)
• gui/ThreadControl.java (modified) (2 diffs)

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

@@ -25 +25 @@
  *########################################################################
  */
-// Graphical Adminstration Interface
+
 package org.greenstone.admin;
 
@@ -38 +38 @@
 import javax.swing.text.*;
 
-import org.greenstone.admin.GAIManager;
-import org.greenstone.core.Configuration;
-import org.greenstone.core.Dictionary;
+import org.greenstone.gsdl3.util.Dictionary;
 import org.greenstone.admin.gui.SetServerPane;
 
-/** Containing the top-level "core" for the GAI(Graphical Administration
+/** Containing the top-level "core" for the GAI(Greenstone Administrator
  * Interface) this class is the common core for the GAI application and 
  * applet. It first parses the command line arguments, preparing to update 
@@ -55 +53 @@
 {
     public static Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
-    public static String gsdl3_path;
+    public static String gsdl3_src_home;
+    public static String gsdl3_web_home;
+    
+    public static File build_properties_file;
+
     public static String admin_path;
     public static String tomcat_file_path;
@@ -65 +67 @@
     static public GAIManager ga_man;
 
-    public GAI()
+    /** a public reference to the Dictionary */
+    static public Dictionary dictionary = null;
+    
+    public GAI(String gsdl3_src_home, String gsdl3_web_home)
     {
-    this.gsdl3_path = gsdl3_path;
-    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();
+    this.gsdl3_src_home = gsdl3_src_home;
+    this.gsdl3_web_home = gsdl3_web_home;
+    
+    // set up the Configuration
+    new Configuration();
+    
+    // Read Dictionary
+    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";
+    // 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();
     }
     
     public static void main (String[] args){
-    gsdl3_path = args[0];
-    admin_path = gsdl3_path + "/src/java/org/greenstone/admin/";
-    new Configuration (admin_path);
-    GAI gai = new GAI();
+    // A serious hack, but its good enough to stop crappy 'Could not
+        // lock user prefs' error messages.  Thanks to Walter Schatz from
+        // the java forums.
+        System.setProperty("java.util.prefs.syncInterval","2000000");
+
+    if (args.length != 2) {
+        System.err.println("Usage: java org.greenstone.admin.GAI <gsdl3 src home> <gsdl3 web home>");
+        System.exit(1);
+    }
     
-    ga_man  = new GAIManager(screen_size);
-    ga_man.display();
+    File gsdl3_src_dir = new File(args[0]);
+    File gsdl3_web_dir = new File(args[1]);
+    if (!gsdl3_src_dir.isDirectory() || !gsdl3_web_dir.isDirectory()) {
+        System.err.println("Usage: java org.greenstone.admin.GAI <gsdl3 src home> <gsdl3 web home>");
+        System.err.println("src or web directory does not exist!");
+        System.exit(1);
+    }
+    
+    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();
     }
 
-    public void init (){
-    // Read Dictionary
-    new Dictionary(Configuration.getLocale("general.locale", true), Configuration.getFont("general.font", true));
-
-    }
 }
 

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

@@ -49 +49 @@
 import javax.swing.tree.*;
 
-import org.greenstone.core.Configuration;
-import org.greenstone.core.Dictionary;
 import org.greenstone.core.ParsingProgress;
 import org.greenstone.admin.gui.SetServerPane;
@@ -111 +109 @@
     fset_yes_button.setToolTipText("Click this button to Set up the Tomcat/MYSQL server");
     fset_yes_button.setEnabled(false);
-    //Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
     fset_no_button = new JButton("No", setNoButtonIcon);
     fset_no_button.addActionListener(fsnbl);
@@ -117 +114 @@
     fset_no_button.setMnemonic(KeyEvent.VK_N);
     fset_no_button.setToolTipText("Click this button to skip the First time Tomcat/MYSQL server setting");
-    //Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
-
+    
     //First time running setting buttons
     fsybl = null;
@@ -175 +171 @@
     main_pane.add(first_setting_pane,BorderLayout.CENTER);
     main_pane.add(control_pane, BorderLayout.SOUTH);
-    main_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background", false));
-    main_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground", false));
+    main_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background"));
+    main_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground"));
 
     // Center and display

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

@@ -34 +34 @@
 import org.greenstone.admin.gui.LogPane;
 import org.greenstone.admin.gui.ConfPane;
-
-import org.greenstone.core.Configuration;
-import org.greenstone.core.Dictionary;
-import org.greenstone.core.DebugStream;
-import org.greenstone.core.util.Utility;
 
 //import java AWT classes
@@ -121 +116 @@
         
         //set up the Configuration Pane
-        if (Configuration.get("admin.conf", true)){
+        if (Configuration.get("admin.conf")){
         conf_pane = new ConfPane();
         conf_pane.display();
         tab_pane.addTab("Configuration", CONF_ICON, conf_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(conf_pane),Configuration.get("admin.conf", false));
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(conf_pane),Configuration.get("admin.conf"));
         }
                 
         //set up the ext Pane
-        if (Configuration.get("admin.ext", true)){
+        if (Configuration.get("admin.ext")){
         ext_pane = new JPanel();
         //ext_pane.display();
         tab_pane.addTab("Exts", EXT_ICON, ext_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(ext_pane),Configuration.get("admin.ext", false));
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(ext_pane),Configuration.get("admin.ext"));
         }
                 
         //set up the Monitor Pane
-        if (Configuration.get("admin.monitor", true)){
+        if (Configuration.get("admin.monitor")){
         monitor_pane = new JPanel();
         //monitor_pane.display();
         tab_pane.addTab("Monitor", MONITOR_ICON, monitor_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(monitor_pane),Configuration.get("admin.monitor", false));
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(monitor_pane),Configuration.get("admin.monitor"));
         }
 
         //set up the Log Pane
-        if (Configuration.get("admin.log", true)){
+        if (Configuration.get("admin.log")){
         log_pane = new LogPane();
         log_pane.display();
         tab_pane.addTab("Log", LOG_ICON, log_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(log_pane),Configuration.get("admin.log", false));
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(log_pane),Configuration.get("admin.log"));
         }   
         content_pane.setLayout(new BorderLayout());
@@ -156 +151 @@
         setVisible(true);
     } catch (Exception e){
-        DebugStream.printStackTrace(e);
         e.printStackTrace();
         System.exit(1);
@@ -345 +339 @@
         if (conf_pos != -1){
         if (ready) {
-            tab_pane.setEnabledAt (conf_pos,Configuration.get("admin.conf", false));
+            tab_pane.setEnabledAt (conf_pos,Configuration.get("admin.conf"));
         } else {
-            tab_pane.setEnabledAt (conf_pos,Configuration.get("admin.conf",true));
+            tab_pane.setEnabledAt (conf_pos,false);
         }
         }
         if (ext_pos != -1){
         if (ready) {
-            tab_pane.setEnabledAt (ext_pos,Configuration.get("admin.ext", false));
+            tab_pane.setEnabledAt (ext_pos,Configuration.get("admin.ext"));
         } else {
-            tab_pane.setEnabledAt (ext_pos,Configuration.get("admin.ext",true));
+            tab_pane.setEnabledAt (ext_pos,false);
         }
         }
         if (monitor_pos != -1){
         if (ready) {
-            tab_pane.setEnabledAt (monitor_pos,Configuration.get("admin.monitor", false));
+            tab_pane.setEnabledAt (monitor_pos,Configuration.get("admin.monitor"));
         } else {
-            tab_pane.setEnabledAt (monitor_pos,Configuration.get("admin.monitor",true));
+            tab_pane.setEnabledAt (monitor_pos,false);
         }
         }
         if (log_pos != -1){
         if (ready) {
-            tab_pane.setEnabledAt (log_pos,Configuration.get("admin.log", false));
+            tab_pane.setEnabledAt (log_pos,Configuration.get("admin.log"));
         } else {
-            tab_pane.setEnabledAt (log_pos,Configuration.get("admin.log",true));
+            tab_pane.setEnabledAt (log_pos,false);
         }
         }

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

@@ -44 +44 @@
 import javax.swing.*;
 import javax.swing.event.*;
-import org.greenstone.core.Configuration;
-import org.greenstone.core.DebugStream;
 
 /*import org.greenstone.gatherer.Dictionary;
@@ -55 +53 @@
 import org.greenstone.gatherer.util.StaticStrings;*/
 
-//import org.greenstone.gatherer.core.Utility;
 
 /** This class provides the functionality to delete current collections from the 

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

@@ -56 +56 @@
 import org.greenstone.admin.GAI;
 import org.greenstone.admin.GAIManager;
+import org.greenstone.admin.Configuration;
 import org.greenstone.admin.gui.ThreadControl;
 //import org.greenstone.admin.gui.ConfSettingTableModel;
 import org.greenstone.admin.gui.SiteConfSetting;
-import org.greenstone.core.Configuration;
-import org.greenstone.core.Dictionary;
-import org.greenstone.core.util.Utility;
 import org.greenstone.core.ParsingProgress;
 
@@ -186 +184 @@
     //DefaultMutableTreeNode child1 = new DefaultMutableTreeNode();
     DefaultMutableTreeNode child1 = new DefaultMutableTreeNode("Project Configuration");
-    //Dictionary.get(child1,"Tree.ProjectConf");
 
     DefaultMutableTreeNode compile = new DefaultMutableTreeNode("Compile");
@@ -201 +198 @@
     DefaultMutableTreeNode child2 = new DefaultMutableTreeNode("Site Configuration");
     //DefaultMutableTreeNode child2 = new DefaultMutableTreeNode(); 
-    //Dictionary.registerText(child2,"Tree.SiteConf");
     DefaultMutableTreeNode siteConf = new DefaultMutableTreeNode("SiteConfig");
     DefaultMutableTreeNode interfaceConf = new DefaultMutableTreeNode("InterfaceConfig");
@@ -237 +233 @@
     startup_tomcat_button.setMnemonic(KeyEvent.VK_S);
     startup_tomcat_button.setEnabled(false);
-    Dictionary.registerBoth(startup_tomcat_button,"ConfPane.Tomcat_Startup", "ConfPane.Tomcat_Startup_Tooltip");
+    startup_tomcat_button.setText(GAI.dictionary.get("ConfPane.Tomcat_Startup"));
+    startup_tomcat_button.setToolTipText(GAI.dictionary.get("ConfPane.Tomcat_Startup_Tooltip"));
 
     shutdown_tomcat_button = new JButton();
     shutdown_tomcat_button.addActionListener(stdbl);
     shutdown_tomcat_button.setEnabled(false);
-    Dictionary.registerBoth(shutdown_tomcat_button,"ConfPane.Tomcat_Shutdown", "ConfPane.Tomcat_Shutdown_Tooltip");
-        
+    shutdown_tomcat_button.setText(GAI.dictionary.get("ConfPane.Tomcat_Shutdown"));
+    shutdown_tomcat_button.setToolTipText(GAI.dictionary.get("ConfPane.Tomcat_Shutdown_Tooltip"));
+
     restart_tomcat_button = new JButton();
     restart_tomcat_button.addActionListener(rtbl);
     restart_tomcat_button.setEnabled(false);
-    Dictionary.registerBoth(restart_tomcat_button,"ConfPane.Tomcat_Restart", "ConfPane.Tomcat_Restart_Tooltip");
+    restart_tomcat_button.setText(GAI.dictionary.get("ConfPane.Tomcat_Restart"));
+    restart_tomcat_button.setToolTipText(GAI.dictionary.get("ConfPane.Tomcat_Restart_Tooltip"));
 
     startup_mysql_button = new JButton();
@@ -253 +252 @@
     startup_mysql_button.setMnemonic(KeyEvent.VK_S);
     startup_mysql_button.setEnabled(false);
-    Dictionary.registerBoth(startup_mysql_button,"ConfPane.MySQL_Startup", "ConfPane.MySQL_Startup_Tooltip");
+    startup_mysql_button.setText(GAI.dictionary.get("ConfPane.MySQL_Startup"));
+    startup_mysql_button.setToolTipText(GAI.dictionary.get("ConfPane.MySQL_Startup_Tooltip"));
 
     shutdown_mysql_button = new JButton();
     shutdown_mysql_button.addActionListener(smdbl);
     shutdown_mysql_button.setEnabled(false);
-    Dictionary.registerBoth(shutdown_mysql_button,"ConfPane.MySQL_Shutdown", "ConfPane.MySQL_Shutdown_Tooltip");
+    shutdown_mysql_button.setText(GAI.dictionary.get("ConfPane.MySQL_Shutdown"));
+    shutdown_mysql_button.setToolTipText(GAI.dictionary.get("ConfPane.MySQL_Shutdown_Tooltip"));
     
     restart_mysql_button = new JButton();
     restart_mysql_button.addActionListener(rmbl);
     restart_mysql_button.setEnabled(false);
-    Dictionary.registerBoth(restart_mysql_button,"ConfPane.MySQL_Restart", "ConfPane.MySQL_Restart_Tooltip");
+    restart_mysql_button.setText(GAI.dictionary.get("ConfPane.MySQL_Restart"));
+    restart_mysql_button.setToolTipText(GAI.dictionary.get("ConfPane.MySQL_Restart_Tooltip"));
 
     //tomcat control buttons
@@ -297 +299 @@
     confList_pane.setPreferredSize(LIST_SIZE);
     confList_pane.setSize(LIST_SIZE);
-    confList_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background", false));
-    confList_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground", false));
+    confList_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background"));
+    confList_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground"));
     
     confList_label = new JLabel();
     confList_label.setOpaque(true);
-    confList_label.setBackground(Configuration.getColor("coloring.workspace_selection_background", false));
-    confList_label.setForeground(Configuration.getColor("coloring.workspace_selection_foreground", false));
-    Dictionary.registerText(confList_label, "ConfPane.Conf_List");
+    confList_label.setBackground(Configuration.getColor("coloring.workspace_selection_background"));
+    confList_label.setForeground(Configuration.getColor("coloring.workspace_selection_foreground"));
+    confList_label.setText(GAI.dictionary.get("ConfPane.Conf_List"));
 
     // confContent_Pane
     confContent_pane = new JPanel();
     confContent_pane.setBorder(BorderFactory.createEmptyBorder(10,20,10,20));
-    confContent_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background", false));
-    confContent_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground", false));
+    confContent_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background"));
+    confContent_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground"));
 
     confContent_label = new JLabel();
     confContent_label.setOpaque(true);
-    confContent_label.setBackground(Configuration.getColor("coloring.workspace_selection_background", false));
-    confContent_label.setForeground(Configuration.getColor("coloring.workspace_selection_foreground", false));
-    Dictionary.registerText(confContent_label, "ConfPane.Conf_Content");
-    
+    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"));
+        
     conf_table_model = new ConfSettingTableModel();
     conf_setting_table = new JTable(conf_table_model){
@@ -337 +339 @@
             Component c = super.prepareRenderer(renderer, rowIndex, colIndex);
             if (colIndex == 0) {
-            c.setBackground(Configuration.getColor("coloring.table_noneditable_background",false));
+            c.setBackground(Configuration.getColor("coloring.table_noneditable_background"));
             } else {
-            c.setBackground(Configuration.getColor("coloring.table_editable_background",false));
+            c.setBackground(Configuration.getColor("coloring.table_editable_background"));
             }
             return c;
@@ -397 +399 @@
     conf_table_pane = new JScrollPane(conf_setting_table);
     conf_table_pane.setVisible(false);
-    conf_table_pane.getViewport().setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    conf_table_pane.getViewport().setBackground(Configuration.getColor("coloring.collection_tree_background"));
     
     // Layout Components
@@ -432 +434 @@
          * files are saved*/
         if (project_conf_changed) {
-        saveProjectConf(GAI.build_file);
+        saveProjectConf(GAI.build_properties_file);
         }
         /*boolean site_conf_changed = site_conf.confChanged();
@@ -480 +482 @@
         //before we restart Tomcat server, we want to make sure the conf_pane settings are saved
         if (project_conf_changed) {
-        saveProjectConf(GAI.build_file);
+        saveProjectConf(GAI.build_properties_file);
         }
         /*boolean site_conf_changed = site_conf.confChanged();
@@ -508 +510 @@
     public void actionPerformed(ActionEvent event) {
         //before we startup the MySQL server, we want to make sure the Conf_pane settings are saved
-        saveProjectConf(GAI.build_file);
+        saveProjectConf(GAI.build_properties_file);
         mysql_server_up = checkMysqlServer();
         if (!mysql_server_up) {
@@ -545 +547 @@
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-        saveProjectConf(GAI.build_file);
+        saveProjectConf(GAI.build_properties_file);
         mysql_server_up = checkMysqlServer();
         if (mysql_server_up) {
@@ -597 +599 @@
 
     public void getConfContent(){
-    String filename = GAI.build_file.getPath();
-    if (!GAI.build_file.exists()){ 
+    String filename = GAI.build_properties_file.getPath();
+    if (!GAI.build_properties_file.exists()){ 
         JOptionPane.showMessageDialog((Component) null,"Build property file does not exist");  
     } else {

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

@@ -44 +44 @@
 import javax.swing.*;
 import javax.swing.event.*;
-import org.greenstone.core.Configuration;
-import org.greenstone.core.DebugStream;
 
-/*import org.greenstone.gatherer.Dictionary;
+/*
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.LocalLibraryServer;
@@ -55 +53 @@
 import org.greenstone.gatherer.util.StaticStrings;*/
 
-//import org.greenstone.gatherer.core.Utility;
 
 /** This class provides the functionality to delete current collections from the 

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

@@ -48 +48 @@
 import org.greenstone.admin.GAIManager;
 import org.greenstone.admin.GAI;
-import org.greenstone.core.Configuration;
-import org.greenstone.core.Dictionary;
-import org.greenstone.core.util.Utility;
+import org.greenstone.admin.Configuration;
 
 /** The Log pane is to view the status of relevant log files in GSIII
@@ -120 +118 @@
     log_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     log_list.setVisibleRowCount(4);
-    log_list.setBackground (Configuration.getColor("coloring.workspace_tree_background", false));
-    log_list.setForeground (Configuration.getColor("coloring.workspace_tree_foreground", false));
+    log_list.setBackground (Configuration.getColor("coloring.workspace_tree_background"));
+    log_list.setForeground (Configuration.getColor("coloring.workspace_tree_foreground"));
     log_list.addListSelectionListener(new LogListListener());
     
@@ -139 +137 @@
     reload_button.setEnabled(false);
     reload_button.setMnemonic(KeyEvent.VK_R);
-    Dictionary.registerBoth(reload_button, "LogPane.Reload_Log", "LogPane.Reload_Log_Tooltip");
+    reload_button.setText(GAI.dictionary.get("LogPane.Reload_Log"));
+    reload_button.setToolTipText(GAI.dictionary.get("LogPane.Reload_Log_Tooltip"));
 
     clear_button = new JButton();
@@ -145 +144 @@
     clear_button.setEnabled(false);
     clear_button.setMnemonic(KeyEvent.VK_C);
-    Dictionary.registerBoth(clear_button, "LogPane.Clear_Log", "LogPane.Clear_Log_Tooltip");
+    clear_button.setText(GAI.dictionary.get("LogPane.Clear_Log"));
+    clear_button.setToolTipText(GAI.dictionary.get("LogPane.Clear_Log_Tooltip"));
 
     rbl = null;
@@ -170 +170 @@
     logList_label = new JLabel();
     logList_label.setOpaque(true);
-    logList_label.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
-    logList_label.setForeground(Configuration.getColor("coloring.workspace_heading_foreground", false));
-    Dictionary.registerText(logList_label, "LogPane.Log_List");
+    logList_label.setBackground(Configuration.getColor("coloring.workspace_heading_background"));
+    logList_label.setForeground(Configuration.getColor("coloring.workspace_heading_foreground"));
+    logList_label.setText(GAI.dictionary.get("LogPane.Log_List"));
 
     // logContent_Pane
     logContent_pane = new JPanel();
     logContent_pane.setBorder(BorderFactory.createLoweredBevelBorder());
-    logContent_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background", false));
-    logContent_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground", false));
+    logContent_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background"));
+    logContent_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground"));
     logContent_label = new JLabel();
     logContent_label.setOpaque(true);
-    logContent_label.setBackground(Configuration.getColor("coloring.workspace_selection_background", false));
-    logContent_label.setForeground(Configuration.getColor("coloring.workspace_selection_foreground", false));
-    Dictionary.registerText(logContent_label, "LogPane.Log_Content");
-
+    logContent_label.setBackground(Configuration.getColor("coloring.workspace_selection_background"));
+    logContent_label.setForeground(Configuration.getColor("coloring.workspace_selection_foreground"));
+    logContent_label.setText(GAI.dictionary.get("LogPane.Log_Content"));
+    
     // TEXTAREA Layout
     log_content = new JScrollPane(log_textarea);

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

@@ -43 +43 @@
 
 import org.greenstone.admin.GAI;
-import org.greenstone.core.Configuration;
-import org.greenstone.core.Dictionary;
-import org.greenstone.core.util.Utility;
+import org.greenstone.admin.Configuration;
 
 /** The menu bar for the Administration tools main GUI. 
@@ -72 +70 @@
 
     static public ImageIcon HELP_ICON = null; 
-
+    static public ImageIcon BLANK_ICON = null;
+    
     //    public MenuBar(MenuListener Menu_listener)
     public MenuBar(MenuListener menu_listener)
     {
     HELP_ICON = new ImageIcon(GAI.images_path +"help.gif");
+    BLANK_ICON = new ImageIcon(GAI.images_path+"blank.gif");
+
     //file = new JMenu("File");
     file = new JMenu();
     file.setMnemonic(KeyEvent.VK_F);
-    Dictionary.registerText(file, "Menu.File");
+    file.setText(GAI.dictionary.get("Menu.File"));
     
     //file_save = new JMenuItem("Save");
@@ -86 +87 @@
     file_save.addActionListener(GAI.ga_man);
     file_save.setMnemonic(KeyEvent.VK_S);
-    Dictionary.registerText(file_save, "Menu.File_Save");
-
+    file_save.setText(GAI.dictionary.get("Menu.File_Save"));
+    
     //file_exit = new JMenuItem("Exit");
     file_exit = new JMenuItem();
     file_exit.addActionListener(GAI.ga_man);
     file_exit.setMnemonic(KeyEvent.VK_X);
-    Dictionary.registerText(file_exit, "Menu.File_Exit");
+    file_exit.setText(GAI.dictionary.get("Menu.File_Exit"));
+
     //Layout (File menu)
     file.add(file_save);
@@ -102 +104 @@
     edit = new JMenu();
     edit.setMnemonic(KeyEvent.VK_E);
-    Dictionary.registerText(edit, "Menu.Edit");
-          
+    edit.setText(GAI.dictionary.get("Menu.Edit"));
+              
     // Help menu
     //help = new JMenu("Help");
@@ -109 +111 @@
     help.setMnemonic(KeyEvent.VK_H);
     help.setIcon(HELP_ICON);
-    Dictionary.setText(help, "Menu.Help");
-
+    help.setText(GAI.dictionary.get("Menu.Help"));
+    
     help_general = new JMenuItem();
     help_general.addActionListener(GAI.ga_man);
-    Dictionary.registerText(help_general,"Source.General");
-    
+    help_general.setText(GAI.dictionary.get("Source.General"));
+        
     help_conf = new JMenuItem();
     help_conf.addActionListener(GAI.ga_man);
-    Dictionary.registerText(help_conf,"GAI.Configuration");
-    
+    help_conf.setText(GAI.dictionary.get("GAI.Configuration"));
+        
     help_ext = new JMenuItem();
     help_ext.addActionListener(GAI.ga_man);
-    Dictionary.registerText(help_ext,"GAI.Ext");
-
+    help_ext.setText(GAI.dictionary.get("GAI.Ext"));
+    
     help_monitor = new JMenuItem();
     help_monitor.addActionListener(GAI.ga_man);
-    Dictionary.registerText(help_monitor,"GAI.Monitor");
-
+    help_monitor.setText(GAI.dictionary.get("GAI.Monitor"));
+    
     help_log = new JMenuItem();
     help_log.addActionListener(GAI.ga_man);
-    Dictionary.registerText(help_log,"GAI.Log");
-
+    help_log.setText(GAI.dictionary.get("GAI.Log"));
+    
     help_about = new JMenuItem();
     help_about.addActionListener(GAI.ga_man);
-    Dictionary.registerText(help_about,"Menu.Help_About");
-        
+    help_about.setText(GAI.dictionary.get("Menu.Help_About"));
+            
     
     // Layout (help menu)
     help.add(help_general);
     help.add(new JSeparator());
-    if (Configuration.get("admin.conf", true)) {
+    if (Configuration.get("admin.conf")) {
         help.add(help_conf);
     }
-    if (Configuration.get("admin.ext", true)) {
+    if (Configuration.get("admin.ext")) {
         help.add(help_ext);
     }
-    if (Configuration.get("admin.monitor", true)) {
+    if (Configuration.get("admin.monitor")) {
         help.add(help_monitor);
     }
-    if (Configuration.get("admin.log", true)) {
+    if (Configuration.get("admin.log")) {
         help.add(help_log);
     }
@@ -188 +190 @@
         selected = help.getItem(current_tab);
         if(selected != null) {
-        selected.setIcon(Utility.BLANK_ICON);
+        selected.setIcon(BLANK_ICON);
         }
     }
@@ -194 +196 @@
     selected = help.getItem(current_tab);
     if(selected != null) {
-        //selected.setIcon(Utility.HELP_ICON);
-        //
+        selected.setIcon(HELP_ICON);
+        
     }
     selected = null;

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

@@ -45 +45 @@
 
 import org.greenstone.admin.gui.ConfPane;
-
-import org.greenstone.core.Configuration;
-import org.greenstone.core.DebugStream;
 
 /** This class provides the functionality to show a prompt to save changed file  

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

@@ -55 +55 @@
 import java.sql.*;
 
-import org.greenstone.core.Configuration;
-import org.greenstone.core.Dictionary;
+import org.greenstone.admin.Configuration;
 import org.greenstone.core.ParsingProgress;
 import org.greenstone.admin.GAI;
@@ -122 +121 @@
     save_button.setToolTipText("Click this button to save up the setting");
     save_button.setEnabled(false);
-    //Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
 
     install_button = new JButton("Install GSDL3", InstallButtonIcon);
@@ -129 +127 @@
     install_button.setMnemonic(KeyEvent.VK_I);
     install_button.setToolTipText("Click this button to Install Greenstone III");
-    //Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
 
     exit_button = new JButton("Exit Setting and Installation", ExitButtonIcon);
@@ -136 +133 @@
     install_button.setMnemonic(KeyEvent.VK_I);
     install_button.setToolTipText("Click this button to Exit the Setting and Installation of Greenstone III");
-    //Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
 
     //Setting&Installation buttons
@@ -211 +207 @@
     main_pane.add(setting_table_pane, BorderLayout.CENTER);
     main_pane.add(outter_control_pane, BorderLayout.SOUTH);
-    main_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background", false));
-    main_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground", false));
+    main_pane.setBackground(Configuration.getColor("coloring.workspace_selection_background"));
+    main_pane.setForeground(Configuration.getColor("coloring.workspace_selection_foreground"));
     
     // Center and display
@@ -233 +229 @@
         int result = JOptionPane.showConfirmDialog((Component) null, "Do you really want to save the setting?", "Save Confirmation", JOptionPane.YES_NO_OPTION);
         if ( result == JOptionPane.YES_OPTION) {
-        updateSetting (GAI.build_file);
-        file_saved = writeFile (GAI.build_file);
+        updateSetting (GAI.build_properties_file);
+        file_saved = writeFile (GAI.build_properties_file);
         if (file_saved) {
             JOptionPane.showMessageDialog((Component) null,"Change has been saved succefully!");
@@ -248 +244 @@
     }
 
-    public void updateSetting(File build_file) {
-    readFile (GAI.build_file);
+    public void updateSetting(File build_properties_file) {
+    readFile (GAI.build_properties_file);
     String new_string;
     for (int i=0; i < server_setting_table_model.getRowCount(); i++){
@@ -265 +261 @@
     
     }
-    public void readFile (File build_file) {
-    String filename = build_file.getPath();
+    public void readFile (File build_properties_file) {
+    String filename = build_properties_file.getPath();
     String fileLine;
     /*conf_array[] store all the details from the build.properties*/
@@ -284 +280 @@
     }
     
-    public boolean writeFile(File build_file){
-    String filename = build_file.getPath();
+    public boolean writeFile(File build_properties_file){
+    String filename = build_properties_file.getPath();
     try {
         BufferedWriter conf_out = new BufferedWriter(new FileWriter(filename));

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

@@ -67 +67 @@
     public void executeAntTarget(String command_string) throws IOException  {
     Project ant = new Project();
-    File buildFile = new File (GAI.gsdl3_path + File.separator + "build.xml");
+    File buildFile = new File (GAI.gsdl3_src_home + File.separator + "build.xml");
     
     //Set up a PrintStream pointing at a file
     //FileOutputStream ant_out =
-    //   new FileOutputStream(GAI.gsdl3_path + File.separator + "ant_out.log");
+    //   new FileOutputStream(GAI.gsdl3_src_home + File.separator + "ant_out.log");
     //FileOutputStream ant_err = 
-    //   new FileOutputStream(GAI.gsdl3_path + File.separator + "ant_err.log");
+    //   new FileOutputStream(GAI.gsdl3_src_home + File.separator + "ant_err.log");
     
     //  BufferedOutputStream ant_out_buffer = 
@@ -130 +130 @@
     /*public boolean checkAntResult(){
     try {
-        String filename = GAI.gsdl3_path + File.separator +"ant_out.log";
+        String filename = GAI.gsdl3_src_home + File.separator +"ant_out.log";
         String fileLine;