Changeset 6437 for vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java

Timestamp:

08/11/15 13:34:50 (9 years ago)

Author:

Twan Goosen

Message:

Major dependency upgrades: bumped Wicket to 7.x and Spring to 4.x and made required migration changes in code

File:

• vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java (modified) (4 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java

@@ -129 +129 @@
 
     private DataView<FacetField.Count> createValuesView(String id) {
-        final IModel<String> fieldNameModel = new PropertyModel<String>(getModel(), "name");
+        final IModel<String> fieldNameModel = new PropertyModel<>(getModel(), "name");
         return new DataView<FacetField.Count>(id, valuesProvider, ITEMS_PER_PAGE) {
 
             @Override
             protected void populateItem(final Item<FacetField.Count> item) {
-                item.setDefaultModel(new CompoundPropertyModel<FacetField.Count>(item.getModel()));
+                item.setDefaultModel(new CompoundPropertyModel<>(item.getModel()));
 
                 // link to select an individual facet value
@@ -169 +169 @@
         options.add(sortSelect);
 
-        final TextField filterField = new TextField<String>("filter", new PropertyModel(filterModel, "name"));
+        final TextField filterField = new TextField<>("filter", new PropertyModel(filterModel, "name"));
         filterField.add(new AjaxFormComponentUpdatingBehavior("keyup") {
 
@@ -201 +201 @@
 
         // Model that holds the actual number of occurences filtered on
-        final IModel<Integer> minOccurenceModel = new PropertyModel<Integer>(filterModel, "minimalOccurence");
+        final IModel<Integer> minOccurenceModel = new PropertyModel<>(filterModel, "minimalOccurence");
         // Model that represents the filter state ('bridge' between filter and selection)
         final IModel<Boolean> bridgeStateModel = Model.of(false);
         // Model that represents the *selected* number of minimal occurences (passes it on if not decoupled)
-        final IModel<Integer> minOccurenceSelectModel = new BridgeOuterModel<Integer>(minOccurenceModel, bridgeStateModel, 2);
+        final IModel<Integer> minOccurenceSelectModel = new BridgeOuterModel<>(minOccurenceModel, bridgeStateModel, 2);
         // Model that links the actual filter, selection and bridge (object opens and closes it)
-        final IModel<Boolean> minOccurenceCheckBoxModel = new BridgeModel<Integer>(minOccurenceModel, minOccurenceSelectModel, bridgeStateModel, 0);
+        final IModel<Boolean> minOccurenceCheckBoxModel = new BridgeModel<>(minOccurenceModel, minOccurenceSelectModel, bridgeStateModel, 0);
 
         // checkbox to open and close the 'bridge'
@@ -215 +215 @@
 
         // Dropdown to select a value (which is applied to the filter if the 'bridge' is open)
-        final DropDownChoice<Integer> minOccurence = new DropDownChoice<Integer>("minOccurences", minOccurenceSelectModel, ImmutableList.of(2, 5, 10, 100, 1000));
+        final DropDownChoice<Integer> minOccurence = new DropDownChoice<>("minOccurences", minOccurenceSelectModel, ImmutableList.of(2, 5, 10, 100, 1000));
         minOccurence.add(new UpdateOptionsFormBehavior(options) {