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 2011/04/27 00:03:55 UTC
svn commit: r1096928 [14/16] - in
/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel:
facetdecorators/help/ facetdecorators/help/file/
facetdecorators/help/file/internal/ facetdecorators/i18n/
facetdecorators/i18n/interna...
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value;
import java.text.DateFormat;
@@ -30,8 +29,6 @@ import java.util.Map;
import java.util.StringTokenizer;
import java.util.TimeZone;
-import com.google.inject.internal.Maps;
-
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.adapters.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
@@ -44,25 +41,25 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
+import com.google.inject.internal.Maps;
-public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSemanticsProviderAndFacetAbstract<T> implements DateValueFacet {
+public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSemanticsProviderAndFacetAbstract<T>
+ implements DateValueFacet {
/**
- * Introduced to allow BDD tests to provide a different format string
- * "mid-flight".
+ * Introduced to allow BDD tests to provide a different format string "mid-flight".
*/
- public static void setFormat(String propertyType, String formatStr) {
+ public static void setFormat(final String propertyType, final String formatStr) {
FORMATS.get().put(propertyType, formatStr);
}
- private final static ThreadLocal<Map<String,String>> FORMATS =
- new ThreadLocal<Map<String,String>>() {
- @Override
- protected java.util.Map<String,String> initialValue() {
- return Maps.newHashMap();
- }
- };
-
+ private final static ThreadLocal<Map<String, String>> FORMATS = new ThreadLocal<Map<String, String>>() {
+ @Override
+ protected java.util.Map<String, String> initialValue() {
+ return Maps.newHashMap();
+ }
+ };
+
protected static final String ISO_ENCODING_FORMAT = "iso_encoding";
private static final TimeZone UTC_TIME_ZONE;
@@ -92,44 +89,30 @@ public abstract class ValueSemanticsProv
private String configuredFormat;
private String propertyType;
-
/**
* Uses {@link #type()} as the facet type.
*/
- public ValueSemanticsProviderAbstractTemporal(
- final String propertyName,
- final FacetHolder holder,
- final Class<T> adaptedClass,
- final int typicalLength,
- final boolean immutable,
- final boolean equalByContent,
- final T defaultValue,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- this(propertyName, type(), holder, adaptedClass, typicalLength, immutable, equalByContent, defaultValue, configuration,
- context);
+ public ValueSemanticsProviderAbstractTemporal(final String propertyName, final FacetHolder holder,
+ final Class<T> adaptedClass, final int typicalLength, final boolean immutable, final boolean equalByContent,
+ final T defaultValue, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
+ this(propertyName, type(), holder, adaptedClass, typicalLength, immutable, equalByContent, defaultValue,
+ configuration, context);
}
/**
* Allows the specific facet subclass to be specified (rather than use {@link #type()}.
*/
- public ValueSemanticsProviderAbstractTemporal(
- final String propertyType,
- final Class<? extends Facet> facetType,
- final FacetHolder holder,
- final Class<T> adaptedClass,
- final int typicalLength,
- final boolean immutable,
- final boolean equalByContent,
- final T defaultValue,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public ValueSemanticsProviderAbstractTemporal(final String propertyType, final Class<? extends Facet> facetType,
+ final FacetHolder holder, final Class<T> adaptedClass, final int typicalLength, final boolean immutable,
+ final boolean equalByContent, final T defaultValue, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(facetType, holder, adaptedClass, typicalLength, immutable, equalByContent, defaultValue, configuration,
- context);
+ context);
configureFormats();
-
+
this.propertyType = propertyType;
- configuredFormat = getConfiguration().getString(FORMAT_KEY_PREFIX + propertyType, defaultFormat()).toLowerCase().trim();
+ configuredFormat =
+ getConfiguration().getString(FORMAT_KEY_PREFIX + propertyType, defaultFormat()).toLowerCase().trim();
buildFormat(configuredFormat);
encodingFormat = formats().get(ISO_ENCODING_FORMAT);
@@ -137,7 +120,7 @@ public abstract class ValueSemanticsProv
protected void configureFormats() {
final Map<String, DateFormat> formats = formats();
- for (Map.Entry<String, DateFormat> mapEntry : formats.entrySet()) {
+ for (final Map.Entry<String, DateFormat> mapEntry : formats.entrySet()) {
final DateFormat format = mapEntry.getValue();
format.setLenient(false);
if (ignoreTimeZone()) {
@@ -147,9 +130,9 @@ public abstract class ValueSemanticsProv
}
protected void buildDefaultFormatIfRequired() {
- Map<String, String> map = FORMATS.get();
- String currentlyConfiguredFormat = map.get(propertyType);
- if ( currentlyConfiguredFormat==null || configuredFormat.equals(currentlyConfiguredFormat)) {
+ final Map<String, String> map = FORMATS.get();
+ final String currentlyConfiguredFormat = map.get(propertyType);
+ if (currentlyConfiguredFormat == null || configuredFormat.equals(currentlyConfiguredFormat)) {
return;
}
@@ -158,7 +141,7 @@ public abstract class ValueSemanticsProv
buildFormat(configuredFormat);
}
- protected void buildFormat(String configuredFormat) {
+ protected void buildFormat(final String configuredFormat) {
final Map<String, DateFormat> formats = formats();
format = formats.get(configuredFormat);
if (format == null) {
@@ -222,7 +205,7 @@ public abstract class ValueSemanticsProv
date = relativeDate2(date, token, add);
}
return date;
- } catch (Exception e) {
+ } catch (final Exception e) {
return now();
}
}
@@ -268,7 +251,7 @@ public abstract class ValueSemanticsProv
// ///////////////////////////////////////////////////////////////////////////
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
if (value == null) {
return null;
}
@@ -280,7 +263,7 @@ public abstract class ValueSemanticsProv
return titleString(f, date);
}
- protected DateFormat format(Localization localization) {
+ protected DateFormat format(final Localization localization) {
return format;
}
@@ -312,20 +295,20 @@ public abstract class ValueSemanticsProv
protected T doRestore(final String data) {
final Calendar cal = Calendar.getInstance();
cal.setTimeZone(UTC_TIME_ZONE);
-
+
try {
cal.setTime(parse(data));
clearFields(cal);
return setDate(cal.getTime());
} catch (final ParseException e) {
- if (data.charAt(0) == 'T'){
- long millis = Long.parseLong(data.substring(1));
+ if (data.charAt(0) == 'T') {
+ final long millis = Long.parseLong(data.substring(1));
cal.setTimeInMillis(millis);
clearFields(cal);
return setDate(cal.getTime());
- } else {
- throw new EncodingException(e);
- }
+ } else {
+ throw new EncodingException(e);
+ }
}
}
@@ -359,7 +342,8 @@ public abstract class ValueSemanticsProv
protected abstract T add(T original, int years, int months, int days, int hours, int minutes);
- protected void clearFields(final Calendar cal) {}
+ protected void clearFields(final Calendar cal) {
+ }
protected abstract Date dateValue(Object value);
@@ -385,5 +369,4 @@ public abstract class ValueSemanticsProv
return false;
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,12 +17,10 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.bigdecimal;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface BigDecimalValueFacet extends Facet {
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.bigdecimal;
import java.math.BigDecimal;
@@ -36,8 +35,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public class BigDecimalValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigDecimal> implements BigDecimalValueFacet {
+public class BigDecimalValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigDecimal> implements
+ BigDecimalValueFacet {
private static Class<? extends Facet> type() {
return BigDecimalValueFacet.class;
@@ -57,18 +56,16 @@ public class BigDecimalValueSemanticsPro
this(null, null, null);
}
- public BigDecimalValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, BigDecimal.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public BigDecimalValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(type(), holder, BigDecimal.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE,
+ configuration, context);
format = determineNumberFormat("value.format.decimal");
}
-
- public void setLocale(Locale l) {
+ public void setLocale(final Locale l) {
// TODO Auto-generated method stub
-
+
}
// //////////////////////////////////////////////////////////////////
@@ -85,7 +82,7 @@ public class BigDecimalValueSemanticsPro
}
@Override
- public String titleString(final Object object, Localization localization) {
+ public String titleString(final Object object, final Localization localization) {
return titleString(format, object);
}
@@ -126,5 +123,4 @@ public class BigDecimalValueSemanticsPro
return "BigDecimalValueSemanticsProvider: " + format;
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,32 +17,28 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.bigdecimal;
-package org.apache.isis.core.progmodel.facets.value.bigdecimal;
-
import java.math.BigDecimal;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class BigDecimalValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<BigDecimal> {
-
-
- public BigDecimalValueTypeFacetFactory() {
- super(BigDecimalValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class BigDecimalValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<BigDecimal> {
+
+ public BigDecimalValueTypeFacetFactory() {
+ super(BigDecimalValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
- final FacetHolder holder = processClassContext.getFacetHolder();
- if (type != BigDecimal.class) {
- return;
- }
- addFacets(new BigDecimalValueSemanticsProvider(holder, getConfiguration(), getContext()));
- return;
- }
-
-
-}
+ final FacetHolder holder = processClassContext.getFacetHolder();
+ if (type != BigDecimal.class) {
+ return;
+ }
+ addFacets(new BigDecimalValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ return;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,12 +17,10 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.biginteger;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface BigIntegerValueFacet extends Facet {
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.biginteger;
import java.math.BigInteger;
@@ -34,8 +33,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public class BigIntegerValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigInteger> implements BigIntegerValueFacet {
+public class BigIntegerValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigInteger> implements
+ BigIntegerValueFacet {
private static final int TYPICAL_LENGTH = 19;
@@ -56,12 +55,11 @@ public class BigIntegerValueSemanticsPro
this(null, null, null);
}
- public BigIntegerValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public BigIntegerValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
- super(type(), holder, BigInteger.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ super(type(), holder, BigInteger.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE,
+ configuration, context);
format = determineNumberFormat("value.format.int");
}
@@ -79,7 +77,7 @@ public class BigIntegerValueSemanticsPro
}
@Override
- public String titleString(final Object object, Localization localization) {
+ public String titleString(final Object object, final Localization localization) {
return titleString(format, object);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,29 +17,27 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.biginteger;
-package org.apache.isis.core.progmodel.facets.value.biginteger;
-
import java.math.BigInteger;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class BigIntegerValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<BigInteger> {
-
- public BigIntegerValueTypeFacetFactory() {
- super(BigIntegerValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class BigIntegerValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<BigInteger> {
+
+ public BigIntegerValueTypeFacetFactory() {
+ super(BigIntegerValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
- if (type != BigInteger.class) {
- return;
- }
- addFacets(new BigIntegerValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+ if (type != BigInteger.class) {
+ return;
+ }
+ addFacets(new BigIntegerValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -28,8 +27,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public class BooleanPrimitiveValueSemanticsProvider extends BooleanValueSemanticsProviderAbstract implements PropertyDefaultFacet {
+public class BooleanPrimitiveValueSemanticsProvider extends BooleanValueSemanticsProviderAbstract implements
+ PropertyDefaultFacet {
private static final Boolean DEFAULT_VALUE = Boolean.FALSE;
@@ -40,10 +39,8 @@ public class BooleanPrimitiveValueSemant
this(null, null, null);
}
- public BooleanPrimitiveValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public BooleanPrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, boolean.class, DEFAULT_VALUE, configuration, context);
}
@@ -77,5 +74,4 @@ public class BooleanPrimitiveValueSemant
object.replacePojo(Boolean.valueOf(toggled));
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.booleans;
-package org.apache.isis.core.progmodel.facets.value.booleans;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class BooleanPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Boolean> {
-
- public BooleanPrimitiveValueTypeFacetFactory() {
- super(BooleanValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class BooleanPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Boolean> {
+
+ public BooleanPrimitiveValueTypeFacetFactory() {
+ super(BooleanValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != boolean.class) {
- return;
- }
- addFacets(new BooleanPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != boolean.class) {
+ return;
+ }
+ addFacets(new BooleanPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface BooleanValueFacet extends Facet {
boolean isSet(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.applib.adapters.Localization;
@@ -31,8 +30,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public abstract class BooleanValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Boolean> implements BooleanValueFacet {
+public abstract class BooleanValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Boolean>
+ implements BooleanValueFacet {
private static Class<? extends Facet> type() {
return BooleanValueFacet.class;
@@ -42,13 +41,10 @@ public abstract class BooleanValueSemant
private static final boolean IMMUTABLE = true;
private static final boolean EQUAL_BY_CONTENT = true;
- public BooleanValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<Boolean> adaptedClass,
- final Boolean defaultValue,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, defaultValue, configuration, context);
+ public BooleanValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Boolean> adaptedClass,
+ final Boolean defaultValue, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
+ super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, defaultValue, configuration,
+ context);
}
// //////////////////////////////////////////////////////////////////
@@ -57,7 +53,7 @@ public abstract class BooleanValueSemant
@Override
protected Boolean doParse(final Object context, final String entry) {
- String compareTo = entry.trim().toLowerCase();
+ final String compareTo = entry.trim().toLowerCase();
if ("true".equals(compareTo)) {
return Boolean.TRUE;
} else if ("false".startsWith(compareTo)) {
@@ -68,10 +64,10 @@ public abstract class BooleanValueSemant
}
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return value == null ? "" : isSet(value) ? "True" : "False";
}
-
+
@Override
public String titleStringWithMask(final Object value, final String usingMask) {
return titleString(value, null);
@@ -92,12 +88,12 @@ public abstract class BooleanValueSemant
throw new IsisException("Invalid data for logical, expected 1 byte, got " + data.length());
}
switch (data.charAt(0)) {
- case 'T':
- return Boolean.TRUE;
- case 'F':
- return Boolean.FALSE;
- default:
- throw new IsisException("Invalid data for logical, expected 'T', 'F' or 'N, but got " + data.charAt(0));
+ case 'T':
+ return Boolean.TRUE;
+ case 'F':
+ return Boolean.FALSE;
+ default:
+ throw new IsisException("Invalid data for logical, expected 'T', 'F' or 'N, but got " + data.charAt(0));
}
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -27,7 +26,6 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
public class BooleanWrapperValueSemanticsProvider extends BooleanValueSemanticsProviderAbstract {
private static final Boolean DEFAULT_PROVIDER = Boolean.FALSE;
@@ -39,10 +37,8 @@ public class BooleanWrapperValueSemantic
this(null, null, null);
}
- public BooleanWrapperValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public BooleanWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Boolean.class, DEFAULT_PROVIDER, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.booleans;
-package org.apache.isis.core.progmodel.facets.value.booleans;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class BooleanWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Boolean> {
-
- public BooleanWrapperValueTypeFacetFactory() {
- super(BooleanValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class BooleanWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Boolean> {
+
+ public BooleanWrapperValueTypeFacetFactory() {
+ super(BooleanValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Boolean.class) {
- return;
- }
- addFacets(new BooleanWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Boolean.class) {
+ return;
+ }
+ addFacets(new BooleanWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.bytes;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -28,9 +27,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public class BytePrimitiveValueSemanticsProvider extends ByteValueSemanticsProviderAbstract implements PropertyDefaultFacet {
-
+public class BytePrimitiveValueSemanticsProvider extends ByteValueSemanticsProviderAbstract implements
+ PropertyDefaultFacet {
/**
* Required because implementation of {@link Parser} and {@link EncoderDecoder}.
@@ -39,10 +37,8 @@ public class BytePrimitiveValueSemantics
this(null, null, null);
}
- public BytePrimitiveValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public BytePrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, byte.class, configuration, context);
}
@@ -55,5 +51,4 @@ public class BytePrimitiveValueSemantics
return createAdapter(byte.class, Byte.valueOf((byte) 0));
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/BytePrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/BytePrimitiveValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/BytePrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/BytePrimitiveValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.bytes;
-package org.apache.isis.core.progmodel.facets.value.bytes;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class BytePrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Byte> {
-
- public BytePrimitiveValueTypeFacetFactory() {
- super(ByteValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class BytePrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Byte> {
+
+ public BytePrimitiveValueTypeFacetFactory() {
+ super(ByteValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != byte.class) {
- return;
- }
- addFacets(new BytePrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != byte.class) {
+ return;
+ }
+ addFacets(new BytePrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.bytes;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface ByteValueFacet extends Facet {
Byte byteValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.bytes;
import java.text.DecimalFormat;
@@ -33,8 +32,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public abstract class ByteValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Byte> implements ByteValueFacet {
+public abstract class ByteValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Byte> implements
+ ByteValueFacet {
private static Class<? extends Facet> type() {
return ByteValueFacet.class;
@@ -48,12 +47,10 @@ public abstract class ByteValueSemantics
private final NumberFormat format;
- public ByteValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<Byte> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public ByteValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Byte> adaptedClass,
+ final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
+ super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration,
+ context);
format = determineNumberFormat("value.format.byte");
}
@@ -71,7 +68,7 @@ public abstract class ByteValueSemantics
}
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return titleString(format, value);
}
@@ -115,6 +112,4 @@ public abstract class ByteValueSemantics
return "ByteValueSemanticsProvider: " + format;
}
-
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.bytes;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -26,7 +25,6 @@ import org.apache.isis.core.commons.conf
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
public class ByteWrapperValueSemanticsProvider extends ByteValueSemanticsProviderAbstract {
/**
@@ -36,10 +34,8 @@ public class ByteWrapperValueSemanticsPr
this(null, null, null);
}
- public ByteWrapperValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public ByteWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Byte.class, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteWrapperValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bytes/ByteWrapperValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.bytes;
-package org.apache.isis.core.progmodel.facets.value.bytes;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class ByteWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Byte> {
-
- public ByteWrapperValueTypeFacetFactory() {
- super(ByteValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class ByteWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Byte> {
+
+ public ByteWrapperValueTypeFacetFactory() {
+ super(ByteValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Byte.class) {
- return;
- }
- addFacets(new ByteWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Byte.class) {
+ return;
+ }
+ addFacets(new ByteWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.chars;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -28,8 +27,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public class CharPrimitiveValueSemanticsProvider extends CharValueSemanticsProviderAbstract implements PropertyDefaultFacet {
+public class CharPrimitiveValueSemanticsProvider extends CharValueSemanticsProviderAbstract implements
+ PropertyDefaultFacet {
/**
* Required because implementation of {@link Parser} and {@link EncoderDecoder}.
@@ -38,10 +37,8 @@ public class CharPrimitiveValueSemantics
this(null, null, null);
}
- public CharPrimitiveValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public CharPrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, char.class, configuration, context);
}
@@ -54,5 +51,4 @@ public class CharPrimitiveValueSemantics
return createAdapter(char.class, Character.valueOf(' '));
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharPrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharPrimitiveValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharPrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharPrimitiveValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.chars;
-package org.apache.isis.core.progmodel.facets.value.chars;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class CharPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Character> {
-
- public CharPrimitiveValueTypeFacetFactory() {
- super(CharValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class CharPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Character> {
+
+ public CharPrimitiveValueTypeFacetFactory() {
+ super(CharValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != char.class) {
- return;
- }
- addFacets(new CharPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != char.class) {
+ return;
+ }
+ addFacets(new CharPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.chars;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface CharValueFacet extends Facet {
Character charValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.chars;
import java.text.DecimalFormat;
@@ -31,8 +30,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public abstract class CharValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Character> implements CharValueFacet {
+public abstract class CharValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Character>
+ implements CharValueFacet {
private static Class<? extends Facet> type() {
return CharValueFacet.class;
@@ -43,12 +42,10 @@ public abstract class CharValueSemantics
private static final boolean EQUAL_BY_CONTENT = true;
private static final int TYPICAL_LENGTH = 1;
- public CharValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<Character> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public CharValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Character> adaptedClass,
+ final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
+ super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration,
+ context);
}
// //////////////////////////////////////////////////////////////////
@@ -65,7 +62,7 @@ public abstract class CharValueSemantics
}
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return value == null ? "" : value.toString();
}
@@ -102,7 +99,6 @@ public abstract class CharValueSemantics
return getAdapterMap().adapterFor(value);
}
-
// /////// toString ///////
@Override
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharWrapperValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharWrapperValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.chars;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -26,7 +25,6 @@ import org.apache.isis.core.commons.conf
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
public class CharWrapperValueSemanticsProvider extends CharValueSemanticsProviderAbstract {
/**
@@ -36,10 +34,8 @@ public class CharWrapperValueSemanticsPr
this(null, null, null);
}
- public CharWrapperValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public CharWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Character.class, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharWrapperValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/chars/CharWrapperValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.chars;
-package org.apache.isis.core.progmodel.facets.value.chars;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class CharWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Character> {
-
- public CharWrapperValueTypeFacetFactory() {
- super(CharValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class CharWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Character> {
+
+ public CharWrapperValueTypeFacetFactory() {
+ super(CharValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Character.class) {
- return;
- }
- addFacets(new CharWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Character.class) {
+ return;
+ }
+ addFacets(new CharWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.color;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface ColorValueFacet extends Facet {
int colorValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.color;
import java.text.DecimalFormat;
@@ -34,8 +33,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public class ColorValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Color> implements ColorValueFacet {
+public class ColorValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Color> implements
+ ColorValueFacet {
public static Class<? extends Facet> type() {
return ColorValueFacet.class;
@@ -53,11 +52,10 @@ public class ColorValueSemanticsProvider
this(null, null, null);
}
- public ColorValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, Color.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public ColorValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(type(), holder, Color.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration,
+ context);
}
// //////////////////////////////////////////////////////////////////
@@ -80,11 +78,11 @@ public class ColorValueSemanticsProvider
}
@Override
- public String titleString(final Object object, Localization localization) {
+ public String titleString(final Object object, final Localization localization) {
final Color color = (Color) object;
return color.title();
}
-
+
@Override
public String titleStringWithMask(final Object object, final String usingMask) {
final Color color = (Color) object;
@@ -130,5 +128,4 @@ public class ColorValueSemanticsProvider
return "ColorValueSemanticsProvider";
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/color/ColorValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,29 +17,27 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.color;
-package org.apache.isis.core.progmodel.facets.value.color;
-
import org.apache.isis.applib.value.Color;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class ColorValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Color> {
-
- public ColorValueTypeFacetFactory() {
- super(ColorValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class ColorValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Color> {
+
+ public ColorValueTypeFacetFactory() {
+ super(ColorValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Color.class) {
- return;
- }
- addFacets(new ColorValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Color.class) {
+ return;
+ }
+ addFacets(new ColorValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.date;
import java.util.Date;
@@ -25,7 +24,6 @@ import java.util.Date;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface DateValueFacet extends Facet {
public static final int DATE = 0x01;
public static final int TIME = 0x10;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,67 +17,60 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.date;
-package org.apache.isis.core.progmodel.facets.value.date;
-
import java.util.Date;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-
-public class DateValueSemanticsProvider extends DateValueSemanticsProviderAbstract<org.apache.isis.applib.value.Date> {
-
- private static final boolean IMMUTABLE = false;
- private static final boolean EQUAL_BY_CONTENT = false;
- private static final org.apache.isis.applib.value.Date DEFAULT_VALUE = null; // new org.apache.isis.applib.value.Date(2007,1,1);
-
- // // no default
-
- /**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
- */
- @SuppressWarnings("NP_NULL_PARAM_DEREF_NONVIRTUAL")
- public DateValueSemanticsProvider() {
- this(null, null, null);
- }
-
- public DateValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(holder, org.apache.isis.applib.value.Date.class, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
- }
-
- @Override
- protected org.apache.isis.applib.value.Date add(
- final org.apache.isis.applib.value.Date original,
- final int years,
- final int months,
- final int days,
- final int hours,
- final int minutes) {
- final org.apache.isis.applib.value.Date date = original;
- return date.add(years, months, days);
- }
-
- @Override
- protected org.apache.isis.applib.value.Date now() {
- return new org.apache.isis.applib.value.Date();
- }
-
- @Override
- protected Date dateValue(final Object value) {
- return ((org.apache.isis.applib.value.Date) value).dateValue();
- }
-
- @Override
- protected org.apache.isis.applib.value.Date setDate(final Date date) {
- return new org.apache.isis.applib.value.Date(date);
- }
-}
+
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
+public class DateValueSemanticsProvider extends DateValueSemanticsProviderAbstract<org.apache.isis.applib.value.Date> {
+
+ private static final boolean IMMUTABLE = false;
+ private static final boolean EQUAL_BY_CONTENT = false;
+ private static final org.apache.isis.applib.value.Date DEFAULT_VALUE = null; // new
+ // org.apache.isis.applib.value.Date(2007,1,1);
+
+ // // no default
+
+ /**
+ * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ */
+ @SuppressWarnings("NP_NULL_PARAM_DEREF_NONVIRTUAL")
+ public DateValueSemanticsProvider() {
+ this(null, null, null);
+ }
+
+ public DateValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(holder, org.apache.isis.applib.value.Date.class, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE,
+ configuration, context);
+ }
+
+ @Override
+ protected org.apache.isis.applib.value.Date add(final org.apache.isis.applib.value.Date original, final int years,
+ final int months, final int days, final int hours, final int minutes) {
+ final org.apache.isis.applib.value.Date date = original;
+ return date.add(years, months, days);
+ }
+
+ @Override
+ protected org.apache.isis.applib.value.Date now() {
+ return new org.apache.isis.applib.value.Date();
+ }
+
+ @Override
+ protected Date dateValue(final Object value) {
+ return ((org.apache.isis.applib.value.Date) value).dateValue();
+ }
+
+ @Override
+ protected org.apache.isis.applib.value.Date setDate(final Date date) {
+ return new org.apache.isis.applib.value.Date(date);
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,25 +17,23 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.date;
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Map;
-import com.google.inject.internal.Maps;
-
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
import org.apache.isis.core.progmodel.facets.value.ValueSemanticsProviderAbstractTemporal;
+import com.google.inject.internal.Maps;
public abstract class DateValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> {
- private static Map<String,DateFormat> formats = Maps.newHashMap();
+ private static Map<String, DateFormat> formats = Maps.newHashMap();
static {
formats.put("iso", createDateFormat("yyyy-MM-dd"));
@@ -45,14 +43,9 @@ public abstract class DateValueSemantics
formats.put("short", DateFormat.getDateInstance(DateFormat.SHORT));
}
- public DateValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<T> adaptedClass,
- final boolean immutable,
- final boolean equalByContent,
- final T defaultValue,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public DateValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass,
+ final boolean immutable, final boolean equalByContent, final T defaultValue,
+ final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
super("date", holder, adaptedClass, 12, immutable, equalByContent, defaultValue, configuration, context);
final String formatRequired = configuration.getString(ConfigurationConstants.ROOT + "value.format.date");
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,29 +17,28 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.date;
-package org.apache.isis.core.progmodel.facets.value.date;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class DateValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Date> {
-
- public DateValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
- // (inherited)
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class DateValueTypeFacetFactory extends
+ ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Date> {
+
+ public DateValueTypeFacetFactory() {
+ super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
+ // (inherited)
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != org.apache.isis.applib.value.Date.class) {
- return;
- }
- addFacets(new DateValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != org.apache.isis.applib.value.Date.class) {
+ return;
+ }
+ addFacets(new DateValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,14 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.datesql;
import java.sql.Date;
import java.util.Calendar;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.clock.Clock;
@@ -35,10 +32,11 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
import org.apache.isis.core.progmodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
/**
* An adapter that handles {@link java.sql.Date} with only date component.
- *
+ *
* @see JavaUtilDateValueSemanticsProvider
* @see JavaSqlTimeValueSemanticsProvider
*/
@@ -56,21 +54,14 @@ public class JavaSqlDateValueSemanticsPr
this(null, null, null);
}
- public JavaSqlDateValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public JavaSqlDateValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Date.class, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
}
@Override
- protected Date add(
- final Date original,
- final int years,
- final int months,
- final int days,
- final int hours,
- final int minutes) {
+ protected Date add(final Date original, final int years, final int months, final int days, final int hours,
+ final int minutes) {
final Date date = original;
final Calendar cal = Calendar.getInstance();
cal.setTime(date);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datesql/JavaSqlDateValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datesql/JavaSqlDateValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datesql/JavaSqlDateValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datesql/JavaSqlDateValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.datesql;
-package org.apache.isis.core.progmodel.facets.value.datesql;
-
import java.sql.Date;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
-
-
-public class JavaSqlDateValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Date> {
-
- public JavaSqlDateValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited TimeValueSemanticsProvider#facetType (inherited)
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class JavaSqlDateValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Date> {
+
+ public JavaSqlDateValueTypeFacetFactory() {
+ super(DateValueFacet.class); // as per inherited TimeValueSemanticsProvider#facetType (inherited)
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Date.class) {
- return;
- }
- addFacets(new JavaSqlDateValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Date.class) {
+ return;
+ }
+ addFacets(new JavaSqlDateValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datetime/DateTimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datetime/DateTimeValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datetime/DateTimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datetime/DateTimeValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,10 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.datetime;
import java.util.Date;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.value.DateTime;
@@ -32,6 +29,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
import org.apache.isis.core.progmodel.facets.value.DateAndTimeValueSemanticsProviderAbstract;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
public class DateTimeValueSemanticsProvider extends DateAndTimeValueSemanticsProviderAbstract<DateTime> {
private static final boolean IMMUTABLE = false;
@@ -45,10 +43,8 @@ public class DateTimeValueSemanticsProvi
this(null, null, null);
}
- public DateTimeValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public DateTimeValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, DateTime.class, IMMUTABLE, EQUAL_BY_CONTENT, configuration, context);
}
@@ -59,13 +55,8 @@ public class DateTimeValueSemanticsProvi
}
@Override
- protected DateTime add(
- final DateTime original,
- final int years,
- final int months,
- final int days,
- final int hours,
- final int minutes) {
+ protected DateTime add(final DateTime original, final int years, final int months, final int days, final int hours,
+ final int minutes) {
DateTime date = original;
date = date.add(years, months, days, hours, minutes);
return date;
@@ -82,4 +73,3 @@ public class DateTimeValueSemanticsProvi
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datetime/DateTimeValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datetime/DateTimeValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datetime/DateTimeValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/datetime/DateTimeValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,30 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.datetime;
-package org.apache.isis.core.progmodel.facets.value.datetime;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
-
-
-public class DateTimeValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.DateTime> {
-
- public DateTimeValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
- // (inherited)
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class DateTimeValueTypeFacetFactory extends
+ ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.DateTime> {
+
+ public DateTimeValueTypeFacetFactory() {
+ super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
+ // (inherited)
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != org.apache.isis.applib.value.DateTime.class) {
- return;
- }
- addFacets(new DateTimeValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != org.apache.isis.applib.value.DateTime.class) {
+ return;
+ }
+ addFacets(new DateTimeValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}