You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/05/29 13:01:05 UTC
[2/7] isis git commit: ISIS-1613: ok,
dynamic icon and also reference working, I think.
ISIS-1613: ok, dynamic icon and also reference working, I think.
Was throwing an exception when cleared reference, resultant from pending value in the ScalarModel. Call clearPending on detach (for ScalarModel) to fix this.
Also, rather than EntityIconAndLinkPanel overriding isVisible(), instead use that for its immediate child, the 'entityLink' component
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/259284e7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/259284e7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/259284e7
Branch: refs/heads/master
Commit: 259284e75f47f6a2118c77112fcf5f898fb2a42c
Parents: 05783aa
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon May 29 14:49:21 2017 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon May 29 14:55:51 2017 +0200
----------------------------------------------------------------------
.../viewer/wicket/model/models/ScalarModel.java | 7 ++-
.../icontitle/EntityIconAndTitlePanel.java | 59 ++++++++++----------
.../scalars/reference/ReferencePanel.java | 2 +-
.../isis/viewer/wicket/ui/util/Links.java | 2 +-
4 files changed, 38 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/259284e7/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 7875cb2..83936d9 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -1008,8 +1008,11 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
return adapter;
}
-
-
+ @Override
+ protected void onDetach() {
+ clearPending();
+ super.onDetach();
+ }
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/259284e7/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 382695c..1a9539d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -25,6 +25,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.AbstractLink;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
@@ -44,7 +45,6 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.viewer.wicket.ui.util.Links;
/**
* {@link PanelAbstract Panel} representing the icon and title of an entity,
@@ -94,11 +94,6 @@ public class EntityIconAndTitlePanel extends PanelAbstract<ObjectAdapterModel> {
setOutputMarkupId(true);
}
- @Override
- public boolean isVisible() {
- return getModel().getObject() != null;
- }
-
private void addOrReplaceLinkWrapper() {
ObjectAdapterModel entityModel = getModel();
final WebMarkupContainer entityLinkWrapper = addOrReplaceLinkWrapper(entityModel);
@@ -116,36 +111,44 @@ public class EntityIconAndTitlePanel extends PanelAbstract<ObjectAdapterModel> {
return entityLinkWrapper;
}
- private AbstractLink createIconAndTitle(final ObjectAdapter adapter) {
- final AbstractLink link = createLinkWrapper();
-
- final String title = determineTitle();
-
- final String iconName = adapter.getIconName();
- final CssClassFaFacet cssClassFaFacet = adapter.getSpecification().getFacet(CssClassFaFacet.class);
- if (iconName != null || cssClassFaFacet == null) {
- link.addOrReplace(this.image = newImage(ID_ENTITY_ICON, adapter));
- Components.permanentlyHide(link, ID_ENTITY_FONT_AWESOME);
- } else {
- Label dummy = new Label(ID_ENTITY_FONT_AWESOME, "");
- link.addOrReplace(dummy);
- dummy.add(new CssClassAppender(cssClassFaFacet.value() + " fa-2x"));
- Components.permanentlyHide(link, ID_ENTITY_ICON);
- }
+ private AbstractLink createIconAndTitle(final ObjectAdapter adapterIfAny) {
+ final AbstractLink link = createDynamicallyVisibleLink();
- link.addOrReplace(this.label = newLabel(ID_ENTITY_TITLE, titleAbbreviated(title)));
+ if(adapterIfAny != null) {
+ final String title = determineTitle();
+
+ final String iconName = adapterIfAny.getIconName();
+ final CssClassFaFacet cssClassFaFacet = adapterIfAny.getSpecification().getFacet(CssClassFaFacet.class);
+ if (iconName != null || cssClassFaFacet == null) {
+ link.addOrReplace(this.image = newImage(ID_ENTITY_ICON, adapterIfAny));
+ Components.permanentlyHide(link, ID_ENTITY_FONT_AWESOME);
+ } else {
+ Label dummy = new Label(ID_ENTITY_FONT_AWESOME, "");
+ link.addOrReplace(dummy);
+ dummy.add(new CssClassAppender(cssClassFaFacet.value() + " fa-2x"));
+ Components.permanentlyHide(link, ID_ENTITY_ICON);
+ }
+
+ link.addOrReplace(this.label = newLabel(ID_ENTITY_TITLE, titleAbbreviated(title)));
+
+ String entityTypeName = adapterIfAny.getSpecification().getSingularName();
+ link.add(new AttributeModifier("title", entityTypeName + ": " + title));
+ }
- String entityTypeName = adapter.getSpecification().getSingularName();
- link.add(new AttributeModifier("title", entityTypeName + ": " + title));
-
return link;
}
- private AbstractLink createLinkWrapper() {
+ private AbstractLink createDynamicallyVisibleLink() {
final PageParameters pageParameters = getModel().getPageParametersWithoutUiHints();
final Class<? extends Page> pageClass = getPageClassRegistry().getPageClass(PageType.ENTITY);
- return Links.newBookmarkablePageLink(ID_ENTITY_LINK, pageParameters, pageClass);
+
+ return new BookmarkablePageLink<Void>(ID_ENTITY_LINK, pageClass, pageParameters) {
+ @Override
+ public boolean isVisible() {
+ return EntityIconAndTitlePanel.this.getModel().getObject() != null;
+ }
+ };
}
private Label newLabel(final String id, final String title) {
http://git-wip-us.apache.org/repos/asf/isis/blob/259284e7/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index e601de8..03c0bf7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -222,7 +222,7 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract implements PanelW
@Override
public void setObject(final String s) {
- // gnore
+ // ignore
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/259284e7/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
index 5d58417..b97f8eb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
@@ -57,13 +57,13 @@ public final class Links {
};
}
- // TODO mgrigorov: what is the added value ?
public static <T extends Page> AbstractLink newBookmarkablePageLink(
final String linkId, final PageParameters pageParameters, final Class<T> pageClass) {
return new BookmarkablePageLink<Void>(linkId, pageClass, pageParameters);
}
+ // TODO: seemingly unused...
public static <T extends Page> AbstractLink newBookmarkablePageLinkWithAnchor(
final String linkId, final PageParameters pageParameters, final Class<T> pageClass) {