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 2013/05/09 16:38:29 UTC
[1/2] git commit: ISIS-396: further fix for BigDecimal parsing
Updated Branches:
refs/heads/master a5368b3a9 -> 5adf0eb13
ISIS-396: further fix for BigDecimal parsing
when an action parameter.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fb4b0602
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fb4b0602
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fb4b0602
Branch: refs/heads/master
Commit: fb4b0602c498ad09796c2bdb35e097c4ba88824f
Parents: a5368b3
Author: Dan Haywood <da...@apache.org>
Authored: Thu May 9 16:36:00 2013 +0200
Committer: Dan Haywood <da...@apache.org>
Committed: Thu May 9 16:36:00 2013 +0200
----------------------------------------------------------------------
.../scalars/jdkmath/BigDecimalConverter.java | 5 +++--
.../scalars/jdkmath/BigDecimalConverterTest.java | 10 ++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fb4b0602/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter.java
index e66e167..27b978b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter.java
@@ -14,9 +14,10 @@ final class BigDecimalConverter implements IConverter<BigDecimal> {
}
@Override
- public BigDecimal convertToObject(String value, Locale locale) {
+ public BigDecimal convertToObject(String valueStr, Locale locale) {
try {
- return new BigDecimal(value).setScale(scale);
+ final BigDecimal value = new BigDecimal(valueStr);
+ return scale != null? value.setScale(scale): value;
} catch (Exception e) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fb4b0602/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterTest.java
index 8b6e1c6..a31c26b 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterTest.java
@@ -32,5 +32,15 @@ public class BigDecimalConverterTest {
Assert.assertEquals(bd_123_45_scale4, actual);
}
+ @Test
+ public void test_scaleNull() {
+ final BigDecimal actual = new BigDecimalConverter(null).convertToObject("123.45", null);
+ Assert.assertEquals(bd_123_4500_scale2, actual);
+ Assert.assertEquals(bd_123_45_scale2, actual);
+
+ Assert.assertNotEquals(bd_123_4500_scale4, actual);
+ Assert.assertNotEquals(bd_123_45_scale4, actual);
+ }
+
}
[2/2] git commit: ISIS-402: bulk actions now shown for prototype and
exploring modes.
Posted by da...@apache.org.
ISIS-402: bulk actions now shown for prototype and exploring modes.
ie @Bulk and @Prototype now can be used in conjunction.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5adf0eb1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5adf0eb1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5adf0eb1
Branch: refs/heads/master
Commit: 5adf0eb137cd21cd582ba235ac524085d31035f6
Parents: fb4b060
Author: Dan Haywood <da...@apache.org>
Authored: Thu May 9 16:37:38 2013 +0200
Committer: Dan Haywood <da...@apache.org>
Committed: Thu May 9 16:37:38 2013 +0200
----------------------------------------------------------------------
.../CollectionContentsAsAjaxTablePanel.java | 32 +++++++++++++++
.../components/widgets/cssmenu/CssMenuBuilder.java | 5 ++-
2 files changed, 36 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5adf0eb1/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 638dc2e..88091e9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -47,6 +47,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectActionFilters;
import org.apache.isis.core.metamodel.spec.feature.ObjectActions;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.common.SelectionHandler;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
@@ -149,10 +150,41 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
final ObjectSpecification typeSpec = model.getTypeOfSpecification();
List<ObjectAction> objectActions = typeSpec.getObjectActions(ActionType.USER, Contributed.INCLUDED, Filters.<ObjectAction>any());
+
+ if ( isExploring() || isPrototyping()) {
+ List<ObjectAction> explorationActions = typeSpec.getObjectActions(ActionType.EXPLORATION, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ List<ObjectAction> prototypeActions = typeSpec.getObjectActions(ActionType.PROTOTYPE, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ objectActions.addAll(explorationActions);
+ objectActions.addAll(prototypeActions);
+ }
+ if (isDebugMode()) {
+ List<ObjectAction> debugActions = typeSpec.getObjectActions(ActionType.DEBUG, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ objectActions.addAll(debugActions);
+ }
+
List<ObjectAction> flattenedActions = ObjectActions.flattenedActions(objectActions);
+
return Lists.newArrayList(Iterables.filter(flattenedActions, BULK));
}
+
+ public boolean isExploring() {
+ return IsisContext.getDeploymentType().isExploring();
+ }
+ public boolean isPrototyping() {
+ return IsisContext.getDeploymentType().isPrototyping();
+ }
+
+ /**
+ * Protected so can be overridden in testing if required.
+ */
+ protected boolean isDebugMode() {
+ // TODO: need to figure out how to switch into debug mode;
+ // probably call a Debug toggle page, and stuff into
+ // Session.getMetaData()
+ return true;
+ }
+
private static void addTitleColumn(final List<IColumn<ObjectAdapter,String>> columns, ObjectAdapterMemento parentAdapterMementoIfAny) {
columns.add(new ObjectAdapterTitleColumn(parentAdapterMementoIfAny));
http://git-wip-us.apache.org/repos/asf/isis/blob/5adf0eb1/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
index 1a657ea..70b6d9d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
@@ -79,7 +79,7 @@ public class CssMenuBuilder {
private void addMenuItems(final CssMenuItem parent, final List<ObjectAction> actions) {
addMenuItemsForActionsOfType(parent, actions, ActionType.USER);
- if (isPrototyping()) {
+ if ( isExploring() || isPrototyping()) {
addMenuItemsForActionsOfType(parent, actions, ActionType.EXPLORATION);
addMenuItemsForActionsOfType(parent, actions, ActionType.PROTOTYPE);
}
@@ -88,6 +88,9 @@ public class CssMenuBuilder {
}
}
+ public boolean isExploring() {
+ return IsisContext.getDeploymentType().isExploring();
+ }
public boolean isPrototyping() {
return IsisContext.getDeploymentType().isPrototyping();
}