Changeset 21918

Timestamp:

2010-04-20T14:46:09+12:00 (14 years ago)

Author:

sjm84

Message:

Further reorganising folders for GAI extension changes

Location:

main/trunk/greenstone3/src/java/org/greenstone/admin

Files:

• GAI.java (modified) (2 diffs)
• GAIManager.java (modified) (2 diffs)
• gui/ExtPane.java (deleted)
• gui/Mat.java (deleted)
• gui/MatExtensionConfigurePrompt.java (deleted)
• gui/MatExtensionInstallation.java (deleted)
• gui/MatLaunchApplication.java (deleted)
• gui/MatSVNDownloadThread.java (deleted)
• gui/MatUpdateEventHandler.java (deleted)
• gui/MatWorkingCopy.java (deleted)
• gui/adminUI_Pane.java (deleted)
• guiext (added)

main/trunk/greenstone3/src/java/org/greenstone/admin/GAI.java

@@ -40 +40 @@
 import org.greenstone.gsdl3.util.Dictionary;
 import org.greenstone.admin.gui.SetServerPane;
+import org.greenstone.gsdl3.util.GSPath;
 
 /** Containing the top-level "core" for the GAI(Greenstone Administrator
@@ -87 +88 @@
 
     }
+
+    public static String getGSDL3Home(){
+    
+    String gsdl3Home = gsdl3_web_home;
+    String os = "linux";
+    
+    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){
+        gsdl3Home = gsdl3Home.replaceAll("\\\\", "/");
+        os = "windows";
+    }
+        
+    gsdl3Home = GSPath.removeLastLink(gsdl3Home);
+    
+    if(os.equals("windows")){
+        gsdl3Home = gsdl3Home.replaceAll("/", "\\\\");
+    }
+    return gsdl3Home;
+    }
+
+    public static String getGSDL3ExtensionHome(){
+    String gsdl3ExtHome = gsdl3_web_home;
+    String os = "linux";
+
+    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){
+        gsdl3ExtHome = gsdl3ExtHome.replaceAll("\\\\", "/");
+        os = "windows";
+    }
+    
+    gsdl3ExtHome = GSPath.removeLastLink(gsdl3ExtHome);
+    gsdl3ExtHome += "/ext";
+    
+    if(os.equals("windows")){
+        gsdl3ExtHome = gsdl3ExtHome.replaceAll("/", "\\\\");
+    }
+    return gsdl3ExtHome;
+    }
     
     public static void main (String[] args){

main/trunk/greenstone3/src/java/org/greenstone/admin/GAIManager.java

@@ -34 +34 @@
 import org.greenstone.admin.gui.LogPane;
 import org.greenstone.admin.gui.ConfPane;
-import org.greenstone.admin.gui.ExtPane;
+import org.greenstone.admin.guiext.ExtPane;
 
 //import java AWT classes
@@ -126 +126 @@
         //set up the ext Pane
         if (Configuration.get("admin.ext")){
-        ext_pane = new ExtPane();
-            ext_pane.display();
+        ext_pane = new ExtPane();
+
+        ext_pane.display();
         tab_pane.addTab("Extensions", EXT_ICON, ext_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(ext_pane),Configuration.get("admin.ext"));