Changeset 5486

Timestamp:

07/25/14 14:24:52 (10 years ago)

Author:

Twan Goosen

Message:

refactored details page class for readability

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/VirtualCollectionDetailsPage.java (modified) (9 diffs)

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

@@ -56 +56 @@
     public static final String PARAM_BACK_PAGE_VERSION = "backPageVersion";
     public static final String PARAM_BACK_PAGE_PAGEMAP_NAME = "backPageMapName";
+    private static final String CSS_CLASS = "collectionDetails";
+    private static final IConverter convDate = new DateConverter();
+    private final HideIfEmptyBehavior hideIfEmpty = new HideIfEmptyBehavior();
 
     private static final IConverter convEnum = new IConverter() {
@@ -74 +77 @@
         }
     };
-    private static final IConverter convDate = new DateConverter();
-
-    private static final String CSS_CLASS = "collectionDetails";
 
     /*
@@ -136 +136 @@
     } // class VirtualCollectionDetailsPage.TypeLabel
 
-    private final HideIfEmptyBehavior hideIfEmpty = new HideIfEmptyBehavior();
 
     public VirtualCollectionDetailsPage(PageParameters params) {
@@ -162 +161 @@
         add(backLink);
 
+        addGeneralProperties(model);
+        addCreators();
+        addResources(model);
+        addGeneratedBy(model);
+    }
+
+    private void addGeneralProperties(final IModel<VirtualCollection> model) {
         final Border general = new AjaxToggleBorder("generalBorder",
                 new Model<String>("General"), CSS_CLASS);
@@ -172 +178 @@
         general.add(new CustomLabel("reproducibility").add(hideIfEmpty));
         general.add(new Label("reproducibilityNotice").add(hideIfEmpty));
-        
-        final ExternalLink pidLink = new ExternalLink("pidLink", new PropertyModel<String>(model,"persistentIdentifier.actionableURI"));
+
+        final ExternalLink pidLink = new ExternalLink("pidLink", new PropertyModel<String>(model, "persistentIdentifier.actionableURI"));
         pidLink.add(new Label("persistentIdentifier.URI"));
         pidLink.add(hideIfEmpty);
         general.add(pidLink);
-        
+
+        addKeywords(general);
+    }
+
+    private void addKeywords(final Border general) {
         final ListView<String> keywords = new ListView<String>("keywords") {
             @Override
@@ -186 +196 @@
         keywords.add(hideIfEmpty);
         general.add(keywords);
-
+    }
+
+    private void addCreators() {
         final Border creators = new AjaxToggleBorder("creatorsBorder",
                 new Model<String>("Creators"), CSS_CLASS);
@@ -229 +241 @@
             }
         });
-
+    }
+
+    private void addResources(final IModel<VirtualCollection> model) {
         final Border resources = new AjaxToggleBorder("resourcesBorder",
                 new Model<String>("Resources"), CSS_CLASS + " resources");
@@ -248 +262 @@
         cols[1] = new PropertyColumn<Resource>(
                 new Model<String>("Reference"), "ref");
-
-        @SuppressWarnings("unchecked")
+        
+        final SortableDataProvider<Resource> resourcesProvider = new SortableDataProvider<Resource>() {
+            @Override
+            public Iterator<? extends Resource>
+                    iterator(int first, int count) {
+                return model.getObject().getResources().listIterator(first);
+            }
+
+            @Override
+            public IModel<Resource> model(Resource resource) {
+                return new VolatileEntityModel<Resource>(resource);
+            }
+
+            @Override
+            public int size() {
+                return model.getObject().getResources().size();
+            }
+        };
+
         final DataTable<Resource> resourcesTable
                 = new AjaxFallbackDefaultDataTable<Resource>("resourcesTable",
-                        cols,
-                        new SortableDataProvider<Resource>() {
-                            @Override
-                            public Iterator<? extends Resource>
-                            iterator(int first, int count) {
-                                return model.getObject().getResources().listIterator(first);
-                            }
-
-                            @Override
-                            public IModel<Resource> model(Resource resource) {
-                                return new VolatileEntityModel<Resource>(resource);
-                            }
-
-                            @Override
-                            public int size() {
-                                return model.getObject().getResources().size();
-                            }
-                        },
-                        64);
+                        cols, resourcesProvider, 64);
         resources.add(resourcesTable);
         resources.setVisible(model.getObject().getType() == Type.EXTENSIONAL);
-
+    }
+
+    private void addGeneratedBy(final IModel<VirtualCollection> model) {
         final Border generated = new AjaxToggleBorder("generatedByBorder",
                 new Model<String>("Intensional Collection Query"), CSS_CLASS);
@@ -325 +340 @@
 
     /**
-     * 
+     *
      * @param vc collection to check for
      * @throws UnauthorizedActionException if the VC is private and the current