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 2015/09/03 14:32:04 UTC
[13/87] [abbrv] [partial] isis git commit: ISIS-1194: moving the
wicket submodules to be direct children of core;
removing the isis-viewer-wicket parent pom.
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
deleted file mode 100644
index 4069731..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
+++ /dev/null
@@ -1,44 +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.actionmenu.serviceactions;
-
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.model.IModel;
-
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-
-/**
- * Package-level adapter for menu items and submenu-items.
- */
-abstract class CssMenuItemPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
-
- private static final long serialVersionUID = 1L;
-
- public CssMenuItemPanelAbstract(final String id, final T model) {
- super(id, model);
- setRenderBodyOnly(true);
- }
-
- protected void addSubMenuItems(final WebMarkupContainer markupContainer, final CssMenuItem cssMenuItem) {
- cssMenuItem.addTo(markupContainer);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
deleted file mode 100644
index d70febc..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
+++ /dev/null
@@ -1,34 +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>
- <ul class="cssSubMenuItemsPanel">
- <li wicket:id="subMenuItems" class="cssSubMenuItem">
- <a wicket:id="menuLink" class="btn btn-primary btn-sm">
- <span class="menuLabel" wicket:id="menuLabel">[menu label]</span>
- </a>
- <p wicket:id="menuLabel">[menu label]</p>
- <span wicket:id="subMenuItems">[subMenuItems]</span>
- </li>
- </ul>
-</wicket:panel>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
deleted file mode 100644
index 2ac948d..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.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.actionmenu.serviceactions;
-
-import java.util.List;
-
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.util.ListModel;
-
-/**
- * Panel containing a list of {@link CssMenuItem}s acting as submenus of a
- * parent {@link CssMenuItem}.
- */
-class CssSubMenuItemsPanel extends CssMenuItemPanelAbstract<CssSubMenuItemsPanel.MyModel> {
-
- private static final long serialVersionUID = 1L;
-
- static class MyModel extends ListModel<CssMenuItem> {
-
- private static final long serialVersionUID = 1L;
-
- public MyModel(final List<CssMenuItem> cssMenuItems) {
- super(cssMenuItems);
- }
- }
-
- public CssSubMenuItemsPanel(final String id, final List<CssMenuItem> subMenuItems) {
- super(id, new MyModel(subMenuItems));
- setRenderBodyOnly(true);
-
- final RepeatingView menuItemRv = new RepeatingView(getId());
- add(menuItemRv);
- for (final CssMenuItem cssMenuItem : getModel().getObject()) {
- final WebMarkupContainer menuItemMarkup = new WebMarkupContainer(menuItemRv.newChildId());
- menuItemRv.add(menuItemMarkup);
-
- addSubMenuItems(menuItemMarkup, cssMenuItem);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
deleted file mode 100644
index 2aa97ba..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
+++ /dev/null
@@ -1,48 +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.actionmenu.serviceactions;
-
-import org.apache.wicket.markup.html.link.AbstractLink;
-
-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.feature.ObjectAction;
-import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
-import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.ui.components.widgets.linkandlabel.ActionLinkFactoryAbstract;
-
-class ServiceActionLinkFactory extends ActionLinkFactoryAbstract {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public LinkAndLabel newLink(
- final ObjectAdapterMemento adapterMemento,
- final ObjectAction action,
- final String linkId) {
-
- ObjectAdapter objectAdapter = adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
-
- final AbstractLink link = newLink(linkId, objectAdapter, action);
-
- return newLinkAndLabel(objectAdapter, action, link, null);
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
deleted file mode 100644
index 4931ea2..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ /dev/null
@@ -1,329 +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.actionmenu.serviceactions;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.Model;
-
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.filter.Filters;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import org.apache.isis.core.metamodel.spec.ActionType;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.Contributed;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
-import org.apache.isis.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
-import org.apache.isis.viewer.wicket.ui.components.widgets.linkandlabel.ActionLinkFactory;
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipBehavior;
-
-public final class ServiceActionUtil {
-
- private ServiceActionUtil(){}
-
- private final static ActionLinkFactory linkAndLabelFactory = new ServiceActionLinkFactory();
-
- static void addLeafItem(final CssMenuItem menuItem, final ListItem<CssMenuItem> listItem, final MarkupContainer parent) {
- Fragment leafItem;
- if (!menuItem.isSeparator()) {
- leafItem = new Fragment("content", "leafItem", parent);
-
- AbstractLink subMenuItemLink = menuItem.getLink();
-
- Label menuItemLabel = new Label("menuLinkLabel", menuItem.getName());
- subMenuItemLink.addOrReplace(menuItemLabel);
-
- if (!menuItem.isEnabled()) {
- listItem.add(new CssClassAppender("disabled"));
- subMenuItemLink.setEnabled(false);
- TooltipBehavior tooltipBehavior = new TooltipBehavior(Model.of(menuItem.getDisabledReason()));
- listItem.add(tooltipBehavior);
- }
- if (menuItem.isPrototyping()) {
- subMenuItemLink.add(new CssClassAppender("prototype"));
- }
- leafItem.add(subMenuItemLink);
-
- String cssClassFa = menuItem.getCssClassFa();
- if (Strings.isNullOrEmpty(cssClassFa)) {
- subMenuItemLink.add(new CssClassAppender("menuLinkSpacer"));
- } else {
- menuItemLabel.add(new CssClassFaBehavior(cssClassFa, menuItem.getCssClassFaPosition()));
- }
-
- String cssClass = menuItem.getCssClass();
- if (!Strings.isNullOrEmpty(cssClass)) {
- subMenuItemLink.add(new CssClassAppender(cssClass));
- }
- } else {
- leafItem = new Fragment("content", "empty", parent);
- listItem.add(new CssClassAppender("divider"));
- }
- listItem.add(leafItem);
- }
-
-
- enum SeparatorStrategy {
- WITH_SEPARATORS {
- List<CssMenuItem> applySeparatorStrategy(final CssMenuItem subMenuItem) {
- return withSeparators(subMenuItem);
- }
-
- },
- WITHOUT_SEPARATORS {
- List<CssMenuItem> applySeparatorStrategy(final CssMenuItem subMenuItem) {
- final List<CssMenuItem> subMenuItems = subMenuItem.getSubMenuItems();
- return subMenuItems;
- }
- };
-
- abstract List<CssMenuItem> applySeparatorStrategy(final CssMenuItem subMenuItem);
- }
-
- static List<CssMenuItem> withSeparators(CssMenuItem subMenuItem) {
- final List<CssMenuItem> subMenuItems = subMenuItem.getSubMenuItems();
- final List<CssMenuItem> cssMenuItemsWithSeparators = withSeparators(subMenuItems);
- subMenuItem.replaceSubMenuItems(cssMenuItemsWithSeparators);
- return cssMenuItemsWithSeparators;
- }
-
- static List<CssMenuItem> withSeparators(List<CssMenuItem> subMenuItems) {
- final List<CssMenuItem> itemsWithSeparators = Lists.newArrayList();
- for (CssMenuItem menuItem : subMenuItems) {
- if(menuItem.requiresSeparator()) {
- if(!itemsWithSeparators.isEmpty()) {
- // bit nasty... we add a new separator item
- final CssMenuItem separatorItem = CssMenuItem.newMenuItem(menuItem.getName() + "-separator")
- .prototyping(menuItem.isPrototyping())
- .build();
- separatorItem.setSeparator(true);
- itemsWithSeparators.add(separatorItem);
- }
- menuItem.setRequiresSeparator(false);
- }
- itemsWithSeparators.add(menuItem);
- }
- return itemsWithSeparators;
- }
-
- static void addFolderItem(final CssMenuItem subMenuItem, final ListItem<CssMenuItem> listItem, final MarkupContainer parent, final SeparatorStrategy separatorStrategy) {
- listItem.add(new CssClassAppender("dropdown-submenu"));
-
- Fragment folderItem = new Fragment("content", "folderItem", parent);
- listItem.add(folderItem);
-
- folderItem.add(new Label("folderName", subMenuItem.getName()));
- final List<CssMenuItem> menuItems = separatorStrategy.applySeparatorStrategy(subMenuItem);
- ListView<CssMenuItem> subMenuItemsView = new ListView<CssMenuItem>("subMenuItems",
- menuItems) {
- @Override
- protected void populateItem(ListItem<CssMenuItem> listItem) {
- CssMenuItem subMenuItem = listItem.getModelObject();
-
- if (subMenuItem.hasSubMenuItems()) {
- addFolderItem(subMenuItem, listItem, parent, SeparatorStrategy.WITHOUT_SEPARATORS);
- } else {
- addLeafItem(subMenuItem, listItem, parent);
- }
- }
- };
- folderItem.add(subMenuItemsView);
- }
-
- static class LogicalServiceAction {
- private final String serviceName;
- private final ObjectAdapter serviceAdapter;
- private final ObjectAdapterMemento serviceAdapterMemento;
- private final ObjectAction objectAction;
- public boolean separator;
-
- LogicalServiceAction(final String serviceName, final ObjectAdapter serviceAdapter, final ObjectAction objectAction) {
- this.serviceName = serviceName;
- this.serviceAdapter = serviceAdapter;
- this.serviceAdapterMemento = ObjectAdapterMemento.createOrNull(serviceAdapter);
- this.objectAction = objectAction;
- }
- @Override
- public String toString() {
- return serviceName + " ~ " + objectAction.getIdentifier().toFullIdentityString();
- }
- }
-
- public static List<CssMenuItem> buildMenu(final ServiceActionsModel appActionsModel) {
-
- final List<ObjectAdapter> serviceAdapters = appActionsModel.getObject();
-
- final List<LogicalServiceAction> serviceActions = Lists.newArrayList();
- for (final ObjectAdapter serviceAdapter : serviceAdapters) {
- collateServiceActions(serviceAdapter, ActionType.USER, serviceActions);
- collateServiceActions(serviceAdapter, ActionType.PROTOTYPE, serviceActions);
- }
-
- final Set<String> serviceNamesInOrder = serviceNamesInOrder(serviceAdapters, serviceActions);
- final Map<String, List<LogicalServiceAction>> serviceActionsByName = groupByServiceName(serviceActions);
-
- // prune any service names that have no service actions
- serviceNamesInOrder.retainAll(serviceActionsByName.keySet());
-
- return buildMenuItems(serviceNamesInOrder, serviceActionsByName, linkAndLabelFactory);
- }
-
- /**
- * Builds a hierarchy of {@link CssMenuItem}s, following the provided map of {@link LogicalServiceAction}s (keyed by their service Name).
- */
- private static List<CssMenuItem> buildMenuItems(
- final Set<String> serviceNamesInOrder,
- final Map<String, List<LogicalServiceAction>> serviceActionsByName,
- final ActionLinkFactory actionLinkFactory) {
-
- final List<CssMenuItem> menuItems = Lists.newArrayList();
- for (String serviceName : serviceNamesInOrder) {
- final CssMenuItem serviceMenuItem = CssMenuItem.newMenuItem(serviceName).build();
- final List<LogicalServiceAction> serviceActionsForName = serviceActionsByName.get(serviceName);
- for (LogicalServiceAction logicalServiceAction : serviceActionsForName) {
- final ObjectAdapter serviceAdapter = logicalServiceAction.serviceAdapter;
- final ObjectSpecification serviceSpec = serviceAdapter.getSpecification();
- if (serviceSpec.isHidden()) {
- continue;
- }
- final ObjectAdapterMemento serviceAdapterMemento = logicalServiceAction.serviceAdapterMemento;
- final ObjectAction objectAction = logicalServiceAction.objectAction;
- final boolean separator = logicalServiceAction.separator;
- final CssMenuItem.Builder subMenuItemBuilder = serviceMenuItem.newSubMenuItem(serviceAdapterMemento, objectAction, separator, actionLinkFactory);
- if (subMenuItemBuilder == null) {
- // not visible
- continue;
- }
- subMenuItemBuilder.build();
- }
- if (serviceMenuItem.hasSubMenuItems()) {
- menuItems.add(serviceMenuItem);
- }
- }
- return menuItems;
- }
-
-
- // //////////////////////////////////////
-
- /**
- * Spin through all object actions of the service adapter, and add to the provided List of {@link LogicalServiceAction}s.
- */
- private static void collateServiceActions(final ObjectAdapter serviceAdapter, ActionType actionType, List<LogicalServiceAction> serviceActions) {
- final ObjectSpecification serviceSpec = serviceAdapter.getSpecification();
-
- // skip if annotated to not be included in repository menu using @DomainService
- final DomainServiceFacet domainServiceFacet = serviceSpec.getFacet(DomainServiceFacet.class);
- if (domainServiceFacet != null) {
- final NatureOfService natureOfService = domainServiceFacet.getNatureOfService();
- if (natureOfService == NatureOfService.VIEW_REST_ONLY ||
- natureOfService == NatureOfService.VIEW_CONTRIBUTIONS_ONLY ||
- natureOfService == NatureOfService.DOMAIN) {
- return;
- }
- }
-
- for (final ObjectAction objectAction : serviceSpec.getObjectActions(
- actionType, Contributed.INCLUDED, Filters.<ObjectAction>any())) {
-
-
- // skip if annotated to not be included in repository menu using legacy mechanism
- if (objectAction.getFacet(NotInServiceMenuFacet.class) != null) {
- continue;
- }
-
- final MemberOrderFacet memberOrderFacet = objectAction.getFacet(MemberOrderFacet.class);
- String serviceName = memberOrderFacet != null? memberOrderFacet.name(): null;
- if(Strings.isNullOrEmpty(serviceName)){
- serviceName = serviceSpec.getFacet(NamedFacet.class).value();
- }
- serviceActions.add(new LogicalServiceAction(serviceName, serviceAdapter, objectAction));
- }
- }
-
- /**
- * The unique service names, as they appear in order of the provided List of {@link LogicalServiceAction}s.
- * @param serviceAdapters
- */
- private static Set<String> serviceNamesInOrder(
- final List<ObjectAdapter> serviceAdapters, final List<LogicalServiceAction> serviceActions) {
- final Set<String> serviceNameOrder = Sets.newLinkedHashSet();
-
- // first, order as defined in isis.properties
- for (ObjectAdapter serviceAdapter : serviceAdapters) {
- final ObjectSpecification serviceSpec = serviceAdapter.getSpecification();
- String serviceName = serviceSpec.getFacet(NamedFacet.class).value();
- serviceNameOrder.add(serviceName);
- }
- // then, any other services (eg due to misspellings, at the end)
- for (LogicalServiceAction serviceAction : serviceActions) {
- if(!serviceNameOrder.contains(serviceAction.serviceName)) {
- serviceNameOrder.add(serviceAction.serviceName);
- }
- }
- return serviceNameOrder;
- }
-
- /**
- * Group the provided {@link LogicalServiceAction}s by their service name.
- */
- private static Map<String, List<LogicalServiceAction>> groupByServiceName(final List<LogicalServiceAction> serviceActions) {
- final Map<String, List<LogicalServiceAction>> serviceActionsByName = Maps.newTreeMap();
-
- // map available services
- ObjectAdapter lastServiceAdapter = null;
- for (LogicalServiceAction serviceAction : serviceActions) {
- List<LogicalServiceAction> serviceActionsForName = serviceActionsByName.get(serviceAction.serviceName);
- if(serviceActionsForName == null) {
- serviceActionsForName = Lists.newArrayList();
- serviceActionsByName.put(serviceAction.serviceName, serviceActionsForName);
- } else {
- // capture whether this action is from a different service
- serviceAction.separator = lastServiceAdapter != serviceAction.serviceAdapter;
- }
- serviceActionsForName.add(serviceAction);
- lastServiceAdapter = serviceAction.serviceAdapter;
- }
-
- return serviceActionsByName;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
deleted file mode 100644
index 59f31df..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
+++ /dev/null
@@ -1,339 +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.
- */
-
-
-/* copied from CssMenuPanel.css (since deleted that panel */
-
-
-
-.cssMenuPanel span.clear {
- line-height: 3px;
-}
-
-.cssMenuPanel .menuh .small {
- float: none;
- display: inline;
-}
-
-.cssMenuPanel .menuh p .small {
- float: none;
- display: inline;
-}
-
-.menuh a,.menuh p {
- text-align: left;
- display: block;
- white-space: nowrap;
- margin: 0;
- padding: 1px;
- padding-right: 1.6em;
- padding-left: 0.4em;
- font-weight: normal;
- cursor: default;
-}
-
-.cssMenuPanel .menuh a:hover {
- text-decoration: underline;
-}
-
-.cssMenuPanel .menuh a.top-parent,.cssMenuPanel .menuh p.top-parent {
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.cssMenuPanel .menuh a.top-parent:hover,.cssMenuPanel .menuh p.top-parent:hover {
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.cssMenuPanel .menuh a.parent,.cssMenuPanel .menuh p.parent {
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.cssMenuPanel .menuh a.parent:hover,.cssMenuPanel .menuh p.parent:hover {
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.cssMenuPanel .menuh ul {
- list-style: none;
- margin: 0;
- padding: 0;
- float: left;
- display: inline;
-}
-
-.cssMenuPanel .menuh li {
- position: relative;
- min-height: 1px;
-}
-
-.cssMenuPanel .menuh ul ul {
- position: absolute;
- z-index: 500;
- top: auto;
- display: none;
- padding: 1em;
- margin: -1em 0 0 -1em;
-}
-
-.cssMenuPanel .menuh ul ul ul {
- top: 0;
- left: 100%;
-}
-
-.cssMenuPanel span.menuh a:hover {
- cursor: pointer;
- z-index: 100;
-}
-
-.cssMenuPanel span.menuh li:hover ul ul,.cssMenuPanel span.menuh li li:hover ul ul,.cssMenuPanel span.menuh li li li:hover ul ul,.cssMenuPanel span.menuh li li li li:hover ul ul {
- display: none;
-}
-
-.cssMenuPanel span.menuh li:hover ul,.cssMenuPanel span.menuh li li:hover ul,.cssMenuPanel span.menuh li li li:hover ul,.cssMenuPanel span.menuh li li li li:hover ul {
- display: block;
-}
-
-.cssMenuPanel li.cssSubMenuItem p.disabled {
- cursor: not-allowed;
-}
-
-.cssMenuPanel li.cssSubMenuItem {
- margin-left:0;
-}
-
-/******** overrides for grouped actions and entity actions ***************/
-.groupedActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
- display: none;
-}
-
-.groupedActions .cssMenuPanel .menuh ul {
- position: relative;
- display: block;
- float: right;
- margin: 0;
- padding: 0;
-}
-
-.groupedActions .cssMenuPanel .menuh ul ul {
- position: relative;
- display: block;
- float: right;
- margin: 0;
- padding: 0;
-}
-
-.groupedActions .cssMenuPanel .menuh li,
-.groupedActions .cssMenuPanel .menuh li p {
- float:left;
- display:block;
- margin-left:10px;
-}
-
-.groupedActions .cssMenuPanel .menuh a,.groupedActions .cssMenuPanel .menuh p
-{
- display: inline-block;
- border: none;
-}
-
-.groupedActions .cssMenuPanel .menuh a:link,
-.groupedActions .cssMenuPanel .menuh a:visited,
-.groupedActions .cssMenuPanel .menuh a:active,
-.groupedActions .cssMenuPanel .menuh p {
- display: block;
- float: left;
- height: 30px;
- line-height: 30px;
- padding: 0 10px;
- font-weight: bold;
- /*font-size: 0.85em;*/
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- text-decoration: none;
-}
-
-.entityActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
- display: none;
-}
-
-.entityActions .cssMenuPanel .menuh ul {
- position: relative;
- display: block;
- float: right;
- margin: 0 0 10px;
- padding: 0;
-}
-
-.entityActions .cssMenuPanel .menuh ul ul {
- position: relative;
- display: block;
- float: right;
- margin: 0;
- padding: 0;
-}
-
-.entityActions .cssMenuPanel .menuh li {
- float:left;
- display:block;
- margin-left:10px;
-}
-
-.entityActions .cssMenuPanel .menuh li p {
- float:left;
- display:block;
- margin-left:0;
-}
-
-.entityActions .cssMenuPanel .menuh a,
-.entityActions .cssMenuPanel .menuh p {
- display: inline-block;
- /*border: none;*/
-}
-
-.entityActions .cssMenuPanel .menuh a,
-.entityActions .cssMenuPanel .menuh a:link,
-.entityActions .cssMenuPanel .menuh a:visited,
-.entityActions .cssMenuPanel .menuh a:active,
-.entityActions .cssMenuPanel .menuh p {
- display: block;
- float: left;
- height: 30px;
- /*line-height: 30px;*/
- padding: 4px 10px 0;
- /*font-size:0.85em;*/
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- text-decoration:none;
-}
-
-.additionalLinkList {
- float:left;
- margin:0;
- padding:0;
- list-style:none;
-}
-
-.entityCollectionsPanel .panel-heading .additionalLinkList {
- margin-right: 10px;
-}
-
-.additionalLinkList li {
- float:left;
- margin-right:10px;
- /* margin-bottom: 2px;*/
-}
-.entityPropertiesPanel .additionalLinkList li {
- margin-right:0px;
-}
-.entityPropertiesPanel .properties .panel-heading .additionalLinkList {
- margin-right: -5px;
-}
-
-
-
-
-
-/**
- * Borrowed from http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3
- */
-
-.dropdown-submenu {
- position: relative;
-}
-
-.dropdown-submenu>.dropdown-menu {
- top: 0;
- left: 100%;
- margin-top: -6px;
- margin-left: -1px;
- -webkit-border-radius: 0 6px 6px 6px;
- -moz-border-radius: 0 6px 6px;
- border-radius: 0 6px 6px 6px;
-}
-
-.dropdown-submenu:hover>.dropdown-menu {
- display: block;
-}
-
-.dropdown-submenu>a:after {
- display: block;
- content: " ";
- float: right;
- width: 0;
- height: 0;
- border-color: transparent;
- border-style: solid;
- border-width: 5px 0 5px 5px;
- border-left-color: #ccc;
- margin-top: 5px;
- margin-right: -10px;
-}
-
-.dropdown-submenu:hover>a:after {
- border-left-color: #fff;
-}
-
-.dropdown-submenu.pull-left {
- float: none;
-}
-
-.dropdown-submenu.pull-left>.dropdown-menu {
- left: -100%;
- margin-left: 10px;
- -webkit-border-radius: 6px 0 6px 6px;
- -moz-border-radius: 6px 0 6px 6px;
- border-radius: 6px 0 6px 6px;
-}
-
-.dropdown-menu > li > a.menuLink {
- padding-left: 0;
-}
-
-.dropdown-menu > li > span.fa {
- padding-left: 3px;
-}
-
-.dropdown-menu .fontAwesomeIcon {
- min-width: 20px;
-}
-
-.dropdown-menu > li > a.menuLink.btn-warning:hover {
- background-image: inherit;
-}
-
-.dropdown-menu > li > a.menuLink.menuLinkSpacer {
- padding-left: 24px;
-}
-
-.dropdown-menu > li > a.btn.btn-warning {
- text-align: start;
- border-radius: 0;
- color: initial;
-}
-
-.scrollable-menu {
- min-width: 250px;
- height: auto;
- max-height: 600px;
- overflow-x: hidden;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
deleted file mode 100644
index 8b51434..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
+++ /dev/null
@@ -1,54 +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.
--->
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
- <li class="dropdown" wicket:id="menuItems">
- <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><span wicket:id="name"></span> <span class="caret"></span></a>
- <ul wicket:id="topMenu" class="dropdown-menu scrollable-menu multi-level" role="menu">
- <li wicket:id="subMenuItems">
- <wicket:container wicket:id="content"></wicket:container>
- </li>
- </ul>
- </li>
-
- <wicket:fragment wicket:id="leafItem">
- <a class="menuLink" wicket:id="menuLink">
- <span class="menuLinkLabel" wicket:id="menuLinkLabel"></span>
- </a>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="folderItem">
- <a wicket:id="folderName" tabindex="-1"></a>
- <ul class="dropdown-menu">
- <li wicket:id="subMenuItems">
- <wicket:container wicket:id="content"></wicket:container>
- </li>
- </ul>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="empty">
- </wicket:fragment>
-
-
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
deleted file mode 100644
index e024e5c..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
+++ /dev/null
@@ -1,105 +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.actionmenu.serviceactions;
-
-import java.util.List;
-
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.resource.CssResourceReference;
-
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.button.DropdownAutoOpenJavaScriptReference;
-
-/**
- * A panel responsible to render the application actions as menu in a navigation bar.
- *
- * <p>
- * The multi-level sub menu support is borrowed from
- * <a href="http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3">Bootsnip</a>
- * </p>
- */
-public class ServiceActionsPanel extends Panel {
-
- public ServiceActionsPanel(String id, List<CssMenuItem> menuItems) {
- super(id);
- ListView<CssMenuItem> menuItemsView = new ListView<CssMenuItem>("menuItems", menuItems) {
- @Override
- protected void populateItem(ListItem<CssMenuItem> listItem) {
- CssMenuItem menuItem = listItem.getModelObject();
- listItem.add(new Label("name", menuItem.getName()));
- MarkupContainer topMenu = new WebMarkupContainer("topMenu");
- topMenu.add(new CssClassAppender("top-menu-" + CssClassAppender.asCssStyle(menuItem.getName())));
- listItem.add(topMenu);
- List<CssMenuItem> subMenuItems = ServiceActionUtil.withSeparators(menuItem);
-
-// fake data to test multi-level menus
-// if (menuItem.getName().equals("ToDos")) {
-// CssMenuItem fakeItem = menuItem.newSubMenuItem("Fake item").build();
-//
-// fakeItem.newSubMenuItem("Fake item 1").link(new ExternalLink("menuLink", "http://abv.bg")).build();
-// CssMenuItem fakeMenu12 = fakeItem.newSubMenuItem("Fake item 2").link(new ExternalLink("menuLink", "http://google.com")).build();
-//
-// fakeMenu12.newSubMenuItem("Fake item 2.1").link(new ExternalLink("menuLink", "http://web.de")).build();
-// }
-
- ListView<CssMenuItem> subMenuItemsView = new ListView<CssMenuItem>("subMenuItems", subMenuItems) {
- @Override
- protected void populateItem(ListItem<CssMenuItem> listItem) {
- CssMenuItem subMenuItem = listItem.getModelObject();
-
- if (subMenuItem.hasSubMenuItems()) {
- addFolderItem(subMenuItem, listItem);
- } else {
-
- final MarkupContainer parent = ServiceActionsPanel.this;
- ServiceActionUtil.addLeafItem(subMenuItem, listItem, parent);
-
- }
- }
- };
- topMenu.add(subMenuItemsView);
- }
- };
- add(menuItemsView);
- }
-
- private void addFolderItem(CssMenuItem subMenuItem, ListItem<CssMenuItem> listItem) {
- final MarkupContainer parent = ServiceActionsPanel.this;
- ServiceActionUtil.addFolderItem(subMenuItem, listItem, parent, ServiceActionUtil.SeparatorStrategy.WITH_SEPARATORS);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CssResourceReference(ServiceActionsPanel.class, "ServiceActionsPanel.css")));
- response.render(JavaScriptHeaderItem.forReference(DropdownAutoOpenJavaScriptReference.instance()));
- response.render(OnDomReadyHeaderItem.forScript("$('.dropdown-toggle').dropdownHover();"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
deleted file mode 100644
index 43c255f..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
+++ /dev/null
@@ -1,61 +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.actionmenu.serviceactions;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
-import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
-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 a {@link ServiceActionsPanel} to represent the
- * {@link org.apache.isis.viewer.wicket.model.models.ServiceActionsModel application action}s.
- */
-public class ServiceActionsPanelFactory extends ComponentFactoryAbstract {
-
- private final static long serialVersionUID = 1L;
-
- public ServiceActionsPanelFactory() {
- super(ComponentType.SERVICE_ACTIONS, ServiceActionsPanel.class);
- }
-
- /**
- * Applies to primary and secondary service action models.
- */
- @Override
- protected ApplicationAdvice appliesTo(final IModel<?> model) {
- if(!(model instanceof ServiceActionsModel)) {
- return ApplicationAdvice.DOES_NOT_APPLY;
- }
- final ServiceActionsModel serviceActionsModel = (ServiceActionsModel) model;
- final DomainServiceLayout.MenuBar menuBar = serviceActionsModel.getMenuBar();
- return appliesIf(menuBar != DomainServiceLayout.MenuBar.TERTIARY && menuBar != null);
- }
-
- @Override
- public Component createComponent(final String id, final IModel<?> model) {
- final ServiceActionsModel serviceActionsModel = (ServiceActionsModel) model;
- return new ServiceActionsPanel(id, ServiceActionUtil.buildMenu(serviceActionsModel));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.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.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
deleted file mode 100644
index 8b45fed..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
+++ /dev/null
@@ -1,49 +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.
--->
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
-
- <li wicket:id="subMenuItems">
- <wicket:container wicket:id="content"></wicket:container>
- </li>
-
- <li class="divider" wicket:id="divider"></li>
-
- <li>
- <a class="menuLink" wicket:id="logoutLink" >
- <span class="fontAwesomeIcon fa fa-fw fa-sign-out"></span>
- <span class="menuLinkLabel">
- <wicket:message key="logoutLabel"></wicket:message>
- </span>
- </a>
- </li>
-
- <wicket:fragment wicket:id="leafItem">
- <a class="menuLink" wicket:id="menuLink">
- <span class="menuLinkLabel" wicket:id="menuLinkLabel"></span>
- </a>
- </wicket:fragment>
-
-
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
deleted file mode 100644
index c6f112c..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ /dev/null
@@ -1,121 +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.actionmenu.serviceactions;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebComponent;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.resource.CssResourceReference;
-
-import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-
-/**
- * A panel responsible to render the application actions as menu in a navigation bar.
- *
- * <p>
- * The multi-level sub menu support is borrowed from
- * <a href="http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3">Bootsnip</a>
- * </p>
- */
-public class TertiaryActionsPanel extends Panel {
-
- public TertiaryActionsPanel(String id, List<CssMenuItem> menuItems) {
- super(id);
- addLogoutLink(this);
- final List<CssMenuItem> subMenuItems = flatten(menuItems);
- final ListView<CssMenuItem> subMenuItemsView = new ListView<CssMenuItem>("subMenuItems", subMenuItems) {
- @Override
- protected void populateItem(ListItem<CssMenuItem> listItem) {
- CssMenuItem subMenuItem = listItem.getModelObject();
- if (subMenuItem.hasSubMenuItems()) {
- addFolderItem(subMenuItem, listItem);
- } else {
- ServiceActionUtil.addLeafItem(subMenuItem, listItem, TertiaryActionsPanel.this);
- }
- }
- };
-
- WebComponent divider = new WebComponent("divider") {
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- subMenuItemsView.configure();
- setVisible(!subMenuItems.isEmpty());
- }
- };
-
- add(subMenuItemsView, divider);
- }
-
- protected List<CssMenuItem> flatten(List<CssMenuItem> menuItems) {
- List<CssMenuItem> subMenuItems = Lists.newArrayList();
- for (CssMenuItem menuItem : menuItems) {
- subMenuItems.addAll(menuItem.getSubMenuItems());
- }
- return subMenuItems;
- }
-
- private void addLogoutLink(MarkupContainer themeDiv) {
- Link logoutLink = new Link("logoutLink") {
-
- @Override
- public void onClick() {
- getSession().invalidate();
- setResponsePage(getSignInPage());
- }
- };
- themeDiv.add(logoutLink);
- }
-
- private Class<? extends Page> getSignInPage() {
- return pageClassRegistry.getPageClass(PageType.SIGN_IN);
- }
-
-
- private void addFolderItem(CssMenuItem subMenuItem, ListItem<CssMenuItem> listItem) {
- final MarkupContainer parent = TertiaryActionsPanel.this;
- ServiceActionUtil.addFolderItem(subMenuItem, listItem, parent, ServiceActionUtil.SeparatorStrategy.WITHOUT_SEPARATORS);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CssResourceReference(TertiaryActionsPanel.class, "TertiaryActionsPanel.css")));
- }
-
- /**
- * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
- */
- @Inject
- private PageClassRegistry pageClassRegistry;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
deleted file mode 100644
index 5d28543..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
+++ /dev/null
@@ -1,61 +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.actionmenu.serviceactions;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
-import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
-import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
-import org.apache.isis.viewer.wicket.ui.ComponentType;
-
-/**
- * {@link org.apache.isis.viewer.wicket.ui.ComponentFactory} for a {@link org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions.ServiceActionsPanel} to represent the
- * {@link org.apache.isis.viewer.wicket.model.models.ServiceActionsModel application action}s.
- */
-public class TertiaryMenuPanelFactory extends ComponentFactoryAbstract {
-
- private final static long serialVersionUID = 1L;
-
- public TertiaryMenuPanelFactory() {
- super(ComponentType.SERVICE_ACTIONS, ServiceActionsPanel.class);
- }
-
- /**
- * Applies only to tertiary service action models.
- */
- @Override
- protected ApplicationAdvice appliesTo(final IModel<?> model) {
- if(!(model instanceof ServiceActionsModel)) {
- return ApplicationAdvice.DOES_NOT_APPLY;
- }
- final ServiceActionsModel serviceActionsModel = (ServiceActionsModel) model;
- final DomainServiceLayout.MenuBar menuBar = serviceActionsModel.getMenuBar();
- final boolean applicability = menuBar == DomainServiceLayout.MenuBar.TERTIARY || menuBar == null;
- return appliesIf(applicability);
- }
-
- @Override
- public Component createComponent(final String id, final IModel<?> model) {
- final ServiceActionsModel serviceActionsModel = (ServiceActionsModel) model;
- return new TertiaryActionsPanel(id, ServiceActionUtil.buildMenu(serviceActionsModel));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
deleted file mode 100644
index 32f2d35..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
+++ /dev/null
@@ -1,32 +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.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="iconAndTitle actionPanelHeaderNew">
- <span wicket:enclosure="entityIconAndTitle"><span wicket:id="entityIconAndTitle">[icon and title]</span> :</span> <span wicket:id="actionName" class="actionName">[action name]</span>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
deleted file mode 100644
index a18f658..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
+++ /dev/null
@@ -1,51 +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.actionprompt;
-
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-
-/**
- * A panel used as a title for the action prompts
- */
-public class ActionPromptHeaderPanel extends PanelAbstract<ActionModel> {
-
- private static final String ID_ACTION_NAME = "actionName";
-
- public ActionPromptHeaderPanel(String id, final ActionModel model) {
- super(id, model);
-
- ObjectAdapter targetAdapter = model.getTargetAdapter();
-
- getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.ENTITY_ICON_AND_TITLE, new EntityModel(targetAdapter));
-
- add(new Label(ID_ACTION_NAME, new AbstractReadOnlyModel<String>() {
- @Override
- public String getObject() {
- return model.getActionMemento().getAction().getName();
- }
- }));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html
deleted file mode 100644
index 90acad9..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.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.
--->
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
- <head lang="en">
- <meta charset="UTF-8">
- <title></title>
- </head>
- <body>
- <wicket:extend>
- <div wicket:id="content"></div>
- </wicket:extend>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
deleted file mode 100644
index 8c0bc85..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
+++ /dev/null
@@ -1,60 +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.actionprompt;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.ModalDialog;
-
-public class ActionPromptModalWindow extends ModalDialog<Void> {
-
- private static final long serialVersionUID = 1L;
-
- public static ActionPromptModalWindow getActionPromptModalWindowIfEnabled(ActionPromptModalWindow modalWindow) {
- return !isActionPromptModalDialogDisabled() ? modalWindow : null;
- }
-
- public static boolean isActionPromptModalDialogDisabled() {
- return getConfiguration().getBoolean("isis.viewer.wicket.disableModalDialogs", false);
- }
-
- private static IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
- }
-
- public static ActionPromptModalWindow newModalWindow(String id) {
- return new ActionPromptModalWindow(id);
- }
-
-
- // //////////////////////////////////////
-
-
- public ActionPromptModalWindow(String id) {
- super(id);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(OnDomReadyHeaderItem.forScript(
- String.format("Wicket.Event.publish(Isis.Topic.FOCUS_FIRST_ACTION_PARAMETER, '%s')", getMarkupId())));
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.html
deleted file mode 100644
index 18935b9..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.html
+++ /dev/null
@@ -1,36 +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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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:panel>
- <div class="actionInfoPanel actionInfoComponentType">
- <ul>
- <li>Target: <span wicket:id="target">[target title here]</span></li>
- <li>Action: <span wicket:id="actionName">[target title here]</span></li>
- </ul>
- <br/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java
deleted file mode 100644
index 11c1436..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java
+++ /dev/null
@@ -1,50 +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.actions;
-
-import org.apache.wicket.markup.html.basic.Label;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-
-/**
- * Renders a panel providing summary information about an action.
- */
-public class ActionInfoPanel extends PanelAbstract<ActionModel> {
-
- private static final long serialVersionUID = 1L;
-
- private static final String ID_ACTION_NAME = "actionName";
- private static final String ID_TARGET = "target";
-
- public ActionInfoPanel(final String id, final ActionModel actionModel) {
- super(id, actionModel);
-
- final ObjectAdapter targetAdapter = getModel().getTargetAdapter();
- final ObjectAction objectAction = getModel().getActionMemento().getAction();
-
- // TODO: render instead as links (providing isn't a service; provide a
- // component for this?)
- add(new Label(ID_TARGET, targetAdapter.titleString()));
- add(new Label(ID_ACTION_NAME, objectAction.getName()));
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanelFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanelFactory.java
deleted file mode 100644
index ffc7094..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanelFactory.java
+++ /dev/null
@@ -1,52 +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.actions;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-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 ActionInfoPanel}.
- */
-public class ActionInfoPanelFactory extends ComponentFactoryAbstract {
-
- private static final long serialVersionUID = 1L;
-
- public ActionInfoPanelFactory() {
- super(ComponentType.ACTION_INFO, ActionInfoPanel.class);
- }
-
- @Override
- public ApplicationAdvice appliesTo(final IModel<?> model) {
- return appliesIf(model instanceof ActionModel);
- }
-
- @Override
- public Component createComponent(final String id, final IModel<?> model) {
- final ActionModel actionModel = (ActionModel) model;
- return new ActionInfoPanel(id, actionModel);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/99094b7e/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
deleted file mode 100644
index eb68afd..0000000
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
+++ /dev/null
@@ -1,38 +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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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:panel>
- <div class="actionPanel actionComponentType">
- <div class="myBlockContainer">
- <div wicket:id="header" class="iconAndTitle panel panel-default actionPanelHeaderNew">
- <wicket:container wicket:id="entityIconAndTitle">[icon and title]</wicket:container>
- <h3 wicket:id="actionName" class="actionName">[action name]</h3>
- </div>
- <div wicket:id="parameters"></div>
- </div>
- </div>
- </wicket:panel>
- </body>
-</html>