Changeset 18240 for greenstone3/trunk

Timestamp:

2008-12-17T18:47:43+13:00 (15 years ago)

Author:

cc108

Message:

fix some bugs

File:

• greenstone3/trunk/src/java/org/greenstone/admin/gui/Mat.java (modified) (8 diffs)

greenstone3/trunk/src/java/org/greenstone/admin/gui/Mat.java

@@ -90 +90 @@
     static String oai_folder;
     
-    static final String InstallCompleteMsg = "The extension (Mat) has been downloaded successfully.";
-    static final String InstallErrorMsg =  "Sorry, the extension (Mat) could not be downloadeded. Please try again!";
-    
-    static final String DownloadCompleteMsg = "The extension (Mat) has been installed successfully.";
-    static final String DownloadErrorMsg =  "Sorry, the extension (Mat) could not be installed. Please try again!";
+    static final String InstallCompleteMsg = "The extension (Mat) has been installed successfully.";
+    static final String InstallErrorMsg =  "Sorry, the extension (Mat) could not be installed. Please try again!";
+    
+    static final String DownloadCompleteMsg = "The extension (Mat) has been downloaded successfully.";
+    static final String DownloadErrorMsg =  "Sorry, the extension (Mat) could not be downloaded. Please try again!";
     
     public Mat(){}
@@ -567 +567 @@
         String timestamp = getTimestamp();
     
-        updateLOG("Download",msg , timestamp);
-        adaptee.setCommandStatus("Download");
+        //updateLOG("Download",msg , timestamp);
+        //adaptee.setCommandStatus("Download");
     }
     else if(button.getName().equalsIgnoreCase("control_description") || button.getName().equalsIgnoreCase("description_control")){
@@ -580 +580 @@
         String msg = createInfoMsg(button.getName());
         String timestamp = getTimestamp();
-        updateLOG("Install", msg , timestamp);
+        //updateLOG("Install", msg , timestamp);
     }
     else if(button.getName().equalsIgnoreCase("Install_option")){
@@ -629 +629 @@
 
     public void downloadExtension(){
-        System.out.println("start downloading");
     SVNDownloadThread download = new SVNDownloadThread(adaptee, ExtPane.message_textarea ,adaptee.url, adaptee.destination_folder, adaptee.extension_name);
     download.start();
@@ -641 +640 @@
     
     public void install_configuration(){
+    File buildProperty = new File (adaptee.install_options_filePath);
+    if(!buildProperty.exists()) { return; }
     Object[][] temp = adaptee.getConfiguration(adaptee.install_options_filePath);
     ExtensionConfigurePrompt ecp = new ExtensionConfigurePrompt(temp,adaptee.install_options_filePath,adaptee.extension_name,"Configure Install Settings");
@@ -648 +649 @@
     public void configure_option(){
     String gsdl3Home = adaptee.get_GSDL3HOME();
+    File buildProperty = new File (adaptee.extension_runtimeProperty_path);
+    if(!buildProperty.exists()) { return; }
     Object[][] temp = adaptee.getConfiguration(adaptee.extension_runtimeProperty_path);
     ExtensionConfigurePrompt ecp = new ExtensionConfigurePrompt(temp,adaptee.extension_runtimeProperty_path,adaptee.extension_name,"Configure Runtime Settings");
@@ -663 +666 @@
     
     if(step.equalsIgnoreCase(adminUI_Pane.DOWNLOAD)){
-        info = "The extension Mat has been download to local folder";
+        info = "The extension Mat has been downloaded to local folder";
     }
     else if (step.equalsIgnoreCase(adminUI_Pane.INSTALL)){
@@ -701 +704 @@
         
         File logDir = new File(adaptee.extension_log_directory);
-        if(logDir.mkdirs()){
-            //System.out.println("The log folder has been created");
-        }
-        else{
-            //System.out.println("The system cannot create log folder");
-        }
-        //System.out.println("file exist?" + fileExist);
+        if(logDir.mkdirs()){}
+
         if(!fileExist){
             logFile.createNewFile();