Changeset 21918
- Timestamp:
- 2010-04-20T14:46:09+12:00 (14 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/admin
- Files:
-
- 1 added
- 9 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/admin/GAI.java
r10953 r21918 40 40 import org.greenstone.gsdl3.util.Dictionary; 41 41 import org.greenstone.admin.gui.SetServerPane; 42 import org.greenstone.gsdl3.util.GSPath; 42 43 43 44 /** Containing the top-level "core" for the GAI(Greenstone Administrator … … 87 88 88 89 } 90 91 public static String getGSDL3Home(){ 92 93 String gsdl3Home = gsdl3_web_home; 94 String os = "linux"; 95 96 if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){ 97 gsdl3Home = gsdl3Home.replaceAll("\\\\", "/"); 98 os = "windows"; 99 } 100 101 gsdl3Home = GSPath.removeLastLink(gsdl3Home); 102 103 if(os.equals("windows")){ 104 gsdl3Home = gsdl3Home.replaceAll("/", "\\\\"); 105 } 106 return gsdl3Home; 107 } 108 109 public static String getGSDL3ExtensionHome(){ 110 String gsdl3ExtHome = gsdl3_web_home; 111 String os = "linux"; 112 113 if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){ 114 gsdl3ExtHome = gsdl3ExtHome.replaceAll("\\\\", "/"); 115 os = "windows"; 116 } 117 118 gsdl3ExtHome = GSPath.removeLastLink(gsdl3ExtHome); 119 gsdl3ExtHome += "/ext"; 120 121 if(os.equals("windows")){ 122 gsdl3ExtHome = gsdl3ExtHome.replaceAll("/", "\\\\"); 123 } 124 return gsdl3ExtHome; 125 } 89 126 90 127 public static void main (String[] args){ -
main/trunk/greenstone3/src/java/org/greenstone/admin/GAIManager.java
r18113 r21918 34 34 import org.greenstone.admin.gui.LogPane; 35 35 import org.greenstone.admin.gui.ConfPane; 36 import org.greenstone.admin.gui .ExtPane;36 import org.greenstone.admin.guiext.ExtPane; 37 37 38 38 //import java AWT classes … … 126 126 //set up the ext Pane 127 127 if (Configuration.get("admin.ext")){ 128 ext_pane = new ExtPane(); 129 ext_pane.display(); 128 ext_pane = new ExtPane(); 129 130 ext_pane.display(); 130 131 tab_pane.addTab("Extensions", EXT_ICON, ext_pane); 131 132 tab_pane.setEnabledAt(tab_pane.indexOfComponent(ext_pane),Configuration.get("admin.ext"));
Note:
See TracChangeset
for help on using the changeset viewer.