Changeset 4220 for vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloPageParameters.java

Timestamp:

01/07/14 11:05:14 (10 years ago)

Author:

twagoo

Message:

Merged twagoo branch of to-wicket-1.6 back to original, removed this branch

Location:

vlo/branches/to-wicket-1.6

Files:

• . (modified) (1 prop)
• vlo_web_app (modified) (1 prop)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloPageParameters.java (modified) (3 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app

@@ -1 +1 @@
 target
+vlo-importer.log*

@@ -1 +1 @@
 target
+vlo-importer.log*

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloPageParameters.java

@@ -6 +6 @@
 
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -29 +30 @@
     }
     
-    public org.apache.wicket.PageParameters convert (){
+    public PageParameters convert (){
         
-        org.apache.wicket.PageParameters param;
+        PageParameters param;
         
         // needs to be implemented
@@ -51 +52 @@
      * @return 
      */
-    public VloPageParameters convert (org.apache.wicket.PageParameters param){
-        
-        // move page parameters in array of objects
-        Set <Map.Entry<String,Object>> entries;
-        entries = param.entrySet();
-        
+    public static VloPageParameters convert (PageParameters param){
+        List<NamedPair> entries = param.getAllNamed();        
         // iterate over the set, and put entries in new page parameters 
         VloPageParameters VloPageParameters;
         VloPageParameters = new VloPageParameters ();
-        for (Iterator<Map.Entry<String, Object>> it = entries.iterator(); it.hasNext();) {
-            Map.Entry<String, Object> entry = it.next();
+        for (Iterator<NamedPair> it = entries.iterator(); it.hasNext();) {
+            NamedPair entry = it.next();
             VloPageParameters.add(entry.getKey(), entry.getValue());
         }

@@ -1 +1 @@
 target
+vlo-importer.log*