Changeset 8719

Timestamp:

2004-12-02T09:55:42+13:00 (19 years ago)

Author:

schweer

Message:

Set -> each predicate is listed only once when using iterator in velocity

Location:

trunk

Files:

• greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java (modified) (1 diff)
• gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java (modified) (1 diff)
• gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java (modified) (1 diff)

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java

@@ -57 +57 @@
     }
     
-    public Collection getPredicates() {
-        return Collections.unmodifiableCollection(map.values());
+    public Set getPredicates() {
+        Set result = new HashSet();
+        for (Iterator iter = map.values().iterator(); iter.hasNext();) {
+            Predicate pred = (Predicate) iter.next();
+            if (pred != null) {
+                result.add(pred);
+            }
+        }
+        return result;
     }
     

trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java

@@ -57 +57 @@
     }
     
-    public Collection getPredicates() {
-        return Collections.unmodifiableCollection(map.values());
+    public Set getPredicates() {
+        Set result = new HashSet();
+        for (Iterator iter = map.values().iterator(); iter.hasNext();) {
+            Predicate pred = (Predicate) iter.next();
+            if (pred != null) {
+                result.add(pred);
+            }
+        }
+        return result;
     }
     

trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java

@@ -57 +57 @@
     }
     
-    public Collection getPredicates() {
-        return Collections.unmodifiableCollection(map.values());
+    public Set getPredicates() {
+        Set result = new HashSet();
+        for (Iterator iter = map.values().iterator(); iter.hasNext();) {
+            Predicate pred = (Predicate) iter.next();
+            if (pred != null) {
+                result.add(pred);
+            }
+        }
+        return result;
     }