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 2016/02/17 01:46:29 UTC
[2/3] isis git commit: ISIS-993: starting to remove the FC (fixed
col) stuff ... moving out FCColumn.Hint enum.
ISIS-993: starting to remove the FC (fixed col) stuff ... moving out FCColumn.Hint enum.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e57acf25
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e57acf25
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e57acf25
Branch: refs/heads/ISIS-993
Commit: e57acf256b1c727475be62fed70e1d6a07f28327
Parents: a40a869
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Feb 16 10:03:37 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Feb 16 10:03:37 2016 +0000
----------------------------------------------------------------------
.../json/LayoutMetadataReaderFromJson.java | 2 +-
.../grid/fixedcols/applib/FCColumn.java | 26 ----------
.../services/grid/fixedcols/applib/FCGrid.java | 4 +-
.../services/grid/fixedcols/applib/FCTab.java | 6 +--
.../services/grid/fixedcols/applib/Hint.java | 51 ++++++++++++++++++++
.../metamodel/spec/ObjectSpecifications.java | 9 ++--
.../viewer/wicket/model/models/EntityModel.java | 2 +-
.../components/layout/fixedcols/PropUtil.java | 3 +-
.../layout/fixedcols/columns/EntityColumn.java | 9 ++--
.../propsandcolls/EntityPropsAndCollsForm.java | 2 +-
10 files changed, 70 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
index 59cdb77..1c11dea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
@@ -84,7 +84,7 @@ import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecifications;
-import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn.Hint;
+import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.Hint;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCColumn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCColumn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCColumn.java
index f071117..b2cab4b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCColumn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCColumn.java
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutDataOwner;
import org.apache.isis.applib.layout.component.FieldSet;
@@ -133,29 +132,4 @@ public class FCColumn implements Serializable, FieldSetOwner, CollectionLayoutDa
this.hint = hint;
}
-
-
- public enum Hint {
- LEFT,
- MIDDLE,
- RIGHT;
-
- public int from(MemberGroupLayout.ColumnSpans columnSpans) {
- if(this == LEFT) return columnSpans.getLeft();
- if(this == MIDDLE) return columnSpans.getMiddle();
- if(this == RIGHT) return columnSpans.getRight();
- throw new IllegalStateException();
- }
-
- public FCColumn from(final FCTab fcTab) {
- if(fcTab == null) {
- return null;
- }
- if(this == LEFT) return fcTab.getLeft();
- if(this == MIDDLE) return fcTab.getMiddle();
- if(this == RIGHT) return fcTab.getRight();
- throw new IllegalStateException();
- }
-
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCGrid.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCGrid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCGrid.java
index 851e504..b544fc2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCGrid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCGrid.java
@@ -79,7 +79,7 @@ public class FCGrid extends GridAbstract implements Dto, ActionLayoutDataOwner,
public void setLeft(final FCColumn left) {
this.left = left;
- left.setHint(FCColumn.Hint.LEFT);
+ left.setHint(Hint.LEFT);
}
@@ -107,7 +107,7 @@ public class FCGrid extends GridAbstract implements Dto, ActionLayoutDataOwner,
public void setRight(final FCColumn right) {
this.right = right;
- right.setHint(FCColumn.Hint.RIGHT);
+ right.setHint(Hint.RIGHT);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCTab.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCTab.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCTab.java
index 1dc41c7..49e4489 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCTab.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/FCTab.java
@@ -70,7 +70,7 @@ public class FCTab implements FCColumnOwner, Serializable, Owned<FCTabGroup> {
public void setLeft(final FCColumn left) {
this.left = left;
- left.setHint(FCColumn.Hint.LEFT);
+ left.setHint(Hint.LEFT);
}
@@ -83,7 +83,7 @@ public class FCTab implements FCColumnOwner, Serializable, Owned<FCTabGroup> {
public void setMiddle(final FCColumn middle) {
this.middle = middle;
- middle.setHint(FCColumn.Hint.MIDDLE);
+ middle.setHint(Hint.MIDDLE);
}
@@ -96,7 +96,7 @@ public class FCTab implements FCColumnOwner, Serializable, Owned<FCTabGroup> {
public void setRight(final FCColumn right) {
this.right = right;
- right.setHint(FCColumn.Hint.RIGHT);
+ right.setHint(Hint.RIGHT);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java
new file mode 100644
index 0000000..a4b0555
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java
@@ -0,0 +1,51 @@
+/*
+ * 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.core.metamodel.services.grid.fixedcols.applib;
+
+import org.apache.isis.applib.annotation.MemberGroupLayout;
+
+public enum Hint {
+ LEFT,
+ MIDDLE,
+ RIGHT;
+
+ public int from(MemberGroupLayout.ColumnSpans columnSpans) {
+ if (this == LEFT)
+ return columnSpans.getLeft();
+ if (this == MIDDLE)
+ return columnSpans.getMiddle();
+ if (this == RIGHT)
+ return columnSpans.getRight();
+ throw new IllegalStateException();
+ }
+
+ public FCColumn from(final FCTab fcTab) {
+ if (fcTab == null) {
+ return null;
+ }
+ if (this == LEFT)
+ return fcTab.getLeft();
+ if (this == MIDDLE)
+ return fcTab.getMiddle();
+ if (this == RIGHT)
+ return fcTab.getRight();
+ throw new IllegalStateException();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
index a47e9c5..d3a7f77 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
@@ -25,9 +25,8 @@ import java.util.Set;
import com.google.common.collect.Lists;
-import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn;
import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet;
-
+import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.Hint;
public final class ObjectSpecifications {
@@ -37,7 +36,7 @@ public final class ObjectSpecifications {
public static List<String> orderByMemberGroups(
final ObjectSpecification objSpec,
final Set<String> groupNamesToOrder,
- final FCColumn.Hint hint) {
+ final Hint hint) {
final MemberGroupLayoutFacet facet = objSpec.getFacet(MemberGroupLayoutFacet.class);
final List<String> leftColumnGroupNames = Lists.newArrayList(groupNamesToOrder);
@@ -47,10 +46,10 @@ public final class ObjectSpecifications {
return leftColumnGroupNames;
}
- if(hint == FCColumn.Hint.MIDDLE) {
+ if(hint == Hint.MIDDLE) {
return facet.getColumnSpans().getMiddle()>0? facet.getMiddle(): Collections.<String>emptyList();
}
- if(hint == FCColumn.Hint.RIGHT) {
+ if(hint == Hint.RIGHT) {
return facet.getColumnSpans().getRight()>0? facet.getRight(): Collections.<String>emptyList();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/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 22866d4..b26529b 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.core.metamodel.services.grid.fixedcols.applib.FCColumn.Hint;
+import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.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/e57acf25/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 f487ef0..7fdd5ec 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
@@ -30,6 +30,7 @@ import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.FCColumn;
import org.apache.isis.applib.layout.component.FieldSet;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.services.grid.fixedcols.applib.Hint;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecifications;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -43,7 +44,7 @@ public final class PropUtil {
public static List<String> propertyGroupNames(
final EntityModel entityModel,
- final FCColumn.Hint hint, final FCColumn columnMetaDataIfAny) {
+ final Hint hint, final FCColumn columnMetaDataIfAny) {
final ObjectAdapter adapter = entityModel.getObject();
final ObjectSpecification objSpec = adapter.getSpecification();
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/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 2abe0a6..b790d2f 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
@@ -36,6 +36,7 @@ import org.apache.isis.applib.layout.component.PropertyLayoutData;
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.services.grid.fixedcols.applib.Hint;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecifications;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -54,7 +55,7 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
* <p>
* If {@link FCColumn} is present, then only those properties and collections for that
* column metadata are rendered. Otherwise the {@link MemberGroupLayoutFacet} on the
- * {@link ObjectSpecification} in conjunction with the provided {@link FCColumn.Hint} is
+ * {@link ObjectSpecification} in conjunction with the provided {@link Hint} is
* used to filter down to just those properties/collections in the column.
* </p>
*/
@@ -69,9 +70,9 @@ public class EntityColumn extends PanelAbstract<EntityModel> {
private final FCColumn columnMetaDataIfAny;
// which column to render (populated for EntityEditablePanel, not required and so absent for EntityTabbedPanel)
- final FCColumn.Hint hint;
+ final Hint hint;
- private static FCColumn.Hint hintFrom(final EntityModel entityModel) {
+ private static Hint hintFrom(final EntityModel entityModel) {
final FCColumn fcColumn = (FCColumn) entityModel.getLayoutMetadata();
return fcColumn.getHint();
}
@@ -87,7 +88,7 @@ public class EntityColumn extends PanelAbstract<EntityModel> {
public EntityColumn(
final String id,
final EntityModel entityModel,
- final FCColumn.Hint hint) {
+ final Hint hint) {
super(id, entityModel);
http://git-wip-us.apache.org/repos/asf/isis/blob/e57acf25/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 0b1d7b7..f8ba43d 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
@@ -45,7 +45,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.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.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;