Changeset 18147 for other-projects

Timestamp:

2008-12-08T17:08:06+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/DataMaker.java (modified) (14 diffs)

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

@@ -554 +554 @@
         return row;
     }
-       
+        
+    /**
+     * This method will use Arrays.sort for sorting Map
+     * @param map
+     * @return outputList of Map.Entries
+     */
+
     public ArrayList sortMap(Map map) {
     ArrayList outputList = null;
@@ -560 +566 @@
     Set set = null;
     Map.Entry[] entries = null;
+    //     Logic:
+    //     get a set from Map
+    //     Build a Map.Entry[] from set
+    //     Sort the list using Arrays.sort
+    //     Add the sorted Map.Entries into arrayList and return
     
     set = (Set) map.entrySet();
@@ -568 +579 @@
     }
     
+    //     Sort the entries with your own comparator for the values:
     Arrays.sort(entries, new Comparator() {
         public int compareTo(Object lhs, Object rhs) {
@@ -587 +599 @@
     }
     return outputList;
-    }
+    }//End of sortMap
     
     private Double div(Double d1, Double d2){
@@ -596 +608 @@
     
     private Double mul(Double d1,Double d2){
-    BigDecimal b1 = new BigDecimal(d1.toString());
+        //System.out.println(d1);
+        BigDecimal b1 = new BigDecimal(d1.toString());
         BigDecimal b2 = new BigDecimal(d2.toString());
         return new Double(b1.multiply(b2).doubleValue());
@@ -627 +640 @@
         }
     }
-    
-    double x = (double)totalElementUsed/totalElement;
-    Double d1 = new Double(x);
-    Double d2 = new Double(100);
+        //System.out.println(totalElementUsed +" "+ totalElement);
+        double x = (double)totalElementUsed/totalElement;
+        //System.out.println(x);
+        Double d1 = new Double(x);
+        //System.out.println(d1);
+        Double d2 = new Double(100);
         Double result = mul(d1,d2);
         return round(result.doubleValue(),1);
@@ -750 +765 @@
     
     public HashMap getLinks(String[] args, String core_element){
-        Element rootElement = getRootNode(core_element);
-        HashMap hp = new HashMap();
-        NodeList listOfDocument = rootElement.getElementsByTagName("Document");
-        ArrayList tempList = new ArrayList();
-        
-        
-        for(int i = 0; i<args.length; i++){
+        Element rootElement = getRootNode(core_element);
+        HashMap hp = new HashMap();
+        NodeList listOfDocument = rootElement.getElementsByTagName("Document");
+        ArrayList tempList = new ArrayList();
+
+        
+        for(int i = 0; i<args.length; i++){
             tempList.add(args[i]);      
-        }
-        
-        for(int s=0; s<listOfDocument.getLength() ; s++){
+        }
+        
+        for(int s=0; s<listOfDocument.getLength() ; s++){
             Node docNode = listOfDocument.item(s);
             Element docElement = (Element)docNode;
@@ -766 +781 @@
         
             if(valueList.getLength()==1){
-            String id = docNode.getAttributes().item(0).getNodeValue();
-            Element valueElement = (Element)valueList.item(0);
-            NodeList textFNList = valueElement.getChildNodes();
-            String text = ((Node)textFNList.item(0)).getNodeValue();
-            
-            if(tempList.contains(text)){
-            hp.put(id, text);
-            }
+                String id = docNode.getAttributes().item(0).getNodeValue();
+                
+                Element valueElement = (Element)valueList.item(0);
+                NodeList textFNList = valueElement.getChildNodes();
+                String text = ((Node)textFNList.item(0)).getNodeValue();
+                
+                if(tempList.contains(text)){
+                    hp.put(id, text);
+                }
             }   
-        }
-        
-        rootElement = getRootNode(urlFile);
-        listOfDocument = rootElement.getElementsByTagName(documentTag);
-        HashMap newHp = new HashMap();
-        
-        for(int a=0; a<listOfDocument.getLength(); a++){
+        }
+        
+        rootElement = getRootNode(urlFile);
+        listOfDocument = rootElement.getElementsByTagName(documentTag);
+        HashMap newHp = new HashMap();
+        
+        for(int a=0; a<listOfDocument.getLength(); a++){
             Node docNode = listOfDocument.item(a);
             Element docElement = (Element)docNode;
@@ -787 +803 @@
         
             if(valueList.getLength()==1){
-            String id = docNode.getAttributes().item(0).getNodeValue();
-            Element valueElement = (Element)valueList.item(0);
-            NodeList textFNList = valueElement.getChildNodes();
-            String text = ((Node)textFNList.item(0)).getNodeValue();
-            newHp.put(text,id);             
+                String id = docNode.getAttributes().item(0).getNodeValue();
+                
+                Element valueElement = (Element)valueList.item(0);
+                NodeList textFNList = valueElement.getChildNodes();
+                String text = ((Node)textFNList.item(0)).getNodeValue();
+                newHp.put(text,id);             
             }   
-        }
-        
-        HashMap tempMap = new HashMap();
-        Collection c = hp.values();
-        Iterator i = c.iterator();
-        
-        while(i.hasNext()){
+        }
+        
+        HashMap tempMap = new HashMap();
+        Collection c = hp.values();
+        Iterator i = c.iterator();
+        while(i.hasNext()){
             String id = (String)i.next();
             if(newHp.containsKey(id)){
-            String text = (String)newHp.get(id);
-            if(text.contains("http")){
-            tempMap.put((String)tempMap.get(id),text);
-            }
+                String text = (String)newHp.get(id);
+                if(text.indexOf("http")!=-1){
+                    tempMap.put((String)tempMap.get(id),text);
+                }
             }
-        }
-        
-        return tempMap;
-    }
-    
+        }
+        
+        return tempMap;
+    }
+    
     
     public ArrayList getURLMap(String elementName){
@@ -820 +836 @@
 
         if(rootElement.equals(null)){
-        return new ArrayList();
+            return new ArrayList();
         }
             
@@ -827 +843 @@
         if(listOfDocument.getLength()==0){return new ArrayList();}
         
-    for(int a=0; a<listOfDocument.getLength(); a++){
+        //System.out.println(listOfDocument.getLength());
+        for(int a=0; a<listOfDocument.getLength(); a++){
             Node docNode = listOfDocument.item(a);
             Element docElement = (Element)docNode;
             NodeList valueList = docElement.getElementsByTagName(valueTag);
             
-        for(int b=0; b<valueList.getLength(); b++){
+            //System.out.println(valueList.getLength());
+            for(int b=0; b<valueList.getLength(); b++){
                 Element valueElement = (Element)valueList.item(b);
                 NodeList textFNList = valueElement.getChildNodes();
@@ -838 +856 @@
 
                 if(!text.equals(" ")){
-            NamedNodeMap NodeIDMap = docNode .getAttributes();
-            Node DocNodeID = NodeIDMap.item(0);
-            String DocID = DocNodeID.getNodeValue();
-            if(alist.contains(DocID)){}
-            else{
-            alist.add(DocID);
-            }
+                     NamedNodeMap NodeIDMap = docNode .getAttributes();
+                     Node DocNodeID = NodeIDMap.item(0);
+                     String DocID = DocNodeID.getNodeValue();
+                    if(alist.contains(DocID)){}
+                    else{
+                        alist.add(DocID);
+                    }
                 }
             }
-    }             
-    return alist;
-    }
+       }             
+
+            return alist;
+}
 
     public HashMap getIdentifierLink(String core_element){
@@ -882 +901 @@
             }
             }
-    }               
-    return hp;
-    }
+            }               
+            return hp;
+        }
+
     
     public String[] getDocumentIDList(String core_element){
-    
+        
         Element rootElement = getRootNode(core_element);
         NodeList listOfDocument = rootElement.getElementsByTagName(documentTag);
@@ -935 +955 @@
             }
             }
-    }               
-    return hp;
-    }
-    
+            }               
+            return hp;
+        }
+
     public HashMap getIdentifierLinkNoIdentifier(){
-    
+        
         Element rootElement = getRootNode(rootDocument);
         HashMap hp = new HashMap();
         NodeList listOfDocument = rootElement.getElementsByTagName(documentTag);
         String url ="No Source Available";
-        
-    for(int s=0; s<listOfDocument.getLength() ; s++){
+        for(int s=0; s<listOfDocument.getLength() ; s++){
             Node docNode = listOfDocument.item(s);
             String HashID = docNode.getAttributes().item(0).getNodeValue();
             InternalLink il = new InternalLink();
-        il.increaseElement(HashID);
-        hp.put(HashID, il);
-    }               
-    return hp;
-    }   
+            il.increaseElement(HashID);
+            hp.put(HashID, il);
+            }               
+            return hp;
+        }   
 }