Changeset 1001

Timestamp:

12/17/10 11:06:14 (13 years ago)

Author:

oschonef

Message:

• hide empty properties

Location:

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

Files:

• VirtualCollectionDetailsPage.html (modified) (1 diff)
• VirtualCollectionDetailsPage.java (modified) (6 diffs)

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

@@ -68 +68 @@
     </wicket:enclosure>
     <wicket:enclosure child="generatedBy.query.value">
-      <label>Profile</label> <span wicket:id="generatedBy.query.value"></span> <br />
+      <label>Value</label> <span wicket:id="generatedBy.query.value"></span> <br />
     </wicket:enclosure>
   </div>

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.wicket.Component;
 import org.apache.wicket.Page;
+import org.apache.wicket.behavior.AbstractBehavior;
 import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
@@ -35 +39 @@
     private static final String CSS_CLASS = "collectionsDetails";
 
+    /*
+     * Actually, we really want the behavior to hide the component on
+     * the beforeRender() call, but we always get an exception from Wicket
+     * that we are not supposed to change the page hierarchy anymore. This
+     * class is a hack to avoid this exception.
+     */
+    private final class HideIfEmptyBehavior extends AbstractBehavior {
+        private final List<Component> components = new LinkedList<Component>();
+        
+        @Override
+        public void bind(Component component) {
+            super.bind(component);
+            components.add(component);
+        }
+
+        public void hideEmptyComponents() {
+            for (Component component : components) {
+              Object obj = component.getDefaultModelObject();
+              if (obj == null) {
+                  component.setVisible(false);
+              } else {
+                  if (obj instanceof Collection<?>) {
+                      if (((Collection<?>) obj).isEmpty()) {
+                          component.setVisible(false);
+                      }
+                  }
+              }
+            }
+        }
+
+        @Override
+        public void cleanup() {
+            super.cleanup();
+            components.clear();
+        }
+    }
+
+    
+    private final HideIfEmptyBehavior hideIfEmpty = new HideIfEmptyBehavior();
+
+
     public VirtualCollectionDetailsPage(final IModel<VirtualCollection> model,
             final Page previousPage) {
-        super(model);
-
+        super(new CompoundPropertyModel<VirtualCollection>(model.getObject()));
         if (previousPage == null) {
             throw new IllegalArgumentException("previousPage == null");
@@ -56 +100 @@
         general.add(new Label("type"));
         general.add(new Label("creationDate"));
-        general.add(new MultiLineLabel("description"));
-        general.add(new Label("purpose"));
-        general.add(new Label("reproducibility"));
-        general.add(new Label("reproducibilityNotice"));
+        general.add(new MultiLineLabel("description").add(hideIfEmpty));
+        general.add(new Label("purpose").add(hideIfEmpty));
+        general.add(new Label("reproducibility").add(hideIfEmpty));
+        general.add(new Label("reproducibilityNotice").add(hideIfEmpty));
         final ListView<String> keywords = new ListView<String>("keywords") {
             @Override
@@ -66 +110 @@
             }
         };
+        keywords.add(hideIfEmpty);
         general.add(keywords);
 
@@ -75 +120 @@
             protected void populateItem(ListItem<Creator> item) {
                 item.add(new Label("person"));
-                item.add(new MultiLineLabel("address"));
-                item.add(new Label("organisation"));
-                item.add(new Label("email"));
-                item.add(new Label("telephone"));
+                item.add(new MultiLineLabel("address").add(hideIfEmpty));
+                item.add(new Label("organisation").add(hideIfEmpty));
+                item.add(new Label("email").add(hideIfEmpty));
+                item.add(new Label("telephone").add(hideIfEmpty));
                 final IModel<String> siteModel =
                     new ComponentPropertyModel<String>("website");
                 item.add(new ExternalLink("website", siteModel, siteModel)
-                        .setPopupSettings(new PopupSettings()));
-                item.add(new Label("role"));
+                        .setPopupSettings(new PopupSettings())
+                        .add(hideIfEmpty));
+                item.add(new Label("role").add(hideIfEmpty));
             }
 
@@ -132 +178 @@
         add(generated);
         generated.add(new Label("generatedBy.description"));
-        generated.add(new Label("generatedBy.uri"));
-        generated.add(new Label("generatedBy.query.profile"));
-        generated.add(new Label("generatedBy.query.value"));
+        generated.add(new Label("generatedBy.uri").add(hideIfEmpty));
+        generated.add(new Label("generatedBy.query.profile").add(hideIfEmpty));
+        generated.add(new Label("generatedBy.query.value").add(hideIfEmpty));
         generated.setVisible(model.getObject().getType() == Type.INTENSIONAL);
     }
 
+    @Override
+    protected void onBeforeRender() {
+        super.onBeforeRender();
+        hideIfEmpty.hideEmptyComponents();
+    }
+
 } // class VirtualCollectionDetailsPage