Changeset 5487

Timestamp:

07/25/14 15:38:07 (10 years ago)

Author:

Twan Goosen

Message:

clickable reference links in vc details
fixes #599

some tweaking to detect pids and non-actionable URI's is needed

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/ReferenceLinkPanel.html (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/ReferenceLinkPanel.java (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/VirtualCollectionDetailsPage.java (modified) (5 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/pom.xml

@@ -638 +638 @@
     </build>
 
+    <reporting>
+        <plugins>
+            <!-- NCSS plugin has issues with Java 7 at the moment, check back later -->
+            <!--
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>javancss-maven-plugin</artifactId>
+                <version>2.0-beta-2</version>
+            </plugin>
+            -->
+        </plugins>
+    </reporting>
+
     <repositories>
         <repository>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/VirtualCollectionDetailsPage.java

@@ -22 +22 @@
 import org.apache.wicket.PageReference;
 import org.apache.wicket.Session;
+import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
 import org.apache.wicket.authorization.UnauthorizedActionException;
 import org.apache.wicket.behavior.AbstractBehavior;
 import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
 import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.basic.MultiLineLabel;
@@ -41 +46 @@
 import org.apache.wicket.markup.html.list.OddEvenListItem;
 import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.OddEvenItem;
+import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.model.ComponentPropertyModel;
 import org.apache.wicket.model.CompoundPropertyModel;
@@ -136 +143 @@
     } // class VirtualCollectionDetailsPage.TypeLabel
 
-
     public VirtualCollectionDetailsPage(PageParameters params) {
         this(getVirtualCollectionModel(params), getPageReference(params));
@@ -251 +257 @@
         final IColumn[] cols = new IColumn[2];
         cols[0] = new PropertyColumn<Resource>(
-                new Model<String>("Type"), "type") {
+                Model.of("Type"), "type") {
                     @Override
                     public void populateItem(Item<ICellPopulator<Resource>> item,
@@ -260 +266 @@
                     }
                 };
-        cols[1] = new PropertyColumn<Resource>(
-                new Model<String>("Reference"), "ref");
-        
+        cols[1] = new AbstractColumn<Resource>(Model.of("Reference")) {
+
+            @Override
+            public void populateItem(Item<ICellPopulator<Resource>> item, String componentId, IModel<Resource> rowModel) {
+                item.add(new ReferenceLinkPanel(componentId, rowModel));
+            }
+
+        };
+
         final SortableDataProvider<Resource> resourcesProvider = new SortableDataProvider<Resource>() {
             @Override