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 2014/06/12 20:42:26 UTC
[2/7] git commit: ISIS-781: cosmetic refactorings/reformattings
ISIS-781: cosmetic refactorings/reformattings
no functional changes.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a2742633
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a2742633
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a2742633
Branch: refs/heads/master
Commit: a2742633bec29559a3537484b25fa3ffb1f7fc1e
Parents: f38aac4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 11 18:40:12 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 11 18:40:12 2014 +0100
----------------------------------------------------------------------
.../model/models/ApplicationActionsModel.java | 10 ++---
.../additionallinks/EntityActionUtil.java | 10 ++---
.../cssmenu/AppActionsCssMenuFactory.java | 10 ++---
.../cssmenu/AppActionsCssMenuLinkFactory.java | 2 +-
.../components/collection/CollectionPanel.java | 2 +-
.../ajaxtable/BulkActionsLinkFactory.java | 15 ++------
.../CollectionContentsAsAjaxTablePanel.java | 2 -
.../entity/EntityActionLinkFactory.java | 21 +++++------
.../entity/header/EntityHeaderPanel.java | 4 +-
.../components/scalars/ScalarPanelAbstract.java | 16 +++-----
.../widgets/cssmenu/ActionLinkFactory.java | 1 -
.../cssmenu/ActionLinkFactoryAbstract.java | 18 ++-------
.../widgets/cssmenu/CssMenuBuilder.java | 39 ++++++++++----------
.../components/widgets/cssmenu/CssMenuItem.java | 31 +++++++---------
.../wicket/ui/pages/entity/EntityPage.java | 2 +
.../viewer/wicket/ui/panels/FormAbstract.java | 11 ------
.../persistence/adapter/PojoAdapter.java | 14 ++-----
.../adaptermanager/AdapterManagerDefault.java | 2 +-
18 files changed, 82 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ApplicationActionsModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ApplicationActionsModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ApplicationActionsModel.java
index 824601d..c7d1c48 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ApplicationActionsModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ApplicationActionsModel.java
@@ -30,19 +30,19 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public class ApplicationActionsModel extends ModelAbstract<List<ObjectAdapter>> {
private static final long serialVersionUID = 1L;
- private ActionPromptProvider actionPromptModalWindowProvider;
+ private ActionPromptProvider actionPromptProvider;
@Override
protected List<ObjectAdapter> load() {
return getServiceAdapters();
}
- public void setActionPromptModalWindowProvider(ActionPromptProvider actionPromptModalWindowProvider) {
- this.actionPromptModalWindowProvider = actionPromptModalWindowProvider;
+ public void setActionPromptProvider(ActionPromptProvider actionPromptProvider) {
+ this.actionPromptProvider = actionPromptProvider;
}
- public ActionPromptProvider getActionPromptModalWindowProvider() {
- return actionPromptModalWindowProvider;
+ public ActionPromptProvider getActionPromptProvider() {
+ return actionPromptProvider;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java
index 33ec3a4..047bdc6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java
@@ -58,11 +58,9 @@ public final class EntityActionUtil {
private final static MemberOrderFacetComparator memberOrderFacetComparator = new MemberOrderFacetComparator(false);
public static List<LinkAndLabel> entityActions(
- final EntityModel entityModel,
- final ObjectAssociation association,
- final ActionPromptProvider actionPromptModalWindowProvider) {
-
-
+ final EntityModel entityModel,
+ final ObjectAssociation association,
+ final ActionPromptProvider actionPromptProvider) {
final List<ObjectAction> associatedActions = Lists.newArrayList();
@@ -88,7 +86,7 @@ public final class EntityActionUtil {
@Override
public LinkAndLabel apply(ObjectAction objectAction) {
- return linkFactory.newLink(adapterMemento, objectAction, LinksSelectorPanelAbstract.ID_ADDITIONAL_LINK, actionPromptModalWindowProvider);
+ return linkFactory.newLink(adapterMemento, objectAction, LinksSelectorPanelAbstract.ID_ADDITIONAL_LINK, actionPromptProvider);
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
index ddf0f32..88382ef 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
@@ -112,16 +112,16 @@ public class AppActionsCssMenuFactory extends ComponentFactoryAbstract {
// prune any service names that have no service actions
serviceNamesInOrder.retainAll(serviceActionsByName.keySet());
- return buildMenuItems(serviceNamesInOrder, serviceActionsByName, appActionsModel.getActionPromptModalWindowProvider());
+ return buildMenuItems(serviceNamesInOrder, serviceActionsByName, appActionsModel.getActionPromptProvider());
}
/**
* Builds a hierarchy of {@link CssMenuItem}s, following the provided map of {@link LogicalServiceAction}s (keyed by their service Name).
*/
private List<CssMenuItem> buildMenuItems(
- final List<String> serviceNamesInOrder,
- final Map<String, List<LogicalServiceAction>> serviceActionsByName,
- final ActionPromptProvider actionPromptModalWindowProvider) {
+ final List<String> serviceNamesInOrder,
+ final Map<String, List<LogicalServiceAction>> serviceActionsByName,
+ final ActionPromptProvider actionPromptProvider) {
final List<CssMenuItem> menuItems = Lists.newArrayList();
for (String serviceName : serviceNamesInOrder) {
@@ -135,7 +135,7 @@ public class AppActionsCssMenuFactory extends ComponentFactoryAbstract {
}
final ObjectAdapterMemento serviceAdapterMemento = logicalServiceAction.serviceAdapterMemento;
final ObjectAction objectAction = logicalServiceAction.objectAction;
- final Builder subMenuItemBuilder = serviceMenuItem.newSubMenuItem(serviceAdapterMemento, objectAction, cssMenuLinkFactory, actionPromptModalWindowProvider);
+ final Builder subMenuItemBuilder = serviceMenuItem.newSubMenuItem(serviceAdapterMemento, objectAction, cssMenuLinkFactory, actionPromptProvider);
if (subMenuItemBuilder == null) {
// not visible
continue;
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java
index ebe5eb7..0c70a41 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuLinkFactory.java
@@ -35,7 +35,7 @@ class AppActionsCssMenuLinkFactory extends ActionLinkFactoryAbstract {
@Override
public LinkAndLabel newLink(
- final ObjectAdapterMemento adapterMemento, final ObjectAction action, final String linkId,
+ final ObjectAdapterMemento adapterMemento, final ObjectAction action, final String linkId,
final ActionPromptProvider actionPromptModalWindowProvider) {
ObjectAdapter objectAdapter = adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index eede549..4d37f4e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -69,7 +69,7 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
this(id, collectionModel, new EntityModel(collectionModel.getParentObjectAdapterMemento()), collectionModel.getCollectionMemento().getCollection());
}
- CollectionPanel(String id, EntityCollectionModel collectionModel, EntityModel entityModel, OneToManyAssociation otma) {
+ CollectionPanel(final String id, final EntityCollectionModel collectionModel, final EntityModel entityModel, final OneToManyAssociation otma) {
super(id, collectionModel);
addActionPromptModalWindow();
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
index c2c023a..fe1c3af 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
@@ -19,28 +19,22 @@
package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable;
import java.util.List;
-
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-
import org.apache.wicket.Session;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.Link;
-
import org.apache.isis.applib.RecoverableException;
-import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.Bulk.InteractionContext.InvokedAs;
import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.command.Command.Executor;
+import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.authentication.MessageBroker;
-import org.apache.isis.core.commons.exceptions.IsisApplicationException;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
@@ -54,7 +48,6 @@ import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.actionresponse.ActionResultResponse;
-import org.apache.isis.viewer.wicket.ui.actionresponse.ActionResultResponseHandlingStrategy;
import org.apache.isis.viewer.wicket.ui.actionresponse.ActionResultResponseType;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.ActionLinkFactory;
@@ -81,9 +74,9 @@ final class BulkActionsLinkFactory implements ActionLinkFactory {
@Override
public LinkAndLabel newLink(
- final ObjectAdapterMemento serviceAdapterMemento,
- final ObjectAction objectAction,
- final String linkId,
+ final ObjectAdapterMemento serviceAdapterMemento,
+ final ObjectAction objectAction,
+ final String linkId,
final ActionPromptProvider actionPromptModalWindowProvider) {
final ActionMemento actionMemento = new ActionMemento(objectAction);
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index aa02312..75be297 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -30,7 +30,6 @@ import com.google.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.Model;
@@ -50,7 +49,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.common.SelectionHandler;
-import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.hints.UiHintPathSignificant;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityActionLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityActionLinkFactory.java
index ebf69c8..7cd57d6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityActionLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityActionLinkFactory.java
@@ -19,9 +19,7 @@
package org.apache.isis.viewer.wicket.ui.components.entity;
-import org.apache.wicket.Page;
import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -33,13 +31,8 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.model.models.*;
import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.ActionLinkFactoryAbstract;
-import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuItem;
-import org.apache.isis.viewer.wicket.ui.util.Links;
public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
@@ -53,14 +46,19 @@ public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
}
@Override
- public LinkAndLabel newLink(final ObjectAdapterMemento adapterMemento, final ObjectAction action, final String linkId, final ActionPromptProvider actionPromptModalWindowProvider) {
+ public LinkAndLabel newLink(
+ final ObjectAdapterMemento adapterMemento,
+ final ObjectAction action,
+ final String linkId,
+ final ActionPromptProvider actionPromptProvider) {
+
final ObjectAdapter adapter = adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
final Boolean persistent = adapter.representsPersistent();
if (!persistent) {
throw new IllegalArgumentException("Object '" + adapter.titleString(null) + "' is not persistent.");
}
-
+
// check visibility and whether enabled
final AuthenticationSession session = getAuthenticationSession();
@@ -68,8 +66,9 @@ public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
if (visibility.isVetoed()) {
return null;
}
+
- final AbstractLink link = newLink(linkId, adapter, action, actionPromptModalWindowProvider);
+ final AbstractLink link = newLink(linkId, adapter, action, actionPromptProvider);
final Consent usability = action.isUsable(session, adapter, Where.OBJECT_FORMS);
final String disabledReasonIfAny = usability.getReason();
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
index fb16b44..314625f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
@@ -42,9 +42,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
+import org.apache.isis.viewer.wicket.model.models.*;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.components.entity.EntityActionLinkFactory;
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index b5ab758..109f6f8 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -40,13 +40,10 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.*;
import org.apache.isis.viewer.wicket.model.models.EntityModel.RenderingHint;
-import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.additionallinks.AdditionalLinksPanel;
import org.apache.isis.viewer.wicket.ui.components.additionallinks.EntityActionUtil;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract.Rendering;
import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel.ScalarModelProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
@@ -174,11 +171,9 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
* Builds GUI lazily prior to first render.
*
* <p>
- * This design allows the panel to be configured first, using
- * {@link #setFormat(Rendering)}.
- *
+ * This design allows the panel to be configured first.
+ *
* @see #onBeforeRender()
- * @see #setFormat(Rendering)
*/
private void buildGui() {
@@ -250,8 +245,9 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
if(scalarModel.getKind() == ScalarModel.Kind.PROPERTY) {
final ObjectAdapterMemento parentMemento = scalarModel.getParentObjectAdapterMemento();
final EntityModel parentEntityModel = new EntityModel(parentMemento);
- final ActionPromptProvider provider = ActionPromptProvider.Util.getFrom(this);
- entityActions = EntityActionUtil.entityActions(parentEntityModel, scalarModel.getPropertyMemento().getProperty(), provider);
+ final ActionPromptProvider actionPromptProvider = ActionPromptProvider.Util.getFrom(this);
+ entityActions = EntityActionUtil.entityActions(
+ parentEntityModel, scalarModel.getPropertyMemento().getProperty(), actionPromptProvider);
} else {
entityActions = null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactory.java
index a13db85..2f4b84a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactory.java
@@ -20,7 +20,6 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import java.io.Serializable;
-
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
index 5b6d69c..6a31f98 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
@@ -19,9 +19,6 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import org.apache.wicket.Application;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -29,25 +26,18 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.markup.html.link.PopupSettings;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.resource.IResourceStream;
-
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
-import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
-import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.model.models.*;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
@@ -82,8 +72,8 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
* concurrency checking is disabled; otherwise it is enforced.
*/
protected AbstractLink newLink(
- final String linkId,
- final ObjectAdapter objectAdapter, final ObjectAction action,
+ final String linkId,
+ final ObjectAdapter objectAdapter, final ObjectAction action,
final ActionPromptProvider actionPromptProvider) {
final ActionPrompt actionPrompt = actionPromptProvider.getActionPrompt();
@@ -98,7 +88,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
@Override
public void onClick(AjaxRequestTarget target) {
-
+
if(ajaxDeferredBehaviour != null) {
ajaxDeferredBehaviour.initiate(target);
} else {
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
index 4bebb5e..d319c3c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
@@ -70,25 +70,26 @@ public class CssMenuBuilder {
public CssMenuPanel buildPanel(
- final String wicketId, final String rootName,
- final ActionPromptProvider actionPromptModalWindowProvider) {
+ final String wicketId,
+ final String rootName,
+ final ActionPromptProvider actionPromptProvider) {
final CssMenuItem findUsing = CssMenuItem.newMenuItem(rootName).build();
- addMenuItems(findUsing, actions, actionPromptModalWindowProvider);
+ addMenuItems(findUsing, actions, actionPromptProvider);
final CssMenuPanel cssMenuPanel = new CssMenuPanel(wicketId, Style.SMALL, Collections.singletonList(findUsing));
return cssMenuPanel;
}
private void addMenuItems(
- final CssMenuItem parent,
- final List<ObjectAction> actions,
- final ActionPromptProvider actionPromptModalWindowProvider) {
- addMenuItemsForActionsOfType(parent, actions, ActionType.USER, actionPromptModalWindowProvider);
+ final CssMenuItem parent,
+ final List<ObjectAction> actions,
+ final ActionPromptProvider actionPromptProvider) {
+ addMenuItemsForActionsOfType(parent, actions, ActionType.USER, actionPromptProvider);
if ( isExploring() || isPrototyping()) {
- addMenuItemsForActionsOfType(parent, actions, ActionType.EXPLORATION, actionPromptModalWindowProvider);
- addMenuItemsForActionsOfType(parent, actions, ActionType.PROTOTYPE, actionPromptModalWindowProvider);
+ addMenuItemsForActionsOfType(parent, actions, ActionType.EXPLORATION, actionPromptProvider);
+ addMenuItemsForActionsOfType(parent, actions, ActionType.PROTOTYPE, actionPromptProvider);
}
if (isDebugMode()) {
- addMenuItemsForActionsOfType(parent, actions, ActionType.DEBUG, actionPromptModalWindowProvider);
+ addMenuItemsForActionsOfType(parent, actions, ActionType.DEBUG, actionPromptProvider);
}
}
@@ -110,26 +111,26 @@ public class CssMenuBuilder {
}
private void addMenuItemsForActionsOfType(
- final CssMenuItem parent,
- final List<ObjectAction> actions,
- final ActionType type,
- final ActionPromptProvider actionPromptModalWindowProvider) {
+ final CssMenuItem parent,
+ final List<ObjectAction> actions,
+ final ActionType type,
+ final ActionPromptProvider actionPromptProvider) {
final Collection<ObjectAction> filterActionsOfType = Collections2.filter(actions, Filters.asPredicate(ObjectAction.Filters.ofType(type)));
for (final ObjectAction action : filterActionsOfType) {
- addMenuItem(parent, action, actionPromptModalWindowProvider);
+ addMenuItem(parent, action, actionPromptProvider);
}
}
private void addMenuItem(
- final CssMenuItem parent,
- final ObjectAction action,
+ final CssMenuItem parent,
+ final ObjectAction action,
final ActionPromptProvider actionPromptModalWindowProvider) {
addMenuItemForAction(parent, action, actionPromptModalWindowProvider);
}
private void addMenuItemForAction(
- final CssMenuItem parent,
- final ObjectAction action,
+ final CssMenuItem parent,
+ final ObjectAction action,
final ActionPromptProvider actionPromptModalWindowProvider) {
final NotContributedFacet notContributed = action.getFacet(NotContributedFacet.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
index eb00c48..948943f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
@@ -19,14 +19,10 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
-import static org.hamcrest.CoreMatchers.is;
-
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-
import com.google.common.collect.Lists;
-
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -35,7 +31,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.model.Model;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.value.Blob;
@@ -57,6 +52,8 @@ import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
+import static org.hamcrest.CoreMatchers.is;
+
public class CssMenuItem implements Serializable {
private static final long serialVersionUID = 1L;
@@ -260,16 +257,12 @@ public class CssMenuItem implements Serializable {
/**
* Creates a {@link Builder} for a submenu item invoking an action on the provided
* {@link ObjectAdapterMemento target adapter}.
- * @param page
- *
- * @return the builder, else <tt>null</tt> if the action is not visible for
- * the current user.
*/
public Builder newSubMenuItem(
- final ObjectAdapterMemento targetAdapterMemento,
- final ObjectAction objectAction,
- final ActionLinkFactory cssMenuLinkFactory,
- final ActionPromptProvider actionPromptModalWindowProvider) {
+ final ObjectAdapterMemento targetAdapterMemento,
+ final ObjectAction objectAction,
+ final ActionLinkFactory cssMenuLinkFactory,
+ final ActionPromptProvider actionPromptProvider) {
// check visibility
final AuthenticationSession session = getAuthenticationSession();
@@ -280,7 +273,9 @@ public class CssMenuItem implements Serializable {
}
// build the link
- final LinkAndLabel linkAndLabel = cssMenuLinkFactory.newLink(targetAdapterMemento, objectAction, PageAbstract.ID_MENU_LINK, actionPromptModalWindowProvider);
+ final LinkAndLabel linkAndLabel = cssMenuLinkFactory.newLink(
+ targetAdapterMemento, objectAction, PageAbstract.ID_MENU_LINK,
+ actionPromptProvider);
if(linkAndLabel==null) {
// can only get a null if invisible, so this should not happen given guard above
return null;
@@ -345,11 +340,13 @@ public class CssMenuItem implements Serializable {
/**
* Creates a {@link Builder} for a submenu item where the provided {@link ActionLinkFactory} is able to provide the target adapter.
- * @param page
*/
- public Builder newSubMenuItem(final ObjectAction objectAction, final ActionLinkFactory cssMenuLinkFactory, final ActionPromptProvider actionPromptModalWindowProvider) {
+ public Builder newSubMenuItem(
+ final ObjectAction objectAction,
+ final ActionLinkFactory cssMenuLinkFactory,
+ final ActionPromptProvider actionPromptProvider) {
- final LinkAndLabel linkAndLabel = cssMenuLinkFactory.newLink(null, objectAction, PageAbstract.ID_MENU_LINK, actionPromptModalWindowProvider);
+ final LinkAndLabel linkAndLabel = cssMenuLinkFactory.newLink(null, objectAction, PageAbstract.ID_MENU_LINK, actionPromptProvider);
final AbstractLink link = linkAndLabel.getLink();
final String actionLabel = linkAndLabel.getLabel();
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index 26c0bb2..8c1018f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -147,4 +147,6 @@ public class EntityPage extends PageAbstract {
return IsisContext.getDeploymentType();
}
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 0c417e4..048e25f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -20,10 +20,6 @@
package org.apache.isis.viewer.wicket.ui.panels;
import java.util.List;
-import java.util.concurrent.Callable;
-
-import javax.inject.Inject;
-
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
@@ -31,14 +27,11 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
-
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
-import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerDefault;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.Persistor;
import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
@@ -46,7 +39,6 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
-import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
public abstract class FormAbstract<T> extends Form<T> implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, AuthenticationSessionProvider, PersistenceSessionProvider {
@@ -121,9 +113,6 @@ public abstract class FormAbstract<T> extends Form<T> implements IHeaderContribu
} finally {
preValidationErrorIfAny = null;
}
-
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 07cf7bb..2d855f4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -19,12 +19,8 @@
package org.apache.isis.core.runtime.persistence.adapter;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.ensure.Assert;
@@ -42,15 +38,13 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
-import org.apache.isis.core.metamodel.spec.Instance;
-import org.apache.isis.core.metamodel.spec.InstanceAbstract;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.Specification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.*;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+
public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
private final static Logger LOG = LoggerFactory.getLogger(PojoAdapter.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/a2742633/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
index ffd48f9..fb9ba0f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
@@ -783,7 +783,7 @@ public class AdapterManagerDefault implements AdapterManagerSpi {
final ObjectAdapter adapterAccordingToOidAdapterMap = oidAdapterMap.getAdapter(adapterOid);
// take care not to touch the pojo, since it might have been deleted.
ensureThatArg(
- adapter, is(adapterAccordingToOidAdapterMap),
+ adapter, is(adapterAccordingToOidAdapterMap),
"mismatch in OidAdapter map: " + "adapter's Oid: " + adapterOid + ", " + "provided adapter's OID: " + adapter.getOid() + "; " + "map's adapter's Oid: " + adapterAccordingToOidAdapterMap.getOid());
}