Changeset 6755 for vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java

Timestamp:

11/09/15 13:36:42 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

merged with trunk 3.4

File:

• vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (5 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java

@@ -37 +37 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.markup.html.basic.SmartLinkLabel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -44 +43 @@
 import org.apache.wicket.markup.html.list.PageableListView;
 import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.migrate.StringResourceModelMigration;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -94 +93 @@
 
     private WebMarkupContainer createResourcesView(String id, final IModel<SearchContext> selectionModel) {
-        final SolrFieldModel<String> resourceModel = new SolrFieldModel<String>(getModel(), FacetConstants.FIELD_RESOURCE);
+        final SolrFieldModel<String> resourceModel = new SolrFieldModel<>(getModel(), FacetConstants.FIELD_RESOURCE);
         // create a container for the list view that is only visible if there actually are resources
         final WebMarkupContainer container = new WebMarkupContainer(id) {
@@ -119 +118 @@
         };
         // add a record page link that shows the number of resources not shown
-        moreLink.add(new Label("moreLabel", new StringResourceModel("resources.more", new AbstractReadOnlyModel<Integer>() {
+        moreLink.add(new Label("moreLabel", StringResourceModelMigration.of("resources.more", new AbstractReadOnlyModel<Integer>() {
 
             @Override
@@ -134 +133 @@
     private PageableListView createResourcesList(String id, SolrFieldModel<String> resourceModel) {
         // list of resources in this record
-        final IModel<List<String>> resourceListModel = new CollectionListModel<String>(resourceModel);
+        final IModel<List<String>> resourceListModel = new CollectionListModel<>(resourceModel);
         // use a a pageable view so that the number of resources actually shown is limited
         return new PageableListView<String>(id, resourceListModel, MAX_RESOURCES_TO_SHOW) {