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/01/25 16:07:25 UTC
[04/50] [abbrv] isis git commit: ISIS-993: starting to refactor so
that each Wicket component knows its corresponding view metadata object.
ISIS-993: starting to refactor so that each Wicket component knows its corresponding view metadata object.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f71501e0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f71501e0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f71501e0
Branch: refs/heads/ISIS-993
Commit: f71501e0cb6c812f8f2f957bd1a63b3eea5975c8
Parents: b83dbf3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jan 14 11:37:14 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 25 15:06:07 2016 +0000
----------------------------------------------------------------------
.../entity/tabgroups/EntityTabGroupsPanel$EntityTabPanel.html | 2 +-
.../ui/components/entity/tabgroups/EntityTabGroupsPanel.html | 2 +-
.../ui/components/entity/tabgroups/EntityTabGroupsPanel.java | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f71501e0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel$EntityTabPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel$EntityTabPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel$EntityTabPanel.html
index 3578772..111fc68 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel$EntityTabPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel$EntityTabPanel.html
@@ -22,7 +22,7 @@
<wicket:panel>
<div class="tabPanel">
<form class="inputForm" role="form">
- <div wicket:id="entityPropertiesAndCollections">
+ <div wicket:id="column">
</div>
</form>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/f71501e0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.html
index f954e5d..5b56f5d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.html
@@ -25,7 +25,7 @@
<div class="row">
<div wicket:id="leftColumn" class = "leftColumn"/>
- <div wicket:id="tabGroupsContainer" class="tabGroups">
+ <div wicket:id="middleColumn" class="tabGroups">
<div class="row" wicket:id="tabGroups">
<div wicket:id="tabGroup" class="col-xs-12">[tabbed panel will be here]</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/f71501e0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.java
index a729188..7bc0829 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/tabgroups/EntityTabGroupsPanel.java
@@ -62,11 +62,12 @@ public class EntityTabGroupsPanel extends PanelAbstract<EntityModel> {
private static final long serialVersionUID = 1L;
- private static final String ID_ENTITY_PROPERTIES_AND_COLLECTIONS = "entityPropertiesAndCollections";
private static final String ID_TAB_GROUPS = "tabGroups";
private static final String ID_TAB_GROUP = "tabGroup";
private static final String ID_LEFT_COLUMN = "leftColumn";
+ private static final String ID_MIDDLE_COLUMN = "middleColumn";
private static final String ID_RIGHT_COLUMN = "rightColumn";
+ private static final String ID_COLUMN = "column";
public EntityTabGroupsPanel(final String id, final EntityModel entityModel) {
super(id, entityModel);
@@ -170,7 +171,7 @@ public class EntityTabGroupsPanel extends PanelAbstract<EntityModel> {
};
- final MarkupContainer tabGroupsContainer = new WebMarkupContainer("tabGroupsContainer");
+ final MarkupContainer tabGroupsContainer = new WebMarkupContainer(ID_MIDDLE_COLUMN);
add(tabGroupsContainer);
tabGroupsContainer.add(tabGroupsList);
@@ -209,7 +210,7 @@ public class EntityTabGroupsPanel extends PanelAbstract<EntityModel> {
getComponentFactoryRegistry()
.addOrReplaceComponent(this,
- ID_ENTITY_PROPERTIES_AND_COLLECTIONS, ComponentType.ENTITY_PROPERTIES, modelWithTabHints);
+ ID_COLUMN, ComponentType.ENTITY_PROPERTIES, modelWithTabHints);
}
}