Changeset 18157 for greenstone3

Timestamp:

2008-12-09T13:04:12+13:00 (15 years ago)

Author:

cc108

Message:

change the snytax of regular expression

File:

• greenstone3/trunk/src/java/org/greenstone/admin/gui/ExtPane.java (modified) (2 diffs)

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

@@ -111 +111 @@
     public ExtPane() {
     
-    //System.out.println("start");
+
     String gsdl3Home = get_GSDL3HOME();
-    //file_location ="/research/cc108/greenstone3Project/ext/extension_project_list.xml";
+
     file_location = gsdl3Home+fileSeparator+"ext"+fileSeparator+"extension_project_list.xml";
-    //file_lcoation =  = "/research/cc108/greenstone3Project/ext/extension_project_list.xml
+
+
     // create all the necessary panes
     control_pane = new JPanel();
@@ -350 +351 @@
         String os = "linux";
         
-        if(fileSeparator.equals("\\")){
-            gsdl3Home = gsdl3Home.replaceAll("\\", "/");
+        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("/", "\\");
+            gsdl3Home = gsdl3Home.replaceAll("/", "\\\\");
         }
         return gsdl3Home;