Changeset 18146 for other-projects/trunk/greenstone3-extension/mat

Timestamp:

2008-12-08T17:07:26+13:00 (15 years ago)

Author:

cc108

Message:

remove Java 1.5 method

File:

• other-projects/trunk/greenstone3-extension/mat/src/org/greenstone/gsdl3_extension/mat/MetadataStats.java (modified) (4 diffs)

other-projects/trunk/greenstone3-extension/mat/src/org/greenstone/gsdl3_extension/mat/MetadataStats.java

@@ -69 +69 @@
     
     private static boolean deleteDir(File dir) {
-    
+        
     if (dir.isDirectory()) {
             String[] children = dir.list();
@@ -119 +119 @@
     public void getAvailableMetadataSets(String SetName,HashMap UsedMap, String SetAbbr){
    
-    String gsdl3Home = globalProperty.getGSDL3Home();
-    String os = "linux";
-    
-    if(System.getProperty("os.name").toLowerCase().contains("windows")){
-        gsdl3Home = gsdl3Home.replace("\\", "/");
-        os = "windows";
-    }
+    String gsdl3Home = globalProperty.getGSDL3Home();
+    String os = "linux";
+    
+    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){
+        gsdl3Home = gsdl3Home.replaceAll("\\", "/");
+        os = "windows";
+    }
     String metadataSetHome = gspath.removeLastLink(gsdl3Home)+fileSeparator+"gli"+fileSeparator+"metadata";
     if(os.equals("windows")){
-        metadataSetHome = metadataSetHome.replace("/", "\\");
+        metadataSetHome = metadataSetHome.replaceAll("/", "\\");
     }
     File metadata_directory = new File(metadataSetHome);
-    
+
     if (metadata_directory.exists()) {
         
@@ -157 +157 @@
                 Node temp = e.item(y);
                 NamedNodeMap mmp = temp.getAttributes();
-                
+                                                
                 if(!mmp.item(0).getNodeValue().equals("Description")){
                     MetadataElement me = new MetadataElement();
@@ -258 +258 @@
             String part = st.nextToken(";");
 
-            if(part.contains("<contains>")){
-            part = part.replace("<contains>", "");
-            }
-            else if(part.contains("<thistype>")){
+            if(part.indexOf("<contains>")!=-1){
+            part = part.replaceAll("<contains>", "");
+            }
+            else if(part.indexOf("<thistype>")!=-1){
             int location = part.indexOf("<thistype>");
             part = part.substring(0,location-1);