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 2021/05/21 05:58:40 UTC
[isis] 01/01: ISIS-2601: removes dead code
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2601
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 61cc8fb9c8c304aabd032fe7727f3739f0702083
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 21 06:58:16 2021 +0100
ISIS-2601: removes dead code
---
.../wicket/model/models/BookmarkTreeNode.java | 21 +----
.../model/models/BookmarkTreeNodeComparator.java | 10 +--
.../isis/viewer/wicket/model/models/PageType.java | 1 -
.../ui/components/actionlink/ActionLinkPanel.html | 31 --------
.../ui/components/actionlink/ActionLinkPanel.java | 91 ----------------------
.../actionlink/ActionLinkPanelFactory.java | 59 --------------
.../bookmarkedpages/BookmarkedPagesPanel.java | 3 +-
.../ui/pages/actionprompt/ActionPromptPage.css | 18 -----
.../ui/pages/actionprompt/ActionPromptPage.html | 37 ---------
.../ui/pages/actionprompt/ActionPromptPage.java | 77 ------------------
.../ComponentFactoryRegistrarDefault.java | 6 --
.../registries/pages/PageClassListDefault.java | 8 --
.../viewer/wicketapp/IsisWicketApplication.java | 4 -
...ageClassListDefault_RegistrationAndCaching.java | 25 ++----
14 files changed, 12 insertions(+), 379 deletions(-)
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index 8045072..17e8c78 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -49,7 +49,6 @@ public class BookmarkTreeNode implements Serializable {
@Getter private final Bookmark oidNoVer; //TODO rename field, versions have been removed
@Getter private final String oidNoVerStr; //TODO rename field, versions have been removed
- private final PageType pageType;
private String title;
private PageParameters pageParameters;
@@ -75,9 +74,6 @@ public class BookmarkTreeNode implements Serializable {
PageParameterNames.OBJECT_OID.addStringTo(pageParameters, getOidNoVerStr());
this.title = bookmarkableModel.getTitle();
- this.pageType = bookmarkableModel instanceof EntityModel
- ? PageType.ENTITY
- : PageType.ACTION_PROMPT;
this.depth = depth;
}
@@ -89,10 +85,6 @@ public class BookmarkTreeNode implements Serializable {
this.title = title;
}
- public PageType getPageType() {
- return pageType;
- }
-
public List<BookmarkTreeNode> getChildren() {
return children;
}
@@ -118,18 +110,9 @@ public class BookmarkTreeNode implements Serializable {
*/
public boolean matches(BookmarkableModel candidateBookmarkableModel) {
if(candidateBookmarkableModel instanceof EntityModel) {
- if(this.pageType != PageType.ENTITY) {
- return false;
- }
return matchAndUpdateTitleFor((EntityModel) candidateBookmarkableModel);
- } else if(candidateBookmarkableModel instanceof ActionModel) {
- if(this.pageType != PageType.ACTION_PROMPT) {
- return false;
- }
- return matchFor((ActionModel) candidateBookmarkableModel);
- } else {
- return false;
}
+ return false;
}
/**
@@ -267,4 +250,4 @@ public class BookmarkTreeNode implements Serializable {
: null;
}
-}
\ No newline at end of file
+}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
index a428102..8321d6f 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
@@ -35,14 +35,6 @@ final class BookmarkTreeNodeComparator implements Comparator<BookmarkTreeNode> {
@Override
public int compare(BookmarkTreeNode o1, BookmarkTreeNode o2) {
- final PageType pageType1 = o1.getPageType();
- final PageType pageType2 = o2.getPageType();
-
- final int pageTypeComparison = pageType1.compareTo(pageType2);
- if(pageTypeComparison != 0) {
- return pageTypeComparison;
- }
-
final Oid oid1 = o1.getOidNoVer();
final Oid oid2 = o2.getOidNoVer();
@@ -66,4 +58,4 @@ final class BookmarkTreeNodeComparator implements Comparator<BookmarkTreeNode> {
.getIdentifier().getClassName();
}
-}
\ No newline at end of file
+}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
index d7af3dd..a2931cd 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
@@ -36,7 +36,6 @@ public enum PageType {
HOME_AFTER_PAGETIMEOUT,
ABOUT,
ENTITY,
- ACTION_PROMPT,
STANDALONE_COLLECTION,
VALUE,
VOID_RETURN;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html
deleted file mode 100644
index e239527..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
- <span wicket:id="actionLinkWrapper" class="actionLinkPanel actionLinkComponentType">
- <a href="#" wicket:id="actionLink">
- <span wicket:id="actionTitle" class="actionTitle">[action title]</span>
- </a>
- </span>
- </wicket:panel>
- </body>
-</html>
-
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
deleted file mode 100644
index 95c235b..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.wicket.ui.components.actionlink;
-
-import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.util.Links;
-
-/**
- * {@link PanelAbstract Panel} representing the icon and title of an entity,
- * as per the provided {@link EntityModel}.
- */
-public class ActionLinkPanel
-extends PanelAbstract<ManagedObject, ActionModel> {
-
- private static final long serialVersionUID = 1L;
-
- private static final String ID_ACTION_LINK_WRAPPER = "actionLinkWrapper";
- private static final String ID_ACTION_LINK = "actionLink";
- private static final String ID_ACTION_TITLE = "actionTitle";
-
- private Label label;
-
- public ActionLinkPanel(final String id, final ActionModel actionModel) {
- super(id, actionModel);
- }
-
- @Override
- protected void onBeforeRender() {
- buildGui();
- super.onBeforeRender();
- }
-
- private void buildGui() {
- addOrReplaceLinkWrapper();
- }
-
- private void addOrReplaceLinkWrapper() {
- final WebMarkupContainer entityLinkWrapper = addOrReplaceLinkWrapper(getModel());
- addOrReplace(entityLinkWrapper);
- }
-
- private WebMarkupContainer addOrReplaceLinkWrapper(final ActionModel actionModel) {
-
- final PageParameters pageParameters = actionModel.getPageParameters();
- final Class<? extends Page> pageClass = getPageClassRegistry().getPageClass(PageType.ACTION_PROMPT);
- final AbstractLink link = newLink(ID_ACTION_LINK, pageClass, pageParameters);
-
- label = new Label(ID_ACTION_TITLE, determineTitle());
- link.add(label);
-
- final WebMarkupContainer actionLinkWrapper = new WebMarkupContainer(ID_ACTION_LINK_WRAPPER);
- actionLinkWrapper.addOrReplace(link);
- return actionLinkWrapper;
- }
-
- private String determineTitle() {
- return getModel().getMetaModel().getId();
- }
-
- private AbstractLink newLink(final String linkId, final Class<? extends Page> pageClass, final PageParameters pageParameters) {
- return Links.newBookmarkablePageLink(linkId, pageParameters, pageClass);
- }
-
-}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
deleted file mode 100644
index 6725560..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.wicket.ui.components.actionlink;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.ui.ComponentFactory;
-import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
-import org.apache.isis.viewer.wicket.ui.ComponentType;
-
-/**
- * {@link ComponentFactory} for {@link ActionLinkPanel}.
- */
-public class ActionLinkPanelFactory extends ComponentFactoryAbstract {
-
- private static final long serialVersionUID = 1L;
-
- public ActionLinkPanelFactory() {
- super(ComponentType.ACTION_LINK, ActionLinkPanel.class);
- }
-
- @Override
- protected ApplicationAdvice appliesTo(IModel<?> model) {
- if(!(model instanceof ActionModel)) {
- return ApplicationAdvice.DOES_NOT_APPLY;
- }
- final ActionModel actionModel = (ActionModel) model;
- final SemanticsOf semantics = actionModel.getMetaModel().getSemantics();
- return ApplicationAdvice.appliesIf(semantics.isSafeInNature());
- }
-
- @Override
- public Component createComponent(final String id, final IModel<?> model) {
- final ActionModel actionModel = (ActionModel) model;
- return new ActionLinkPanel(id, actionModel);
- }
-
-
-}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index ec5ceb0..1c11265 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -134,8 +134,7 @@ extends PanelAbstract<List<BookmarkTreeNode>, BookmarkedPagesModel> {
protected void populateItem(ListItem<BookmarkTreeNode> item) {
final BookmarkTreeNode node = item.getModelObject();
try {
- final PageType pageType = node.getPageType();
- final Class<? extends Page> pageClass = pageClassRegistry.getPageClass(pageType);
+ final Class<? extends Page> pageClass = pageClassRegistry.getPageClass(PageType.ENTITY);
final AjaxLink<Object> clearBookmarkLink = new AjaxLink<Object>(ID_CLEAR_BOOKMARK_LINK) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css
deleted file mode 100644
index eaeea17..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
deleted file mode 100644
index f9d8b71..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:extend>
- <div class="actionPromptPage">
- <div wicket:id="bookmarks"></div>
- <div class="row">
- <div class="offset-2 col-8">
- <div wicket:id="actionPrompt"></div>
- </div>
- </div>
- </div>
- </wicket:extend>
- </body>
-</html>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
deleted file mode 100644
index 6cc0877..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.wicket.ui.pages.actionprompt;
-
-import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import org.apache.isis.core.runtime.context.IsisAppCommonContext;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
-
-/**
- * Web page representing an action invocation.
- */
-@AuthorizeInstantiation("org.apache.isis.viewer.wicket.roles.USER")
-public class ActionPromptPage extends PageAbstract {
-
- private static final long serialVersionUID = 1L;
-
- public ActionPromptPage(final ActionModel model) {
- super(
- new PageParameters(),
- model.getMetaModel().getName(),
- ComponentType.ACTION_PROMPT);
-
- addChildComponents(themeDiv, model);
-
- if(model.isBookmarkable()) {
- bookmarkPageIfShown(model);
- }
- addBookmarkedPages(themeDiv);
- }
-
-// /**
-// * Required for bookmarking of actions.
-// */
-// public ActionPromptPage(final PageParameters pageParameters) {
-// this(pageParameters, IsisContext.getSpecificationLoader());
-// }
-
- public ActionPromptPage(IsisAppCommonContext commonContext, PageParameters pageParameters) {
- this(pageParameters, buildModel(commonContext, pageParameters));
- }
-
- public ActionPromptPage(final PageParameters pageParameters, final ActionModel model) {
- super(pageParameters, model.getMetaModel().getName(), ComponentType.ACTION_PROMPT);
- addChildComponents(themeDiv, model);
-
- // no need to bookmark because the ActionParametersPanel will have done so for us
- addBookmarkedPages(themeDiv);
- }
-
- private static ActionModel buildModel(
- IsisAppCommonContext commonContext,
- PageParameters pageParameters) {
-
- return ActionModel.ofPageParameters(commonContext, pageParameters);
- }
-}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index 1fcd3e4..ecbd32a 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -29,7 +29,6 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
import org.apache.isis.viewer.wicket.ui.components.about.AboutPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.actioninfo.ActionInfoPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.actionlink.ActionLinkPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions.ServiceActionsPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions.TertiaryMenuPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.actions.ActionParametersFormPanelFactory;
@@ -154,7 +153,6 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
addComponentFactoriesForEntity(componentFactories);
addComponentFactoriesForActionInfo(componentFactories);
addComponentFactoriesForAction(componentFactories);
- addComponentFactoriesForActionLink(componentFactories);
addComponentFactoriesForPropertyEdit(componentFactories);
addComponentFactoriesForEntityCollectionContents(componentFactories);
addComponentFactoriesForEmptyCollection(componentFactories);
@@ -293,10 +291,6 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
componentFactories.add(new PropertyEditFormPanelFactory());
}
- protected void addComponentFactoriesForActionLink(final ComponentFactoryList componentFactories) {
- componentFactories.add(new ActionLinkPanelFactory());
- }
-
protected void addComponentFactoriesForApplicationActions(final ComponentFactoryList componentFactories) {
componentFactories.add(new ServiceActionsPanelFactory());
componentFactories.add(new TertiaryMenuPanelFactory());
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index f800da7..d6a647e 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -35,7 +35,6 @@ import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.password_reset.PasswordResetPage;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.register.RegisterPage;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.signup.RegistrationFormPage;
-import org.apache.isis.viewer.wicket.ui.pages.actionprompt.ActionPromptPage;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
@@ -66,18 +65,11 @@ public class PageClassListDefault implements PageClassList {
pageRegistry.registerPage(PageType.ENTITY, getEntityPageClass());
pageRegistry.registerPage(PageType.HOME, getHomePageClass());
pageRegistry.registerPage(PageType.HOME_AFTER_PAGETIMEOUT, getHomePageClass());
- pageRegistry.registerPage(PageType.ACTION_PROMPT, getActionPromptPageClass());
pageRegistry.registerPage(PageType.STANDALONE_COLLECTION, getStandaloneCollectionPageClass());
pageRegistry.registerPage(PageType.VALUE, getValuePageClass());
pageRegistry.registerPage(PageType.VOID_RETURN, getVoidReturnPageClass());
}
- /**
- * For subclassing if required.
- */
- protected Class<? extends Page> getActionPromptPageClass() {
- return ActionPromptPage.class;
- }
/**
* For subclassing if required.
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index f04e699..c98f34a 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -512,10 +512,6 @@ implements
mountPage("/entity/#{objectOid}", PageType.ENTITY);
- // nb: action mount cannot contain {actionArgs}, because the default
- // parameters encoder doesn't seem to be able to handle multiple args
- mountPage("/action/${objectOid}/${actionOwningSpec}/${actionId}/${actionType}", PageType.ACTION_PROMPT);
-
mountPage("/logout", WicketLogoutPage.class);
}
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
index d0033ce..4efaa34 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
@@ -23,14 +23,11 @@ import org.apache.wicket.Page;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.pages.actionprompt.ActionPromptPage;
+import org.apache.isis.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
public class PageClassListDefault_RegistrationAndCaching {
@@ -45,24 +42,18 @@ public class PageClassListDefault_RegistrationAndCaching {
}
@Test
- public void cachesPageByPageType() {
- final Class<? extends Page> pageClass = registryImpl.getPageClass(PageType.ACTION_PROMPT);
- assertThat(pageClass, is(not(nullValue())));
- }
-
- @Test
public void canRegisterNewPageType() {
- class TestingActionPage extends ActionPromptPage {
+ class TestingStandaloneCollectionPage extends StandaloneCollectionPage {
private static final long serialVersionUID = 1L;
- TestingActionPage() {
- super((ActionModel) null);
+ TestingStandaloneCollectionPage() {
+ super(null);
}
}
- registryImpl.registerPage(PageType.ACTION_PROMPT, TestingActionPage.class);
+ registryImpl.registerPage(PageType.STANDALONE_COLLECTION, TestingStandaloneCollectionPage.class);
- final Class<? extends Page> pageClass = registryImpl.getPageClass(PageType.ACTION_PROMPT);
- assertThat(pageClass, is(org.hamcrest.Matchers.equalTo(TestingActionPage.class)));
+ final Class<? extends Page> pageClass = registryImpl.getPageClass(PageType.STANDALONE_COLLECTION);
+ assertThat(pageClass, is(org.hamcrest.Matchers.equalTo(TestingStandaloneCollectionPage.class)));
}
}