Changeset 6048 for vlo/branches/vlo-3.1/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

Timestamp:

02/25/15 08:34:16 (9 years ago)

Author:

Twan Goosen

Message:

merged changes from trunk

Location:

vlo/branches/vlo-3.1

Files:

• . (modified) (1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java (modified) (3 diffs)

vlo/branches/vlo-3.1/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

@@ -10 +10 @@
 import eu.clarin.cmdi.vlo.wicket.pages.SimpleSearchPage;
 import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
+import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProvider;
 import javax.inject.Inject;
 import org.apache.wicket.Application;
@@ -37 +38 @@
     @Inject
     private XmlTransformationService cmdiTransformationService;
+    @Inject
+    private FieldValueConverterProvider fieldValueConverterProvider;
     @Inject
     private VloConfig vloConfig;
@@ -145 +148 @@
         return cmdiTransformationService;
     }
+    
+    public FieldValueConverterProvider getFieldValueConverterProvider() {
+        return fieldValueConverterProvider;
+    }
 
 }