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/17 15:09:34 UTC
isis git commit: ISIS-1613: fixes issue whereby non-editable
references were being rendered as editable.
Repository: isis
Updated Branches:
refs/heads/master 81b017e67 -> fd769b2d4
ISIS-1613: fixes issue whereby non-editable references were being rendered as editable.
Also:
- made the debug(...) method be a logged call
- removed some unused code
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fd769b2d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fd769b2d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fd769b2d
Branch: refs/heads/master
Commit: fd769b2d4977aaee4a9638fbcaaf90123ac16f4e
Parents: 81b017e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed May 17 16:07:07 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed May 17 16:07:07 2017 +0100
----------------------------------------------------------------------
.../model/mementos/ActionParameterMemento.java | 5 ++++
.../wicket/model/mementos/PropertyMemento.java | 5 ++++
.../viewer/wicket/model/models/ScalarModel.java | 19 ++++++++++++++--
.../scalars/ScalarPanelAbstract2.java | 24 ++++++--------------
.../scalars/reference/ReferencePanel.java | 2 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 4 ----
.../wicket/ui/panels/FormExecutorAbstract.java | 12 +++++++---
7 files changed, 44 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fd769b2d/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
index d6d1fb3..c09b9da 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
@@ -92,4 +92,9 @@ public class ActionParameterMemento implements Serializable {
return getActionParameter(specificationLoader).getSpecification();
}
+ @Override
+ public String toString() {
+ return getActionMemento().getNameParmsId() + "#" + getNumber();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fd769b2d/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
index 1f153ca..37c7533 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
@@ -120,4 +120,9 @@ public class PropertyMemento implements Serializable {
return true;
}
+ @Override
+ public String toString() {
+ return getOwningType().asString() + "#" + getIdentifier();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fd769b2d/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 0642788..ff51140 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
@@ -291,6 +291,11 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
public boolean isCollection(final ScalarModel scalarModel) {
return false;
}
+
+ @Override
+ public String toStringOf(final ScalarModel scalarModel) {
+ return this.name() + ": " + scalarModel.getPropertyMemento().toString();
+ }
},
PARAMETER {
@Override
@@ -525,6 +530,12 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
return actionParameter.getFeatureType() == FeatureType.ACTION_PARAMETER_COLLECTION;
}
+
+ @Override
+ public String toStringOf(final ScalarModel scalarModel) {
+ return this.name() + ": " + scalarModel.getParameterMemento().toString();
+ }
+
};
private static List<ObjectAdapter> choicesAsList(final ObjectAdapter[] choices) {
@@ -590,6 +601,8 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
public abstract ObjectAdapter load(final ScalarModel scalarModel);
public abstract boolean isCollection(final ScalarModel scalarModel);
+
+ public abstract String toStringOf(final ScalarModel scalarModel);
}
private final Kind kind;
@@ -1060,6 +1073,8 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
return actionArgsHint;
}
-
-
+ @Override
+ public String toString() {
+ return kind.toStringOf(this);
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fd769b2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 5e93b65..a5fa1da 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -203,16 +203,6 @@ public abstract class ScalarPanelAbstract2 extends PanelAbstract<ScalarModel> im
- /**
- * hook for highly dynamic components, eg conditional choices.
- *
- * <p>
- * Returning <tt>true</tt> means that the component is always rebuilt prior to
- * every {@link #onBeforeRender() render}ing.
- */
- protected boolean alwaysRebuildGui() {
- return false;
- }
/**
* Builds GUI lazily prior to first render.
@@ -256,14 +246,14 @@ public abstract class ScalarPanelAbstract2 extends PanelAbstract<ScalarModel> im
configureInlinePromptLinkCallback(inlinePromptLink);
}
- Component componentToHideIfAny = inlinePromptConfig.getComponentToHideIfAny();
- if (componentToHideIfAny != null || promptStyle == PromptStyle.DIALOG) {
- if (scalarModel.canEnterEditMode() && scalarModel.getPromptStyle() == PromptStyle.INLINE) {
- componentToHideIfAny.setVisibilityAllowed(false);
- } else {
- inlinePromptLink.setVisibilityAllowed(false);
- }
+ Component componentToHideIfAny = null;
+ if (scalarModel.canEnterEditMode() && promptStyle == PromptStyle.INLINE) {
+ componentToHideIfAny = inlinePromptConfig.getComponentToHideIfAny();
+ }
+ if (componentToHideIfAny == null) {
+ componentToHideIfAny = inlinePromptLink;
}
+ componentToHideIfAny.setVisibilityAllowed(false);
}
if(scalarModel.getKind() == ScalarModel.Kind.PROPERTY &&
scalarModel.getMode() == EntityModel.Mode.VIEW &&
http://git-wip-us.apache.org/repos/asf/isis/blob/fd769b2d/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 a8b2c62..3a4b8b8 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
@@ -286,7 +286,7 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract implements PanelW
final ComponentFactory componentFactory =
getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_AND_TITLE, entityModelForLink);
final Component component = componentFactory.createComponent(ComponentType.ENTITY_ICON_AND_TITLE.getWicketId(), entityModelForLink);
- if(scalarModel.getPromptStyle() == PromptStyle.INLINE) {
+ if(scalarModel.getPromptStyle() == PromptStyle.INLINE && scalarModel.canEnterEditMode()) {
// bit of a hack... allows us to suppress the title using CSS
component.add(new CssClassAppender("inlinePrompt"));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fd769b2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index f082954..e7ff129 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -112,10 +112,6 @@ public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract impleme
// ///////////////////////////////////////////////////////////////////
- @Override
- protected boolean alwaysRebuildGui() {
- return true;
- }
@Override
protected void onInitializeWhenViewMode() {
http://git-wip-us.apache.org/repos/asf/isis/blob/fd769b2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java
index d99dfdd..7cd54a1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java
@@ -13,6 +13,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
@@ -45,6 +47,8 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisBlobOr
public abstract class FormExecutorAbstract<M extends BookmarkableModel<ObjectAdapter> & ParentEntityModelProvider>
implements FormExecutor {
+ private static final Logger LOG = LoggerFactory.getLogger(FormExecutorAbstract.class);
+
protected final M model;
protected final WicketViewerSettings settings;
@@ -306,7 +310,9 @@ public abstract class FormExecutorAbstract<M extends BookmarkableModel<ObjectAda
}
}
- debug(componentsToRedraw, componentsNotToRedraw);
+ if(LOG.isDebugEnabled()) {
+ debug(componentsToRedraw, componentsNotToRedraw);
+ }
for (Component component : componentsToRedraw) {
target.add(component);
@@ -321,9 +327,9 @@ public abstract class FormExecutorAbstract<M extends BookmarkableModel<ObjectAda
}
private void debug(final String title, final List<Component> list) {
- System.out.println(">>> " + title + ":");
+ LOG.debug(">>> " + title + ":");
for (Component component : list) {
- System.out.println(
+ LOG.debug(
String.format("%30s: %s",
component.getClass().getSimpleName(),
component.getPath()));