Changeset 6330 for vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java

Timestamp:

06/30/15 15:04:50 (9 years ago)

Author:

Twan Goosen

Message:

display of hierarchy in the record page

File:

• vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java (modified) (5 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java

@@ -20 +20 @@
 import com.google.common.collect.Iterators;
 import eu.clarin.cmdi.vlo.FacetConstants;
-import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
 import eu.clarin.cmdi.vlo.wicket.components.NamedRecordPageLink;
-import eu.clarin.cmdi.vlo.wicket.components.RecordPageLink;
-import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrDocumentModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
-import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
 import java.util.Collection;
 import java.util.Iterator;
 import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.repeater.tree.AbstractTree;
 import org.apache.wicket.extensions.markup.html.repeater.tree.DefaultNestedTree;
 import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortableTreeProvider;
 import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -56 +50 @@
     private SolrDocumentService documentService;
 
-    @SpringBean(name = "documentParamsConverter")
-    private PageParametersConverter<SolrDocument> documentParamConverter;
+    private final SolrDocumentModel parentModel;
 
     public HierarchyPanel(String id, IModel<SolrDocument> documentModel) {
         super(id, documentModel);
+
+        final SolrFieldStringModel parentIdModel = new SolrFieldStringModel(getModel(), FacetConstants.FIELD_IS_PART_OF);
+        parentModel = new SolrDocumentModel(parentIdModel);
 
         add(createParentLink("parent"));
@@ -67 +63 @@
 
     private MarkupContainer createParentLink(String id) {
-        final SolrFieldStringModel parentIdModel = new SolrFieldStringModel(getModel(), FacetConstants.FIELD_IS_PART_OF);
-        final SolrDocumentModel parentModel = new SolrDocumentModel(parentIdModel);
+        final MarkupContainer parent = new WebMarkupContainer(id) {
 
-        final MarkupContainer parent = new WebMarkupContainer(id){
-            
             @Override
             protected void onConfigure() {
@@ -83 +76 @@
 
     private AbstractTree createTree(String id) {
-        return new DefaultNestedTree<SolrDocument>(id, createProvider()) {
+        final DefaultNestedTree<SolrDocument> tree = new DefaultNestedTree<SolrDocument>(id, createProvider()) {
 
             @Override
             protected Component newContentComponent(String id, final IModel<SolrDocument> node) {
-                return new NamedRecordPageLink(id, node);
+                return new NamedRecordPageLink(id, node) {
+
+                    @Override
+                    protected void onConfigure() {
+                        setEnabled(!node.equals(HierarchyPanel.this.getModel()));
+                    }
+                };
             }
 
         };
+        tree.add(new AttributeAppender("class", new AbstractReadOnlyModel<String>() {
+
+            @Override
+            public String getObject() {
+                if (parentModel.getObject() != null) {
+                    return "has-parent";
+                } else {
+                    return null;
+                }
+            }
+        }, " "));
+        return tree;
     }
 
@@ -127 +138 @@
     }
 
+    @Override
+    public void detachModels() {
+        super.detachModels();
+        parentModel.detach();
+    }
+
 }