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/03/01 07:13:30 UTC
[3/3] isis git commit: ISIS-993: minor refactoring of helper methos
in GridNormalizerService implementations.
ISIS-993: minor refactoring of helper methos in GridNormalizerService implementations.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bf1288c2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bf1288c2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bf1288c2
Branch: refs/heads/ISIS-993
Commit: bf1288c28759b7f2b0bf0366f89eb4e7f13f9c1c
Parents: e417a8a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Mar 1 06:13:13 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 1 06:13:13 2016 +0000
----------------------------------------------------------------------
.../bootstrap3/GridNormalizerServiceBS3.java | 87 ++++++++++----------
1 file changed, 42 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bf1288c2/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridNormalizerServiceBS3.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridNormalizerServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridNormalizerServiceBS3.java
index 0f7fa85..0eb73c9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridNormalizerServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridNormalizerServiceBS3.java
@@ -560,22 +560,6 @@ public class GridNormalizerServiceBS3 extends GridNormalizerServiceAbstract<BS3G
return true;
}
- protected void addActionTo(final ActionLayoutDataOwner owner, final ActionLayoutData actionLayoutData) {
- List<ActionLayoutData> actions = owner.getActions();
- if(actions == null) {
- owner.setActions(actions = Lists.newArrayList());
- }
- actions.add(actionLayoutData);
- }
-
- static String asId(final String str) {
- if(Strings.isNullOrEmpty(str)) {
- return str;
- }
- final char c = str.charAt(0);
- return Character.toLowerCase(c) + str.substring(1).replaceAll("\\s+", "");
- }
-
protected void addPropertiesTo(
final FieldSet fieldSet,
final List<String> propertyIds,
@@ -600,35 +584,6 @@ public class GridNormalizerServiceBS3 extends GridNormalizerServiceAbstract<BS3G
}
}
- protected void addActionsTo(
- final BS3Col bs3Col,
- final List<String> actionIds,
- final LinkedHashMap<String, ActionLayoutData> actionLayoutDataById) {
- for (String actionId : actionIds) {
- List<ActionLayoutData> actions = bs3Col.getActions();
- if(actions == null) {
- actions = Lists.newArrayList();
- bs3Col.setActions(actions);
- }
- final ActionLayoutData actionLayoutData = new ActionLayoutData(actionId);
- actions.add(actionLayoutData);
- actionLayoutDataById.put(actionId, actionLayoutData);
- actionLayoutData.setOwner(bs3Col);
- }
- }
-
- protected void addActionsTo(
- final FieldSet fieldSet,
- final List<String> actionIds,
- final LinkedHashMap<String, ActionLayoutData> actionLayoutDataById) {
- List<ActionLayoutData> actions = fieldSet.getActions();
- for (String actionId : actionIds) {
- final ActionLayoutData actionLayoutData = new ActionLayoutData(actionId);
- actions.add(actionLayoutData);
- actionLayoutDataById.put(actionId, actionLayoutData);
- }
- }
-
protected void addCollectionsTo(
final BS3Col tabRowCol,
final List<String> collectionIds,
@@ -667,8 +622,50 @@ public class GridNormalizerServiceBS3 extends GridNormalizerServiceAbstract<BS3G
}
}
+ protected void addActionsTo(
+ final BS3Col bs3Col,
+ final List<String> actionIds,
+ final LinkedHashMap<String, ActionLayoutData> actionLayoutDataById) {
+ for (String actionId : actionIds) {
+ final ActionLayoutData actionLayoutData = new ActionLayoutData(actionId);
+ addActionTo(bs3Col, actionLayoutData);
+ actionLayoutDataById.put(actionId, actionLayoutData);
+ }
+ }
+
+ protected void addActionsTo(
+ final FieldSet fieldSet,
+ final List<String> actionIds,
+ final LinkedHashMap<String, ActionLayoutData> actionLayoutDataById) {
+ for (String actionId : actionIds) {
+ final ActionLayoutData actionLayoutData = new ActionLayoutData(actionId);
+ addActionTo(fieldSet, actionLayoutData);
+ actionLayoutDataById.put(actionId, actionLayoutData);
+ }
+ }
+
+ protected void addActionTo(
+ final ActionLayoutDataOwner owner,
+ final ActionLayoutData actionLayoutData) {
+ List<ActionLayoutData> actions = owner.getActions();
+ if(actions == null) {
+ owner.setActions(actions = Lists.newArrayList());
+ }
+ actions.add(actionLayoutData);
+ actionLayoutData.setOwner(owner);
+ }
+
private static Boolean isSet(final Boolean flag) {
return flag != null && flag;
}
+ private static String asId(final String str) {
+ if(Strings.isNullOrEmpty(str)) {
+ return str;
+ }
+ final char c = str.charAt(0);
+ return Character.toLowerCase(c) + str.substring(1).replaceAll("\\s+", "");
+ }
+
+
}