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 [16/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/money/MoneyValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.money;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface MoneyValueFacet extends Facet {
float getAmount(ObjectAdapter object);
@@ -33,4 +31,3 @@ public interface MoneyValueFacet extends
ObjectAdapter createValue(float amount, String currencyCode);
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.money;
import java.text.DecimalFormat;
@@ -25,8 +24,6 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Currency;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Localization;
import org.apache.isis.applib.adapters.Parser;
@@ -41,8 +38,10 @@ 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;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-public class MoneyValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Money> implements MoneyValueFacet {
+public class MoneyValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Money> implements
+ MoneyValueFacet {
private static Class<? extends Facet> type() {
return MoneyValueFacet.class;
@@ -56,7 +55,7 @@ public class MoneyValueSemanticsProvider
private static final boolean EQUAL_BY_CONTENT = true;
private static final Money DEFAULT_VALUE = null; // no default
- private String defaultCurrencyCode;
+ private final String defaultCurrencyCode;
static {
DEFAULT_NUMBER_FORMAT = NumberFormat.getNumberInstance();
@@ -73,12 +72,11 @@ public class MoneyValueSemanticsProvider
private static String getDefaultCurrencyCode() {
try {
return DEFAULT_CURRENCY_FORMAT.getCurrency().getCurrencyCode();
- } catch (UnsupportedOperationException e) {
+ } catch (final UnsupportedOperationException e) {
return "";
}
}
-
/**
* Required because implementation of {@link Parser} and {@link EncoderDecoder}.
*/
@@ -87,11 +85,10 @@ public class MoneyValueSemanticsProvider
this(null, null, null);
}
- public MoneyValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, Money.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public MoneyValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(type(), holder, Money.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration,
+ context);
final String property = ConfigurationConstants.ROOT + "value.money.currency";
defaultCurrencyCode = configuration.getString(property, LOCAL_CURRENCY_CODE);
@@ -115,8 +112,9 @@ public class MoneyValueSemanticsProvider
}
private boolean endsWithCurrencyCode(final String entry, final int pos) {
- String suffix = entry.substring(pos + 1);
- boolean isCurrencyCode = suffix.length() == 3 && Character.isLetter(suffix.charAt(0)) && Character.isLetter(suffix.charAt(1))
+ final String suffix = entry.substring(pos + 1);
+ final boolean isCurrencyCode =
+ suffix.length() == 3 && Character.isLetter(suffix.charAt(0)) && Character.isLetter(suffix.charAt(1))
&& Character.isLetter(suffix.charAt(2));
return isCurrencyCode;
}
@@ -128,7 +126,8 @@ public class MoneyValueSemanticsProvider
final double value = DEFAULT_CURRENCY_FORMAT.parse(entry).doubleValue();
money = new Money(value, LOCAL_CURRENCY_CODE);
return money;
- } catch (final ParseException ignore) { }
+ } catch (final ParseException ignore) {
+ }
}
try {
@@ -145,7 +144,7 @@ public class MoneyValueSemanticsProvider
final String currencyCode = code.toUpperCase();
try {
Currency.getInstance(currencyCode.toUpperCase());
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
throw new TextEntryParseException("Invalid currency code " + currencyCode, e);
}
try {
@@ -154,11 +153,10 @@ public class MoneyValueSemanticsProvider
} catch (final ParseException e) {
throw new TextEntryParseException("Invalid money entry", e);
}
- }
-
+ }
@Override
- public String titleString(final Object object, Localization localization) {
+ public String titleString(final Object object, final Localization localization) {
if (object == null) {
return "";
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/money/MoneyValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,27 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.money;
-package org.apache.isis.core.progmodel.facets.value.money;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class MoneyValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Money> {
-
- public MoneyValueTypeFacetFactory() {
- super(MoneyValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class MoneyValueTypeFacetFactory extends
+ ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Money> {
+
+ public MoneyValueTypeFacetFactory() {
+ super(MoneyValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != org.apache.isis.applib.value.Money.class) {
- return;
- }
- addFacets(new MoneyValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != org.apache.isis.applib.value.Money.class) {
+ return;
+ }
+ addFacets(new MoneyValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.password;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface PasswordValueFacet extends Facet {
boolean checkPassword(ObjectAdapter object, String password);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.password;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -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 class PasswordValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Password> implements PasswordValueFacet {
+public class PasswordValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Password> implements
+ PasswordValueFacet {
public static Class<? extends Facet> type() {
return PasswordValueFacet.class;
@@ -50,11 +49,10 @@ public class PasswordValueSemanticsProvi
this(null, null, null);
}
- public PasswordValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, Password.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public PasswordValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(type(), holder, Password.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE,
+ configuration, context);
}
// //////////////////////////////////////////////////////////////////
@@ -67,7 +65,7 @@ public class PasswordValueSemanticsProvi
}
@Override
- public String titleString(final Object object, Localization localization) {
+ public String titleString(final Object object, final Localization localization) {
return object == null ? "" : password(object).toString();
}
@@ -113,7 +111,6 @@ public class PasswordValueSemanticsProvi
return (Password) object;
}
-
// /////// toString ///////
@Override
@@ -121,6 +118,4 @@ public class PasswordValueSemanticsProvi
return "PasswordValueSemanticsProvider";
}
-
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/password/PasswordValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,27 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.password;
-package org.apache.isis.core.progmodel.facets.value.password;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class PasswordValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Password> {
-
- public PasswordValueTypeFacetFactory() {
- super(PasswordValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class PasswordValueTypeFacetFactory extends
+ ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Password> {
+
+ public PasswordValueTypeFacetFactory() {
+ super(PasswordValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != org.apache.isis.applib.value.Password.class) {
- return;
- }
- addFacets(new PasswordValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != org.apache.isis.applib.value.Password.class) {
+ return;
+ }
+ addFacets(new PasswordValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,15 +17,12 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.percentage;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Localization;
import org.apache.isis.applib.adapters.Parser;
@@ -40,8 +37,10 @@ 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.floats.FloatingPointValueFacet;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-public class PercentageValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Percentage> implements FloatingPointValueFacet {
+public class PercentageValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Percentage> implements
+ FloatingPointValueFacet {
private static final NumberFormat PERCENTAGE_FORMAT = NumberFormat.getPercentInstance();
private static final NumberFormat DECIMAL_FORMAT = NumberFormat.getNumberInstance();
@@ -65,14 +64,12 @@ public class PercentageValueSemanticsPro
this(null, null, null);
}
- public PercentageValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, Percentage.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public PercentageValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(type(), holder, Percentage.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE,
+ configuration, context);
- final String formatRequired = configuration.getString(
- ConfigurationConstants.ROOT + "value.format.percentage");
+ final String formatRequired = configuration.getString(ConfigurationConstants.ROOT + "value.format.percentage");
if (formatRequired == null) {
format = PERCENTAGE_FORMAT;
} else {
@@ -103,7 +100,7 @@ public class PercentageValueSemanticsPro
}
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return titleString(format, value);
}
@@ -161,7 +158,4 @@ public class PercentageValueSemanticsPro
return "PercentageValueSemanticsProvider: " + format;
}
-
-
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -31,7 +31,7 @@ public class PercentageValueTypeFacetFac
}
@Override
- public void process(ProcessClassContext processClassContext) {
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.shortint;
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 ShortPrimitiveValueSemanticsProvider extends ShortValueSemanticsProviderAbstract implements PropertyDefaultFacet {
+public class ShortPrimitiveValueSemanticsProvider extends ShortValueSemanticsProviderAbstract implements
+ PropertyDefaultFacet {
/**
* Required because implementation of {@link Parser} and {@link EncoderDecoder}.
@@ -38,10 +37,8 @@ public class ShortPrimitiveValueSemantic
this(null, null, null);
}
- public ShortPrimitiveValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public ShortPrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, short.class, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.shortint;
-package org.apache.isis.core.progmodel.facets.value.shortint;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class ShortPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Short> {
-
- public ShortPrimitiveValueTypeFacetFactory() {
- super(ShortValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class ShortPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Short> {
+
+ public ShortPrimitiveValueTypeFacetFactory() {
+ super(ShortValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != short.class) {
- return;
- }
- addFacets(new ShortPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != short.class) {
+ return;
+ }
+ addFacets(new ShortPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.shortint;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface ShortValueFacet extends Facet {
Short shortValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.shortint;
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 class ShortValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Short> implements ShortValueFacet {
+public class ShortValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Short> implements
+ ShortValueFacet {
public static Class<? extends Facet> type() {
return ShortValueFacet.class;
@@ -47,12 +46,10 @@ public class ShortValueSemanticsProvider
private final NumberFormat format;
- public ShortValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<Short> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public ShortValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Short> 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.short");
}
@@ -70,7 +67,7 @@ public class ShortValueSemanticsProvider
}
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return titleString(format, value);
}
@@ -114,5 +111,4 @@ public class ShortValueSemanticsProvider
return "ShortValueSemanticsProvider: " + format;
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.shortint;
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 ShortWrapperValueSemanticsProvider extends ShortValueSemanticsProviderAbstract {
/**
@@ -36,10 +34,8 @@ public class ShortWrapperValueSemanticsP
this(null, null, null);
}
- public ShortWrapperValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public ShortWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Short.class, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.shortint;
-package org.apache.isis.core.progmodel.facets.value.shortint;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class ShortWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Short> {
-
- public ShortWrapperValueTypeFacetFactory() {
- super(ShortValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class ShortWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Short> {
+
+ public ShortWrapperValueTypeFacetFactory() {
+ super(ShortValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Short.class) {
- return;
- }
- addFacets(new ShortWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Short.class) {
+ return;
+ }
+ addFacets(new ShortWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.string;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface StringValueFacet extends Facet {
String stringValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.string;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -30,8 +29,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 StringValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<String> implements StringValueFacet {
+public class StringValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<String> implements
+ StringValueFacet {
public static Class<? extends Facet> type() {
return StringValueFacet.class;
@@ -49,11 +48,10 @@ public class StringValueSemanticsProvide
this(null, null, null);
}
- public StringValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, String.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public StringValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(type(), holder, String.class, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration,
+ context);
}
// //////////////////////////////////////////////////////////////////
@@ -70,7 +68,7 @@ public class StringValueSemanticsProvide
}
@Override
- public String titleString(final Object object, Localization localization) {
+ public String titleString(final Object object, final Localization localization) {
final String string = (String) (object == null ? "" : object);
return string;
}
@@ -125,7 +123,6 @@ public class StringValueSemanticsProvide
return getAdapterMap().adapterFor(value);
}
-
// /////// toString ///////
@Override
@@ -133,5 +130,4 @@ public class StringValueSemanticsProvide
return "StringValueSemanticsProvider";
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.string;
-package org.apache.isis.core.progmodel.facets.value.string;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class StringValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<String> {
-
- public StringValueTypeFacetFactory() {
- super(StringValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class StringValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<String> {
+
+ public StringValueTypeFacetFactory() {
+ super(StringValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != String.class) {
- return;
- }
- addFacets(new StringValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != String.class) {
+ return;
+ }
+ addFacets(new StringValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,85 +17,76 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.time;
-package org.apache.isis.core.progmodel.facets.value.time;
-
import java.text.DateFormat;
import java.util.Date;
import java.util.Map;
-import com.google.inject.internal.Maps;
-
-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.Time;
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 com.google.inject.internal.Maps;
+
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
public class TimeValueSemanticsProvider extends TimeValueSemanticsProviderAbstract<org.apache.isis.applib.value.Time> {
-
- private static final Map<String, DateFormat> formats = Maps.newHashMap();
-
- static {
- initFormats(formats);
- }
-
- /**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
- */
- @SuppressWarnings("NP_NULL_PARAM_DEREF_NONVIRTUAL")
- public TimeValueSemanticsProvider() {
- this(null, null, null);
- }
-
- public TimeValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(holder, org.apache.isis.applib.value.Time.class, configuration, context);
- }
-
- @Override
- protected Map<String, DateFormat> formats() {
- return formats;
- }
-
- @Override
- protected boolean ignoreTimeZone() {
- return true;
- }
-
- @Override
- protected Time add(
- final Time original,
- final int years,
- final int months,
- final int days,
- final int hours,
- final int minutes) {
- Time time = original;
- time = time.add(hours, minutes);
- return time;
- }
-
- @Override
- protected Date dateValue(final Object object) {
- final Time time = (Time) object;
- return time == null ? null : time.asJavaDate();
- }
-
- @Override
- protected Time now() {
- return new Time();
- }
-
- @Override
- protected Time setDate(final Date date) {
- return new Time(date.getTime());
- }
-
-}
+
+ private static final Map<String, DateFormat> formats = Maps.newHashMap();
+
+ static {
+ initFormats(formats);
+ }
+
+ /**
+ * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ */
+ @SuppressWarnings("NP_NULL_PARAM_DEREF_NONVIRTUAL")
+ public TimeValueSemanticsProvider() {
+ this(null, null, null);
+ }
+
+ public TimeValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(holder, org.apache.isis.applib.value.Time.class, configuration, context);
+ }
+
+ @Override
+ protected Map<String, DateFormat> formats() {
+ return formats;
+ }
+
+ @Override
+ protected boolean ignoreTimeZone() {
+ return true;
+ }
+
+ @Override
+ protected Time add(final Time original, final int years, final int months, final int days, final int hours,
+ final int minutes) {
+ Time time = original;
+ time = time.add(hours, minutes);
+ return time;
+ }
+
+ @Override
+ protected Date dateValue(final Object object) {
+ final Time time = (Time) object;
+ return time == null ? null : time.asJavaDate();
+ }
+
+ @Override
+ protected Time now() {
+ return new Time();
+ }
+
+ @Override
+ protected Time setDate(final Date date) {
+ return new Time(date.getTime());
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,30 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.time;
-package org.apache.isis.core.progmodel.facets.value.time;
-
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 TimeValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Time> {
-
- public TimeValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
- // (inherited)
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class TimeValueTypeFacetFactory extends
+ ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Time> {
+
+ public TimeValueTypeFacetFactory() {
+ 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.Time.class) {
- return;
- }
- addFacets(new TimeValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != org.apache.isis.applib.value.Time.class) {
+ return;
+ }
+ addFacets(new TimeValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.timesql;
import java.sql.Time;
@@ -26,10 +25,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Map;
-import com.google.inject.internal.Maps;
-
-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;
@@ -38,10 +33,13 @@ 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.time.TimeValueSemanticsProviderAbstract;
+import com.google.inject.internal.Maps;
+
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
/**
* Treats {@link java.sql.Time} as a time-only value type.
- *
+ *
*/
public class JavaSqlTimeValueSemanticsProvider extends TimeValueSemanticsProviderAbstract<java.sql.Time> {
private static Map<String, DateFormat> formats = Maps.newHashMap();
@@ -58,15 +56,14 @@ public class JavaSqlTimeValueSemanticsPr
this(null, null, null);
}
- public JavaSqlTimeValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public JavaSqlTimeValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, java.sql.Time.class, configuration, context);
}
@Override
- public Time add(final Time original, final int years, final int months, final int days, final int hours, final int minutes) {
+ public Time add(final Time original, final int years, final int months, final int days, final int hours,
+ final int minutes) {
final java.sql.Time time = original;
final Calendar cal = Calendar.getInstance();
cal.setTime(time);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,29 +17,27 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.timesql;
-package org.apache.isis.core.progmodel.facets.value.timesql;
-
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 JavaSqlTimeValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<java.sql.Time> {
-
- public JavaSqlTimeValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited TimeValueSemanticsProvider#facetType (inherited)
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class JavaSqlTimeValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<java.sql.Time> {
+
+ public JavaSqlTimeValueTypeFacetFactory() {
+ 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 != java.sql.Time.class) {
- return;
- }
- addFacets(new JavaSqlTimeValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != java.sql.Time.class) {
+ return;
+ }
+ addFacets(new JavaSqlTimeValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,17 +17,12 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.timestamp;
import java.text.DateFormat;
import java.util.Date;
import java.util.Map;
-import com.google.inject.internal.Maps;
-
-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.TimeStamp;
@@ -37,6 +32,9 @@ 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;
+import com.google.inject.internal.Maps;
+
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
public class TimeStampValueSemanticsProvider extends TimeStampValueSemanticsProviderAbstract<TimeStamp> {
@@ -44,7 +42,7 @@ public class TimeStampValueSemanticsProv
return PropertyDefaultFacet.class.isAssignableFrom(TimeStampValueSemanticsProvider.class);
}
- private static Map<String,DateFormat> formats = Maps.newHashMap();
+ private static Map<String, DateFormat> formats = Maps.newHashMap();
static {
initFormats(formats);
@@ -58,10 +56,8 @@ public class TimeStampValueSemanticsProv
this(null, null, null);
}
- public TimeStampValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public TimeStampValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, TimeStamp.class, configuration, context);
}
@@ -90,4 +86,3 @@ public class TimeStampValueSemanticsProv
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.timestamp;
import java.text.DateFormat;
@@ -31,7 +30,6 @@ 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.ValueSemanticsProviderAbstractTemporal;
-
public abstract class TimeStampValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> {
private static final Object DEFAULT_VALUE = null; // no default
@@ -48,13 +46,10 @@ public abstract class TimeStampValueSema
}
@SuppressWarnings("unchecked")
- public TimeStampValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<T> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super("timestamp", holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, (T)DEFAULT_VALUE, configuration,
- context);
+ public TimeStampValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass,
+ final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
+ super("timestamp", holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, (T) DEFAULT_VALUE,
+ configuration, context);
final String formatRequired = configuration.getString(ConfigurationConstants.ROOT + "value.format.timestamp");
if (formatRequired == null) {
format = formats().get(defaultFormat());
@@ -69,13 +64,8 @@ public abstract class TimeStampValueSema
}
@Override
- protected T add(
- final T original,
- final int years,
- final int months,
- final int days,
- final int hours,
- final int minutes) {
+ protected T add(final T original, final int years, final int months, final int days, final int hours,
+ final int minutes) {
return original;
}
@@ -95,4 +85,3 @@ public abstract class TimeStampValueSema
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.timestamp;
-package org.apache.isis.core.progmodel.facets.value.timestamp;
-
import org.apache.isis.applib.value.TimeStamp;
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 TimeStampValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<TimeStamp> {
-
- public TimeStampValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
- // (inherited)
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class TimeStampValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<TimeStamp> {
+
+ public TimeStampValueTypeFacetFactory() {
+ 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.TimeStamp.class) {
- return;
- }
- addFacets(new TimeStampValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != org.apache.isis.applib.value.TimeStamp.class) {
+ return;
+ }
+ addFacets(new TimeStampValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.timestampsql;
import java.sql.Timestamp;
@@ -25,10 +24,6 @@ import java.text.DateFormat;
import java.util.Date;
import java.util.Map;
-import com.google.inject.internal.Maps;
-
-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;
@@ -38,6 +33,9 @@ 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.timestamp.TimeStampValueSemanticsProviderAbstract;
+import com.google.inject.internal.Maps;
+
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
public class JavaSqlTimeStampValueSemanticsProvider extends TimeStampValueSemanticsProviderAbstract<java.sql.Timestamp> {
@@ -45,7 +43,7 @@ public class JavaSqlTimeStampValueSemant
return PropertyDefaultFacet.class.isAssignableFrom(JavaSqlTimeStampValueSemanticsProvider.class);
}
- private static Map<String,DateFormat> formats = Maps.newHashMap();
+ private static Map<String, DateFormat> formats = Maps.newHashMap();
static {
initFormats(formats);
@@ -59,10 +57,8 @@ public class JavaSqlTimeStampValueSemant
this(null, null, null);
}
- public JavaSqlTimeStampValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public JavaSqlTimeStampValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, java.sql.Timestamp.class, configuration, context);
}
@@ -91,4 +87,3 @@ public class JavaSqlTimeStampValueSemant
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,30 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.timestampsql;
-package org.apache.isis.core.progmodel.facets.value.timestampsql;
-
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 JavaSqlTimeStampValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<java.sql.Timestamp> {
-
- public JavaSqlTimeStampValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
- // (inherited)
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class JavaSqlTimeStampValueTypeFacetFactory extends
+ ValueUsingValueSemanticsProviderFacetFactory<java.sql.Timestamp> {
+
+ public JavaSqlTimeStampValueTypeFacetFactory() {
+ 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 != java.sql.Timestamp.class) {
- return;
- }
- addFacets(new JavaSqlTimeStampValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != java.sql.Timestamp.class) {
+ return;
+ }
+ addFacets(new JavaSqlTimeStampValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}