Changeset 5176

Timestamp:

05/12/14 11:11:33 (10 years ago)

Author:

Twan Goosen

Message:

unit test for url from string model

Location:

vlo/trunk/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/wicket/model/UrlFromStringModel.java (modified) (3 diffs)
• test/java/eu/clarin/cmdi/vlo/wicket/model/UrlFromStringModelTest.java (added)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/UrlFromStringModel.java

@@ -19 +19 @@
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import org.apache.wicket.model.IModel;
 
 /**
+ * Model that wraps a model providing a file location and returns a URL for this
+ * location via {@link #getObject() }
  *
  * @author twagoo
@@ -30 +33 @@
     private final IModel<String> model;
 
+    /**
+     *
+     * @param model model that provides a file location
+     */
     public UrlFromStringModel(IModel<String> model) {
         this.model = model;
@@ -52 +59 @@
             model.setObject(null);
         } else {
-            model.setObject(object.toString());
+            try {
+                model.setObject(new File(object.toURI()).getAbsolutePath());
+            } catch (URISyntaxException ex) {
+                throw new RuntimeException(ex);
+            }
         }
     }