Repository: isis Updated Branches: refs/heads/master 25f5899d6 -> 4f3932d38
http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java index 706db56..7b90b82 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java @@ -30,6 +30,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.apache.isis.applib.services.layout.GridNormalizerService; import org.apache.isis.applib.layout.bootstrap3.BS3Col; import org.apache.isis.applib.layout.bootstrap3.BS3Grid; import org.apache.isis.applib.layout.bootstrap3.BS3Row; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/FCGridTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/FCGridTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/FCGridTest.java index 5cb1ed6..d3fbd1a 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/FCGridTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/FCGridTest.java @@ -30,14 +30,15 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.apache.isis.applib.services.layout.GridNormalizerService; import org.apache.isis.applib.layout.common.ActionLayoutData; import org.apache.isis.applib.layout.common.CollectionLayoutData; import org.apache.isis.applib.layout.common.FieldSet; import org.apache.isis.applib.layout.common.PropertyLayoutData; -import org.apache.isis.applib.layout.fixedcols.FCColumn; -import org.apache.isis.applib.layout.fixedcols.FCGrid; -import org.apache.isis.applib.layout.fixedcols.FCTab; -import org.apache.isis.applib.layout.fixedcols.FCTabGroup; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCGrid; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCTab; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCTabGroup; import org.apache.isis.applib.services.jaxb.JaxbService; import org.apache.isis.core.metamodel.services.grid.fixedcols.GridNormalizerServiceFC; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java index d99b2a4..22866d4 100644 --- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java +++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java @@ -29,7 +29,7 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.isis.applib.annotation.BookmarkPolicy; -import org.apache.isis.applib.layout.fixedcols.FCColumn.Hint; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn.Hint; import org.apache.isis.applib.services.memento.MementoService.Memento; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java index 8b2f322..6b7dfcc 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java @@ -24,7 +24,7 @@ import org.apache.wicket.model.IModel; import org.apache.isis.applib.layout.bootstrap3.BS3Grid; import org.apache.isis.applib.layout.common.Grid; -import org.apache.isis.applib.layout.fixedcols.FCGrid; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCGrid; import org.apache.isis.core.metamodel.facets.object.grid.GridFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.viewer.wicket.model.models.EntityModel; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/FCGridPanel.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/FCGridPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/FCGridPanel.java index 2db578d..4623028 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/FCGridPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/FCGridPanel.java @@ -23,9 +23,9 @@ import java.util.List; import com.google.common.collect.FluentIterable; -import org.apache.isis.applib.layout.fixedcols.FCColumn; -import org.apache.isis.applib.layout.fixedcols.FCGrid; -import org.apache.isis.applib.layout.fixedcols.FCTabGroup; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCGrid; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCTabGroup; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet; import org.apache.isis.core.metamodel.facets.object.grid.GridFacet; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/PropUtil.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/PropUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/PropUtil.java index 0cafe36..9079391 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/PropUtil.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/PropUtil.java @@ -26,7 +26,7 @@ import com.google.common.collect.FluentIterable; import org.apache.isis.applib.annotation.Where; import org.apache.isis.applib.filter.Filter; import org.apache.isis.applib.filter.Filters; -import org.apache.isis.applib.layout.fixedcols.FCColumn; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn; import org.apache.isis.applib.layout.common.FieldSet; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/collections/EntityCollectionsPanel.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/collections/EntityCollectionsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/collections/EntityCollectionsPanel.java index 21c2ed0..b89009b 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/collections/EntityCollectionsPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/collections/EntityCollectionsPanel.java @@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.Where; import org.apache.isis.applib.filter.Filter; import org.apache.isis.applib.filter.Filters; import org.apache.isis.applib.layout.common.CollectionLayoutData; -import org.apache.isis.applib.layout.fixedcols.FCColumn; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy; import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/columns/EntityColumn.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/columns/EntityColumn.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/columns/EntityColumn.java index cfb9bfa..aaacdef 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/columns/EntityColumn.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/columns/EntityColumn.java @@ -33,7 +33,7 @@ import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.isis.applib.layout.common.FieldSet; import org.apache.isis.applib.layout.common.PropertyLayoutData; -import org.apache.isis.applib.layout.fixedcols.FCColumn; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/propsandcolls/EntityPropsAndCollsForm.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/propsandcolls/EntityPropsAndCollsForm.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/propsandcolls/EntityPropsAndCollsForm.java index f1f2a78..0b1d7b7 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/propsandcolls/EntityPropsAndCollsForm.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/propsandcolls/EntityPropsAndCollsForm.java @@ -44,9 +44,9 @@ import org.apache.isis.applib.annotation.MemberGroupLayout.ColumnSpans; import org.apache.isis.applib.annotation.Where; import org.apache.isis.applib.filter.Filter; import org.apache.isis.applib.filter.Filters; -import org.apache.isis.applib.layout.fixedcols.FCColumn; -import org.apache.isis.applib.layout.fixedcols.FCColumn.Hint; -import org.apache.isis.applib.layout.fixedcols.FCTab; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn.Hint; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCTab; import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer; import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite; import org.apache.isis.core.commons.authentication.MessageBroker; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabgrouplist/TabGroupListPanel.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabgrouplist/TabGroupListPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabgrouplist/TabGroupListPanel.java index 0934f80..f95d8db 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabgrouplist/TabGroupListPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabgrouplist/TabGroupListPanel.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; -import org.apache.isis.applib.layout.fixedcols.FCTabGroup; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCTabGroup; import org.apache.isis.viewer.wicket.model.models.EntityModel; import org.apache.isis.viewer.wicket.ui.components.layout.fixedcols.tabs.TabGroupPanel; import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabGroupPanel.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabGroupPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabGroupPanel.java index 1e84474..77c90c1 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabGroupPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabGroupPanel.java @@ -29,8 +29,8 @@ import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; -import org.apache.isis.applib.layout.fixedcols.FCTab; -import org.apache.isis.applib.layout.fixedcols.FCTabGroup; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCTab; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCTabGroup; import org.apache.isis.viewer.wicket.model.models.EntityModel; import org.apache.isis.viewer.wicket.model.util.ScopedSessionAttribute; http://git-wip-us.apache.org/repos/asf/isis/blob/5c831757/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabPanel.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabPanel.java index 1dda0c6..d475fc8 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/fixedcols/tabs/TabPanel.java @@ -1,6 +1,6 @@ package org.apache.isis.viewer.wicket.ui.components.layout.fixedcols.tabs; -import org.apache.isis.applib.layout.fixedcols.FCTab; +import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCTab; 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;
