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/02 01:35:59 UTC
[02/15] isis git commit: ISIS-993: working towards storing a single
hint on the EntityModel
ISIS-993: working towards storing a single hint on the EntityModel
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d7a1ee2d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d7a1ee2d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d7a1ee2d
Branch: refs/heads/ISIS-993
Commit: d7a1ee2ddae809ef630d48d32953ae6ae736eedf
Parents: fc59d35
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Jan 31 11:46:37 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Jan 31 11:46:37 2016 +0000
----------------------------------------------------------------------
.../viewer/wicket/model/models/EntityModel.java | 42 ++++++++++----------
.../collections/EntityCollectionsPanel.java | 2 +-
.../components/entity/column/EntityColumn.java | 5 ++-
.../propsandcolls/EntityPropsAndCollsForm.java | 2 +-
.../entity/tabbed/EntityTabbedPanel.java | 3 +-
.../entity/tabgroup/TabGroupPanel.java | 4 +-
.../entity/tabgrouplist/TabGroupListPanel.java | 2 +-
7 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d7a1ee2d/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 b169164..54ece97 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
@@ -20,7 +20,6 @@
package org.apache.isis.viewer.wicket.model.models;
import java.io.Serializable;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -31,10 +30,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.layout.common.CollectionLayoutData;
-import org.apache.isis.applib.layout.fixedcols.FCColumn;
-import org.apache.isis.applib.layout.fixedcols.FCColumn.Hint;
import org.apache.isis.applib.layout.common.FieldSet;
-import org.apache.isis.applib.layout.fixedcols.FCTabGroup;
+import org.apache.isis.applib.layout.fixedcols.FCColumn.Hint;
import org.apache.isis.applib.layout.fixedcols.FCTab;
import org.apache.isis.applib.services.memento.MementoService.Memento;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -648,68 +645,69 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> {
// tab and column metadata (if any)
// //////////////////////////////////////////////////////////
- private List<FCTabGroup> tabGroupListMetadata;
+ private Object tabGroupListMetadata;
- public List<FCTabGroup> getTabGroupListMetadata() {
+ public Object getTabGroupListMetadata() {
return tabGroupListMetadata;
}
/**
* Returns a new copy that SHARES the property scalar models (for edit form).
*/
- public EntityModel cloneWithTabGroupListMetadata(final List<FCTabGroup> tabGroupListMetadata) {
+ public EntityModel cloneWithTabGroupListMetadata(final Object tabGroupListMetadata) {
final EntityModel entityModel = new EntityModel(this.adapterMemento, this.propertyScalarModels);
entityModel.tabGroupListMetadata = tabGroupListMetadata;
return entityModel;
}
- private FCTabGroup FCTabGroup;
+ private Object fcTabGroup;
- public FCTabGroup getFCTabGroup() {
- return FCTabGroup;
+ public Object getFCTabGroup() {
+ return fcTabGroup;
}
/**
* Returns a new copy that SHARES the property scalar models (for edit form).
*/
- public EntityModel cloneWithTabGroupMetadata(final FCTabGroup FCTabGroup) {
+ public EntityModel cloneWithTabGroupMetadata(final Object fcTabgroup) {
final EntityModel entityModel = new EntityModel(this.adapterMemento, this.propertyScalarModels);
- entityModel.FCTabGroup = FCTabGroup;
+ entityModel.fcTabGroup = fcTabgroup;
return entityModel;
}
- private FCTab FCTab;
+ private Object fcTab;
- public FCTab getFCTab() {
- return FCTab;
+ public Object getFCTab() {
+ return fcTab;
}
/**
* Returns a new copy that SHARES the property scalar models (for edit form).
*/
- public EntityModel cloneWithTabMetadata(final FCTab FCTab) {
+ public EntityModel cloneWithTabMetadata(final FCTab fcTab) {
final EntityModel entityModel = new EntityModel(this.adapterMemento, this.propertyScalarModels);
- entityModel.FCTab = FCTab;
+ entityModel.fcTab = fcTab;
return entityModel;
}
- private FCColumn fcColumn;
+ private Object fcColumn;
+
+ public Object getFCColumn() {
+ return fcColumn;
+ }
/**
* Returns a new copy that SHARES the property scalar models (for edit form).
*/
- public EntityModel cloneWithColumnMetadata(final FCColumn fcColumn) {
+ public EntityModel cloneWithColumnMetadata(final Object fcColumn) {
final EntityModel entityModel = new EntityModel(this.adapterMemento, this.propertyScalarModels);
entityModel.fcColumn = fcColumn;
return entityModel;
}
- public FCColumn getFCColumn() {
- return fcColumn;
- }
private FieldSet fieldSet;
public FieldSet getFieldSet() {
http://git-wip-us.apache.org/repos/asf/isis/blob/d7a1ee2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
index 5bd57d0..61fb3f3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
@@ -61,7 +61,7 @@ public class EntityCollectionsPanel extends PanelAbstract<EntityModel> {
public EntityCollectionsPanel(final String id, final EntityModel entityModel) {
super(id, entityModel);
- FCColumnIfAny = entityModel.getFCColumn();
+ FCColumnIfAny = (FCColumn) entityModel.getFCColumn();
buildGui();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7a1ee2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/column/EntityColumn.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/column/EntityColumn.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/column/EntityColumn.java
index 34eb66f..07fd0e9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/column/EntityColumn.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/column/EntityColumn.java
@@ -75,8 +75,9 @@ public class EntityColumn extends PanelAbstract<EntityModel> {
super(id, entityModel);
- columnMetaDataIfAny = entityModel.getFCColumn();
- hint = entityModel.getFCColumn().getHint();
+ columnMetaDataIfAny = (FCColumn) entityModel.getFCColumn();
+ final FCColumn fcColumn = (FCColumn) entityModel.getFCColumn();
+ hint = fcColumn.getHint();
buildGui();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7a1ee2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/propsandcolls/EntityPropsAndCollsForm.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/propsandcolls/EntityPropsAndCollsForm.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/propsandcolls/EntityPropsAndCollsForm.java
index 9668c96..c850a2d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/propsandcolls/EntityPropsAndCollsForm.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/propsandcolls/EntityPropsAndCollsForm.java
@@ -127,7 +127,7 @@ public class EntityPropsAndCollsForm extends FormAbstract<ObjectAdapter> impleme
private void buildGui() {
final EntityModel entityModel = (EntityModel) getModel();
- final FCTab FCTabMetaDataIfAny = entityModel.getFCTab();
+ final FCTab FCTabMetaDataIfAny = (FCTab) entityModel.getFCTab();
final ColumnSpans columnSpans;
if(FCTabMetaDataIfAny != null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/d7a1ee2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java
index e9d6fda..38aa516 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabbed/EntityTabbedPanel.java
@@ -98,7 +98,8 @@ public class EntityTabbedPanel extends PanelAbstract<EntityModel> {
if(col != null) {
final EntityModel entityModel =
getModel().cloneWithColumnMetadata(col);
- final int span = entityModel.getFCColumn().getSpan();
+ final FCColumn fcColumn = (FCColumn) entityModel.getFCColumn();
+ final int span = fcColumn.getSpan();
if(span > 0) {
final EntityColumn entityColumn = new EntityColumn(id, entityModel);
addOrReplace(entityColumn);
http://git-wip-us.apache.org/repos/asf/isis/blob/d7a1ee2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroup/TabGroupPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroup/TabGroupPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroup/TabGroupPanel.java
index 1047855..fd6ca06 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroup/TabGroupPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroup/TabGroupPanel.java
@@ -50,7 +50,7 @@ public class TabGroupPanel extends AjaxBootstrapTabbedPanel {
private static List<ITab> tabsFor(final EntityModel entityModel) {
final List<ITab> tabs = Lists.newArrayList();
- final FCTabGroup tabGroup = entityModel.getFCTabGroup();
+ final FCTabGroup tabGroup = (FCTabGroup) entityModel.getFCTabGroup();
final List<FCTab> FCTabList = FluentIterable
.from(tabGroup.getTabs())
.filter(FCTab.Predicates.notEmpty())
@@ -73,7 +73,7 @@ public class TabGroupPanel extends AjaxBootstrapTabbedPanel {
super(ID_TAB_GROUP, tabsFor(entityModel));
this.entityModel = entityModel;
- this.tabGroup = entityModel.getFCTabGroup();
+ this.tabGroup = (FCTabGroup) entityModel.getFCTabGroup();
this.selectedTabInSession = ScopedSessionAttribute.create(entityModel, this, SESSION_ATTR_SELECTED_TAB);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7a1ee2d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgrouplist/TabGroupListPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgrouplist/TabGroupListPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgrouplist/TabGroupListPanel.java
index ff0de4d..952c3ad 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgrouplist/TabGroupListPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgrouplist/TabGroupListPanel.java
@@ -41,7 +41,7 @@ public class TabGroupListPanel extends PanelAbstract<EntityModel> {
public TabGroupListPanel(final String id, final EntityModel entityModel) {
super(id, entityModel);
- this.tabGroups = entityModel.getTabGroupListMetadata();
+ this.tabGroups = (List<FCTabGroup>) entityModel.getTabGroupListMetadata();
buildGui();
}