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 2012/01/22 07:59:23 UTC
svn commit: r1234453 [18/33] - in /incubator/isis/trunk/framework/core:
commons/src/main/java/org/apache/isis/core/commons/authentication/
commons/src/main/java/org/apache/isis/core/commons/components/
commons/src/main/java/org/apache/isis/core/commons...
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueSemanticsProvider.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueSemanticsProvider.java Sun Jan 22 06:58:43 2012
@@ -37,8 +37,7 @@ 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;
-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();
@@ -55,16 +54,15 @@ public class PercentageValueSemanticsPro
private NumberFormat format = PERCENTAGE_FORMAT;
/**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ * Required because implementation of {@link Parser} and
+ * {@link EncoderDecoder}.
*/
public PercentageValueSemanticsProvider() {
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");
if (formatRequired == null) {
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueTypeFacetFactory.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/percentage/PercentageValueTypeFacetFactory.java Sun Jan 22 06:58:43 2012
@@ -23,8 +23,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
import org.apache.isis.core.progmodel.facets.value.floats.FloatingPointValueFacet;
-public class PercentageValueTypeFacetFactory extends
- ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Percentage> {
+public class PercentageValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Percentage> {
public PercentageValueTypeFacetFactory() {
super(FloatingPointValueFacet.class);
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java Sun Jan 22 06:58:43 2012
@@ -27,18 +27,17 @@ 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}.
+ * Required because implementation of {@link Parser} and
+ * {@link EncoderDecoder}.
*/
public ShortPrimitiveValueSemanticsProvider() {
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/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java Sun Jan 22 06:58:43 2012
@@ -32,8 +32,7 @@ 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;
@@ -46,10 +45,8 @@ 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");
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java Sun Jan 22 06:58:43 2012
@@ -28,14 +28,14 @@ import org.apache.isis.core.progmodel.fa
public class ShortWrapperValueSemanticsProvider extends ShortValueSemanticsProviderAbstract {
/**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ * Required because implementation of {@link Parser} and
+ * {@link EncoderDecoder}.
*/
public ShortWrapperValueSemanticsProvider() {
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/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueSemanticsProvider.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/string/StringValueSemanticsProvider.java Sun Jan 22 06:58:43 2012
@@ -29,8 +29,7 @@ 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;
@@ -42,16 +41,15 @@ public class StringValueSemanticsProvide
private static final String DEFAULT_VALUE = null; // no default
/**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ * Required because implementation of {@link Parser} and
+ * {@link EncoderDecoder}.
*/
public StringValueSemanticsProvider() {
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);
}
// //////////////////////////////////////////////////////////////////
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java Sun Jan 22 06:58:43 2012
@@ -41,14 +41,14 @@ public class TimeValueSemanticsProvider
}
/**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ * Required because implementation of {@link Parser} and
+ * {@link EncoderDecoder}.
*/
public TimeValueSemanticsProvider() {
this(null, null, null);
}
- public TimeValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public TimeValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
super(holder, org.apache.isis.applib.value.Time.class, configuration, context);
}
@@ -63,8 +63,7 @@ public class TimeValueSemanticsProvider
}
@Override
- protected Time add(final Time original, final int years, final int months, final int days, final int hours,
- final int minutes) {
+ 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;
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java Sun Jan 22 06:58:43 2012
@@ -48,10 +48,8 @@ public abstract class TimeValueSemantics
}
@SuppressWarnings("unchecked")
- public TimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass,
- final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
- super("time", holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, (T) DEFAULT_VALUE,
- configuration, context);
+ public TimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
+ super("time", holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, (T) DEFAULT_VALUE, configuration, context);
final String formatRequired = configuration.getString(ConfigurationConstants.ROOT + "value.format.time");
if (formatRequired == null) {
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueTypeFacetFactory.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueTypeFacetFactory.java Sun Jan 22 06:58:43 2012
@@ -23,11 +23,11 @@ import org.apache.isis.core.metamodel.fa
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 class TimeValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Time> {
public TimeValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
+ super(DateValueFacet.class); // as per inherited
+ // DateTimeValueSemanticsProvider#facetType
// (inherited)
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java Sun Jan 22 06:58:43 2012
@@ -47,20 +47,19 @@ public class JavaSqlTimeValueSemanticsPr
}
/**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ * Required because implementation of {@link Parser} and
+ * {@link EncoderDecoder}.
*/
public JavaSqlTimeValueSemanticsProvider() {
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/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueTypeFacetFactory.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueTypeFacetFactory.java Sun Jan 22 06:58:43 2012
@@ -26,7 +26,9 @@ import org.apache.isis.core.progmodel.fa
public class JavaSqlTimeValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<java.sql.Time> {
public JavaSqlTimeValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited TimeValueSemanticsProvider#facetType (inherited)
+ super(DateValueFacet.class); // as per inherited
+ // TimeValueSemanticsProvider#facetType
+ // (inherited)
}
@Override
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java Sun Jan 22 06:58:43 2012
@@ -47,14 +47,14 @@ public class TimeStampValueSemanticsProv
}
/**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ * Required because implementation of {@link Parser} and
+ * {@link EncoderDecoder}.
*/
public TimeStampValueSemanticsProvider() {
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);
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java Sun Jan 22 06:58:43 2012
@@ -46,10 +46,8 @@ 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());
@@ -64,8 +62,7 @@ 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;
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueTypeFacetFactory.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueTypeFacetFactory.java Sun Jan 22 06:58:43 2012
@@ -27,7 +27,8 @@ import org.apache.isis.core.progmodel.fa
public class TimeStampValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<TimeStamp> {
public TimeStampValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
+ super(DateValueFacet.class); // as per inherited
+ // DateTimeValueSemanticsProvider#facetType
// (inherited)
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java Sun Jan 22 06:58:43 2012
@@ -48,14 +48,14 @@ public class JavaSqlTimeStampValueSemant
}
/**
- * Required because implementation of {@link Parser} and {@link EncoderDecoder}.
+ * Required because implementation of {@link Parser} and
+ * {@link EncoderDecoder}.
*/
public JavaSqlTimeStampValueSemanticsProvider() {
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);
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueTypeFacetFactory.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueTypeFacetFactory.java Sun Jan 22 06:58:43 2012
@@ -23,11 +23,11 @@ import org.apache.isis.core.metamodel.fa
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 class JavaSqlTimeStampValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<java.sql.Timestamp> {
public JavaSqlTimeStampValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited DateTimeValueSemanticsProvider#facetType
+ super(DateValueFacet.class); // as per inherited
+ // DateTimeValueSemanticsProvider#facetType
// (inherited)
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java Sun Jan 22 06:58:43 2012
@@ -16,11 +16,10 @@
*/
package org.apache.isis.core.progmodel.layout.dflt;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.metamodel.layout.MemberLayoutArrangerComposite;
import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberLayoutArrangerUsingMemberOrderFacet;
import org.apache.isis.core.progmodel.layout.ordermethod.MemberLayoutArrangerUsingOrderMethod;
+import org.apache.log4j.Logger;
public class MemberLayoutArrangerDefault extends MemberLayoutArrangerComposite {
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java Sun Jan 22 06:58:43 2012
@@ -21,8 +21,6 @@ import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.commons.lang.JavaClassUtils;
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
@@ -34,9 +32,9 @@ import org.apache.isis.core.metamodel.la
import org.apache.isis.core.metamodel.methodutils.MethodFinderUtils;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.log4j.Logger;
public class MemberLayoutArrangerUsingOrderMethod implements MemberLayoutArranger {
-
private static final Logger LOG = Logger.getLogger(MemberLayoutArrangerUsingOrderMethod.class);
@@ -47,25 +45,23 @@ public class MemberLayoutArrangerUsingOr
private static final String ACTION_PREFIX = null;
-
// ////////////////////////////////////////////////////////////////////////////
// constructor
// ////////////////////////////////////////////////////////////////////////////
- public MemberLayoutArrangerUsingOrderMethod() { }
-
+ public MemberLayoutArrangerUsingOrderMethod() {
+ }
// ////////////////////////////////////////////////////////////////////////////
// associations
// ////////////////////////////////////////////////////////////////////////////
-
@Override
- public OrderSet createAssociationOrderSetFor(ObjectSpecification spec, final List<FacetedMethod> associationMethods) {
+ public OrderSet createAssociationOrderSetFor(final ObjectSpecification spec, final List<FacetedMethod> associationMethods) {
if (LOG.isDebugEnabled()) {
LOG.debug("MemberLayoutArrangerUsingOrderMethod: createAssociationOrderSetFor " + spec.getFullIdentifier());
}
-
+
// ... and the ordering of the properties and collections
final FieldOrderFacet fieldOrderFacet = spec.getFacet(FieldOrderFacet.class);
String fieldOrder = fieldOrderFacet == null ? null : fieldOrderFacet.value();
@@ -76,13 +72,12 @@ public class MemberLayoutArrangerUsingOr
return createOrderSet(fieldOrder, associationMethods);
}
-
// ////////////////////////////////////////////////////////////////////////////
// actions
// ////////////////////////////////////////////////////////////////////////////
-
+
@Override
- public OrderSet createActionOrderSetFor(ObjectSpecification spec, List<FacetedMethod> actionFacetedMethodList) {
+ public OrderSet createActionOrderSetFor(final ObjectSpecification spec, final List<FacetedMethod> actionFacetedMethodList) {
if (LOG.isDebugEnabled()) {
LOG.debug("MemberLayoutArrangerUsingOrderMethod: createAssociationOrderSetFor " + spec.getFullIdentifier());
}
@@ -94,40 +89,41 @@ public class MemberLayoutArrangerUsingOr
}
return createOrderSet(actionOrder, actionFacetedMethodList);
}
-
+
// ////////////////////////////////////////////////////////////////////////////
// helpers
// ////////////////////////////////////////////////////////////////////////////
/**
* Invokes a method called <tt>xxxOrder()</tt>, returning a {@link String}.
- * @param spec
+ *
+ * @param spec
*/
- private String invokeSortOrderMethod(ObjectSpecification spec, final String methodNamePrefix) {
+ private String invokeSortOrderMethod(final ObjectSpecification spec, final String methodNamePrefix) {
final List<Method> methods = Arrays.asList(spec.getCorrespondingClass().getMethods());
final Method method = MethodFinderUtils.findMethod(methods, MethodScope.CLASS, (methodNamePrefix + "Order"), String.class, NO_PARAMETERS_TYPES);
if (method == null) {
return null;
- }
-
+ }
+
if (!JavaClassUtils.isStatic(method)) {
LOG.warn("method " + spec.getFullIdentifier() + "." + methodNamePrefix + "Order() must be declared as static");
return null;
- }
-
+ }
+
try {
- String s = (String) method.invoke(null, NO_PARAMETERS);
+ final String s = (String) method.invoke(null, NO_PARAMETERS);
if (StringUtils.isNullOrEmpty(s)) {
return null;
}
return s;
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
LOG.warn("method " + spec.getFullIdentifier() + "#" + method.getName() + "() should accept no parameters");
return null;
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
LOG.warn("method " + spec.getFullIdentifier() + "#" + method.getName() + "() must be declared as public");
return null;
- } catch (InvocationTargetException e) {
+ } catch (final InvocationTargetException e) {
LOG.warn("method " + spec.getFullIdentifier() + "#" + method.getName() + "() has thrown an exception");
return null;
}
@@ -136,7 +132,7 @@ public class MemberLayoutArrangerUsingOr
private OrderSet createOrderSet(final String order, final List<FacetedMethod> members) {
if (order == null) {
return null;
- }
+ }
return SimpleOrderSet.createOrderSet(order, members);
}
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java Sun Jan 22 06:58:43 2012
@@ -17,19 +17,17 @@
* under the License.
*/
-
-package org.apache.isis.core.progmodel.metamodelvalidator.dflt;
+package org.apache.isis.core.progmodel.metamodelvalidator.dflt;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
-
-
-public class MetaModelValidatorDefault extends MetaModelValidatorAbstract {
-
- /**
- * Does nothing.
- */
- public void validate() {
- }
-
-
-}
+
+public class MetaModelValidatorDefault extends MetaModelValidatorAbstract {
+
+ /**
+ * Does nothing.
+ */
+ @Override
+ public void validate() {
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/SimpleHelpManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/SimpleHelpManagerTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/SimpleHelpManagerTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/SimpleHelpManagerTest.java Sun Jan 22 06:58:43 2012
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facetdecorators.help.file.internal;
import java.io.BufferedReader;
@@ -29,8 +28,6 @@ import junit.framework.TestCase;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.progmodel.facetdecorators.help.file.internal.HelpManagerUsingFiles;
-
public class SimpleHelpManagerTest extends TestCase {
@@ -186,7 +183,7 @@ public class SimpleHelpManagerTest exten
}
class TestHelpManager extends HelpManagerUsingFiles {
- public TestHelpManager(IsisConfiguration configuration) {
+ public TestHelpManager(final IsisConfiguration configuration) {
super(configuration);
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java Sun Jan 22 06:58:43 2012
@@ -17,18 +17,10 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets;
-package org.apache.isis.core.progmodel.facets;
-
import java.lang.reflect.Method;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MethodRemover;
@@ -37,62 +29,65 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
-
-
-@RunWith(JMock.class)
-public abstract class AbstractFacetFactoryJUnit4TestCase {
-
- protected Mockery context = new JUnit4Mockery();
-
- protected ObjectReflector reflector;
- protected MethodRemover methodRemover;
- protected FacetHolder facetHolder;
-
- protected ObjectSpecification noSpec;
- protected OneToOneAssociation oneToOneAssociation;
- protected OneToManyAssociation oneToManyAssociation;
- protected OneToOneActionParameter actionParameter;
-
- @Before
- public void setUp() throws Exception {
- reflector = context.mock(ObjectReflector.class);
- methodRemover = context.mock(MethodRemover.class);
- facetHolder = context.mock(FacetHolder.class);
-
- noSpec = context.mock(ObjectSpecification.class);
- oneToOneAssociation = context.mock(OneToOneAssociation.class);
- oneToManyAssociation = context.mock(OneToManyAssociation.class);
- actionParameter = context.mock(OneToOneActionParameter.class);
- }
-
- @After
- public void tearDown() throws Exception {
- reflector = null;
- methodRemover = null;
- facetHolder = null;
-
- noSpec = null;
- oneToOneAssociation = null;
- oneToManyAssociation = null;
- actionParameter = null;
- }
-
-
- protected boolean contains(final Class<?>[] types, final Class<?> type) {
- return Utils.contains(types, type);
- }
-
- protected boolean contains(final FeatureType[] featureTypes, final FeatureType featureType) {
- return Utils.contains(featureTypes, featureType);
- }
-
- protected Method findMethod(final Class<?> type, final String methodName, final Class<?>[] methodTypes) {
- return Utils.findMethod(type, methodName, methodTypes);
- }
-
- protected Method findMethod(final Class<?> type, final String methodName) {
- return Utils.findMethod(type, methodName);
- }
-
-}
-
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
+@RunWith(JMock.class)
+public abstract class AbstractFacetFactoryJUnit4TestCase {
+
+ protected Mockery context = new JUnit4Mockery();
+
+ protected ObjectReflector reflector;
+ protected MethodRemover methodRemover;
+ protected FacetHolder facetHolder;
+
+ protected ObjectSpecification noSpec;
+ protected OneToOneAssociation oneToOneAssociation;
+ protected OneToManyAssociation oneToManyAssociation;
+ protected OneToOneActionParameter actionParameter;
+
+ @Before
+ public void setUp() throws Exception {
+ reflector = context.mock(ObjectReflector.class);
+ methodRemover = context.mock(MethodRemover.class);
+ facetHolder = context.mock(FacetHolder.class);
+
+ noSpec = context.mock(ObjectSpecification.class);
+ oneToOneAssociation = context.mock(OneToOneAssociation.class);
+ oneToManyAssociation = context.mock(OneToManyAssociation.class);
+ actionParameter = context.mock(OneToOneActionParameter.class);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ reflector = null;
+ methodRemover = null;
+ facetHolder = null;
+
+ noSpec = null;
+ oneToOneAssociation = null;
+ oneToManyAssociation = null;
+ actionParameter = null;
+ }
+
+ protected boolean contains(final Class<?>[] types, final Class<?> type) {
+ return Utils.contains(types, type);
+ }
+
+ protected boolean contains(final FeatureType[] featureTypes, final FeatureType featureType) {
+ return Utils.contains(featureTypes, featureType);
+ }
+
+ protected Method findMethod(final Class<?> type, final String methodName, final Class<?>[] methodTypes) {
+ return Utils.findMethod(type, methodName, methodTypes);
+ }
+
+ protected Method findMethod(final Class<?> type, final String methodName) {
+ return Utils.findMethod(type, methodName);
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java Sun Jan 22 06:58:43 2012
@@ -17,85 +17,83 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets;
-package org.apache.isis.core.progmodel.facets;
-
import java.lang.reflect.Method;
import java.util.List;
import junit.framework.TestCase;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
-
-
-public abstract class AbstractFacetFactoryTest extends TestCase {
-
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+public abstract class AbstractFacetFactoryTest extends TestCase {
+
public static class Customer {
-
+
private String firstName;
+
public String getFirstName() {
return firstName;
}
- public void setFirstName(String firstName) {
+
+ public void setFirstName(final String firstName) {
this.firstName = firstName;
}
}
- protected ProgrammableReflector reflector;
- protected ProgrammableMethodRemover methodRemover;
-
- protected FacetHolder facetHolder;
+ protected ProgrammableReflector reflector;
+ protected ProgrammableMethodRemover methodRemover;
+
+ protected FacetHolder facetHolder;
protected FacetedMethod facetedMethod;
protected FacetedMethodParameter facetedMethodParameter;
-
- @Override
- protected void setUp() throws Exception {
+
+ @Override
+ protected void setUp() throws Exception {
Logger.getRootLogger().setLevel(Level.OFF);
- super.setUp();
- BasicConfigurator.configure();
+ super.setUp();
+ BasicConfigurator.configure();
reflector = new ProgrammableReflector();
- facetHolder = new FacetHolderImpl();
+ facetHolder = new FacetHolderImpl();
facetedMethod = FacetedMethod.createProperty(Customer.class, "firstName");
- facetedMethodParameter = new FacetedMethodParameter(String.class);
- methodRemover = new ProgrammableMethodRemover();
- }
-
- @Override
- protected void tearDown() throws Exception {
- reflector = null;
- methodRemover = null;
- facetedMethod = null;
- super.tearDown();
- }
-
- protected static boolean contains(final Class<?>[] types, final Class<?> type) {
- return Utils.contains(types, type);
- }
-
- protected static boolean contains(final List<FeatureType> featureTypes, final FeatureType featureType) {
- return Utils.contains(featureTypes, featureType);
- }
-
- protected static Method findMethod(final Class<?> type, final String methodName, final Class<?>[] methodTypes) {
- return Utils.findMethod(type, methodName, methodTypes);
- }
-
- protected Method findMethod(final Class<?> type, final String methodName) {
- return Utils.findMethod(type, methodName);
- }
-
- protected void assertNoMethodsRemoved() {
- assertTrue(methodRemover.getRemovedMethodMethodCalls().isEmpty());
- assertTrue(methodRemover.getRemoveMethodArgsCalls().isEmpty());
- }
-
-}
-
+ facetedMethodParameter = new FacetedMethodParameter(String.class);
+ methodRemover = new ProgrammableMethodRemover();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ reflector = null;
+ methodRemover = null;
+ facetedMethod = null;
+ super.tearDown();
+ }
+
+ protected static boolean contains(final Class<?>[] types, final Class<?> type) {
+ return Utils.contains(types, type);
+ }
+
+ protected static boolean contains(final List<FeatureType> featureTypes, final FeatureType featureType) {
+ return Utils.contains(featureTypes, featureType);
+ }
+
+ protected static Method findMethod(final Class<?> type, final String methodName, final Class<?>[] methodTypes) {
+ return Utils.findMethod(type, methodName, methodTypes);
+ }
+
+ protected Method findMethod(final Class<?> type, final String methodName) {
+ return Utils.findMethod(type, methodName);
+ }
+
+ protected void assertNoMethodsRemoved() {
+ assertTrue(methodRemover.getRemovedMethodMethodCalls().isEmpty());
+ assertTrue(methodRemover.getRemoveMethodArgsCalls().isEmpty());
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java Sun Jan 22 06:58:43 2012
@@ -17,67 +17,63 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets;
-package org.apache.isis.core.progmodel.facets;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import org.junit.Test;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectAdapterUtils;
-
-
-public class ObjectAdapterUtilsTest {
-
+import org.junit.Test;
+
+public class ObjectAdapterUtilsTest {
+
@Test
- public void testUnwrapObjectWhenNull() {
- assertNull(ObjectAdapterUtils.unwrapObject(null));
- }
-
+ public void testUnwrapObjectWhenNull() {
+ assertNull(ObjectAdapterUtils.unwrapObject(null));
+ }
+
@Test
- public void testUnwrapObjectWhenNotNull() {
- final Object underlyingDomainObject = new Object();
- final ObjectAdapter adapter = new ObjectNoop() {
- @Override
- public Object getObject() {
- return underlyingDomainObject;
- }
-
- };
-
- assertEquals(underlyingDomainObject, ObjectAdapterUtils.unwrapObject(adapter));
- }
-
+ public void testUnwrapObjectWhenNotNull() {
+ final Object underlyingDomainObject = new Object();
+ final ObjectAdapter adapter = new ObjectNoop() {
+ @Override
+ public Object getObject() {
+ return underlyingDomainObject;
+ }
+
+ };
+
+ assertEquals(underlyingDomainObject, ObjectAdapterUtils.unwrapObject(adapter));
+ }
+
@Test
- public void testUnwrapStringWhenNull() {
- assertNull(ObjectAdapterUtils.unwrapString(null));
- }
-
+ public void testUnwrapStringWhenNull() {
+ assertNull(ObjectAdapterUtils.unwrapString(null));
+ }
+
@Test
- public void testUnwrapStringWhenNotNullButNotString() {
- final Object underlyingDomainObject = new Object();
- final ObjectAdapter adapter = new ObjectNoop() {
- @Override
- public Object getObject() {
- return underlyingDomainObject;
- }
- };
+ public void testUnwrapStringWhenNotNullButNotString() {
+ final Object underlyingDomainObject = new Object();
+ final ObjectAdapter adapter = new ObjectNoop() {
+ @Override
+ public Object getObject() {
+ return underlyingDomainObject;
+ }
+ };
assertNull(ObjectAdapterUtils.unwrapString(adapter));
- }
-
+ }
+
@Test
- public void testUnwrapStringWhenNotNullAndString() {
- final String underlyingDomainObject = "huzzah";
- final ObjectAdapter adapter = new ObjectNoop() {
- @Override
- public Object getObject() {
- return underlyingDomainObject;
- }
- };
- assertEquals("huzzah", ObjectAdapterUtils.unwrapString(adapter));
- }
-
-}
-
+ public void testUnwrapStringWhenNotNullAndString() {
+ final String underlyingDomainObject = "huzzah";
+ final ObjectAdapter adapter = new ObjectNoop() {
+ @Override
+ public Object getObject() {
+ return underlyingDomainObject;
+ }
+ };
+ assertEquals("huzzah", ObjectAdapterUtils.unwrapString(adapter));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectNoop.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectNoop.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectNoop.java Sun Jan 22 06:58:43 2012
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets;
-package org.apache.isis.core.progmodel.facets;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -28,62 +27,67 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Specification;
-
-
-/**
- * Has no functionality but makes it easier to write tests that require an instance of an {@link ObjectAdapter}.
- */
-public class ObjectNoop implements ObjectAdapter {
-
- @Override
- public void changeState(final ResolveState newState) {}
-
- @Override
- public void checkLock(final Version version) {}
-
- @Override
- public void fireChangedEvent() {}
-
- @Override
- public String getIconName() {
- return null;
- }
-
- @Override
- public Object getObject() {
- return null;
- }
-
- @Override
- public Oid getOid() {
- return null;
- }
-
- @Override
- public ResolveState getResolveState() {
- return null;
- }
-
- @Override
- public ObjectSpecification getSpecification() {
- return null;
- }
-
- @Override
- public Version getVersion() {
- return null;
- }
-
- @Override
- public void replacePojo(final Object pojo) {}
-
- @Override
- public void setOptimisticLock(final Version version) {}
-
- @Override
- public String titleString() {
- return null;
- }
+
+/**
+ * Has no functionality but makes it easier to write tests that require an
+ * instance of an {@link ObjectAdapter}.
+ */
+public class ObjectNoop implements ObjectAdapter {
+
+ @Override
+ public void changeState(final ResolveState newState) {
+ }
+
+ @Override
+ public void checkLock(final Version version) {
+ }
+
+ @Override
+ public void fireChangedEvent() {
+ }
+
+ @Override
+ public String getIconName() {
+ return null;
+ }
+
+ @Override
+ public Object getObject() {
+ return null;
+ }
+
+ @Override
+ public Oid getOid() {
+ return null;
+ }
+
+ @Override
+ public ResolveState getResolveState() {
+ return null;
+ }
+
+ @Override
+ public ObjectSpecification getSpecification() {
+ return null;
+ }
+
+ @Override
+ public Version getVersion() {
+ return null;
+ }
+
+ @Override
+ public void replacePojo(final Object pojo) {
+ }
+
+ @Override
+ public void setOptimisticLock(final Version version) {
+ }
+
+ @Override
+ public String titleString() {
+ return null;
+ }
@Override
public ObjectSpecification getElementSpecification() {
@@ -91,40 +95,37 @@ public class ObjectNoop implements Objec
}
@Override
- public void setElementSpecificationProvider(ElementSpecificationProvider elementSpecificationProvider) {
+ public void setElementSpecificationProvider(final ElementSpecificationProvider elementSpecificationProvider) {
+ }
+
+ @Override
+ public ObjectAdapter getOwner() {
+ return null;
+ }
+
+ @Override
+ public Instance getInstance(final Specification specification) {
+ return null;
}
-
-
+
@Override
- public ObjectAdapter getOwner() {
- return null;
- }
-
- @Override
- public Instance getInstance(Specification specification) {
- return null;
- }
-
- @Override
- public boolean isAggregated() {
- return false;
- }
-
- @Override
- public boolean isPersistent() {
- return false;
- }
-
- @Override
- public boolean isTransient() {
- return false;
- }
+ public boolean isAggregated() {
+ return false;
+ }
+
+ @Override
+ public boolean isPersistent() {
+ return false;
+ }
+
+ @Override
+ public boolean isTransient() {
+ return false;
+ }
@Override
public ObjectAdapter getAggregateRoot() {
return null;
}
-
-}
-
+}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableMethodRemover.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableMethodRemover.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableMethodRemover.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableMethodRemover.java Sun Jan 22 06:58:43 2012
@@ -33,8 +33,7 @@ public class ProgrammableMethodRemover i
// ////////////////////////////////////////////////////////////
static class RemoveMethodArgs {
- public RemoveMethodArgs(final MethodScope methodScope, final String methodName, final Class<?> returnType,
- final Class<?>[] parameterTypes) {
+ public RemoveMethodArgs(final MethodScope methodScope, final String methodName, final Class<?> returnType, final Class<?>[] parameterTypes) {
this.methodScope = methodScope;
this.methodName = methodName;
this.returnType = returnType;
@@ -50,8 +49,7 @@ public class ProgrammableMethodRemover i
private final List<RemoveMethodArgs> removeMethodArgsCalls = new ArrayList<RemoveMethodArgs>();
@Override
- public void removeMethod(final MethodScope methodScope, final String methodName, final Class<?> returnType,
- final Class<?>[] parameterTypes) {
+ public void removeMethod(final MethodScope methodScope, final String methodName, final Class<?> returnType, final Class<?>[] parameterTypes) {
removeMethodArgsCalls.add(new RemoveMethodArgs(methodScope, methodName, returnType, parameterTypes));
}
@@ -85,8 +83,7 @@ public class ProgrammableMethodRemover i
}
static class RemoveMethodsArgs {
- public RemoveMethodsArgs(final MethodScope methodScope, final String prefix, final Class<?> returnType,
- final boolean canBeVoid, final int paramCount) {
+ public RemoveMethodsArgs(final MethodScope methodScope, final String prefix, final Class<?> returnType, final boolean canBeVoid, final int paramCount) {
this.methodScope = methodScope;
this.prefix = prefix;
this.returnType = returnType;
@@ -104,8 +101,7 @@ public class ProgrammableMethodRemover i
private final List<RemoveMethodsArgs> removeMethodsArgs = new ArrayList<RemoveMethodsArgs>();
@Override
- public List<Method> removeMethods(final MethodScope methodScope, final String prefix, final Class<?> returnType,
- final boolean canBeVoid, final int paramCount) {
+ public List<Method> removeMethods(final MethodScope methodScope, final String prefix, final Class<?> returnType, final boolean canBeVoid, final int paramCount) {
removeMethodsArgs.add(new RemoveMethodsArgs(methodScope, prefix, returnType, canBeVoid, paramCount));
return removeMethodsReturn;
}
@@ -116,7 +112,7 @@ public class ProgrammableMethodRemover i
@Override
public void removeMethods(final List<Method> methods) {
- for (Method method : methods) {
+ for (final Method method : methods) {
removeMethod(method);
}
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java Sun Jan 22 06:58:43 2012
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets;
-package org.apache.isis.core.progmodel.facets;
-
import java.util.Collection;
import java.util.List;
@@ -30,100 +29,102 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.speccache.SpecificationCache;
-
-
-public class ProgrammableReflector implements ObjectReflector {
-
-
- @Override
- public void init() {}
-
- public void installServiceSpecification(final Class<?> cls) {}
-
- private Collection<ObjectSpecification> allSpecificationsReturn;
-
- public void setAllSpecificationsReturn(final Collection<ObjectSpecification> allSpecificationsReturn) {
- this.allSpecificationsReturn = allSpecificationsReturn;
- }
-
- @Override
- public Collection<ObjectSpecification> allSpecifications() {
- return allSpecificationsReturn;
- }
-
- private CollectionTypeRegistry getCollectionTypeRegistryReturn;
-
- public void setGetCollectionTypeRegistryReturn(final CollectionTypeRegistry getCollectionTypeRegistryReturn) {
- this.getCollectionTypeRegistryReturn = getCollectionTypeRegistryReturn;
- }
-
- public CollectionTypeRegistry getCollectionTypeRegistry() {
- return getCollectionTypeRegistryReturn;
- }
-
- @Override
- public ObjectSpecification loadSpecification(final Class<?> type) {
- return loadSpecification(type.getName());
- }
-
- private ObjectSpecification loadSpecificationStringReturn;
-
- public void setLoadSpecificationStringReturn(final ObjectSpecification loadSpecificationStringReturn) {
- this.loadSpecificationStringReturn = loadSpecificationStringReturn;
- }
-
- @Override
- public ObjectSpecification loadSpecification(final String name) {
- return loadSpecificationStringReturn;
- }
-
- @Override
- public void shutdown() {}
-
- public void setCache(SpecificationCache cache) {
- throw new NotYetImplementedException();
- }
-
- @Override
- public boolean loaded(Class<?> cls) {
- throw new NotYetImplementedException();
- }
-
- @Override
- public boolean loaded(String fullyQualifiedClassName) {
- throw new NotYetImplementedException();
- }
-
- @Override
- public void injectInto(Object candidate) {}
-
- @Override
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- // ignored
- }
-
- @Override
- public void debugData(DebugBuilder debug) {}
-
- @Override
- public String debugTitle() {
- return null;
- }
-
- @Override
- public void setServiceClasses(List<Class<?>> serviceClasses) {
- throw new NotYetImplementedException();
- }
-
+
+public class ProgrammableReflector implements ObjectReflector {
+
+ @Override
+ public void init() {
+ }
+
+ public void installServiceSpecification(final Class<?> cls) {
+ }
+
+ private Collection<ObjectSpecification> allSpecificationsReturn;
+
+ public void setAllSpecificationsReturn(final Collection<ObjectSpecification> allSpecificationsReturn) {
+ this.allSpecificationsReturn = allSpecificationsReturn;
+ }
+
+ @Override
+ public Collection<ObjectSpecification> allSpecifications() {
+ return allSpecificationsReturn;
+ }
+
+ private CollectionTypeRegistry getCollectionTypeRegistryReturn;
+
+ public void setGetCollectionTypeRegistryReturn(final CollectionTypeRegistry getCollectionTypeRegistryReturn) {
+ this.getCollectionTypeRegistryReturn = getCollectionTypeRegistryReturn;
+ }
+
+ public CollectionTypeRegistry getCollectionTypeRegistry() {
+ return getCollectionTypeRegistryReturn;
+ }
+
+ @Override
+ public ObjectSpecification loadSpecification(final Class<?> type) {
+ return loadSpecification(type.getName());
+ }
+
+ private ObjectSpecification loadSpecificationStringReturn;
+
+ public void setLoadSpecificationStringReturn(final ObjectSpecification loadSpecificationStringReturn) {
+ this.loadSpecificationStringReturn = loadSpecificationStringReturn;
+ }
+
@Override
- public boolean loadSpecifications(List<Class<?>> typesToLoad, Class<?> typeToIgnore) {
+ public ObjectSpecification loadSpecification(final String name) {
+ return loadSpecificationStringReturn;
+ }
+
+ @Override
+ public void shutdown() {
+ }
+
+ public void setCache(final SpecificationCache cache) {
+ throw new NotYetImplementedException();
+ }
+
+ @Override
+ public boolean loaded(final Class<?> cls) {
+ throw new NotYetImplementedException();
+ }
+
+ @Override
+ public boolean loaded(final String fullyQualifiedClassName) {
+ throw new NotYetImplementedException();
+ }
+
+ @Override
+ public void injectInto(final Object candidate) {
+ }
+
+ @Override
+ public void setRuntimeContext(final RuntimeContext runtimeContext) {
+ // ignored
+ }
+
+ @Override
+ public void debugData(final DebugBuilder debug) {
+ }
+
+ @Override
+ public String debugTitle() {
+ return null;
+ }
+
+ @Override
+ public void setServiceClasses(final List<Class<?>> serviceClasses) {
+ throw new NotYetImplementedException();
+ }
+
+ @Override
+ public boolean loadSpecifications(final List<Class<?>> typesToLoad, final Class<?> typeToIgnore) {
return false;
}
@Override
- public boolean loadSpecifications(List<Class<?>> typesToLoad) {
+ public boolean loadSpecifications(final List<Class<?>> typesToLoad) {
return false;
- }
-
-}
-
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/Utils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/Utils.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/Utils.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/Utils.java Sun Jan 22 06:58:43 2012
@@ -17,52 +17,49 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets;
-package org.apache.isis.core.progmodel.facets;
-
import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-
-
-class Utils {
-
- protected static boolean contains(final Class<?>[] array, final Class<?> val) {
- for (int i = 0; i < array.length; i++) {
- if (array[i] == val) {
- return true;
- }
- }
- return false;
- }
-
- protected static boolean contains(final FeatureType[] array, final FeatureType val) {
- for (int i = 0; i < array.length; i++) {
- if (array[i] == val) {
- return true;
- }
- }
- return false;
- }
-
+
+class Utils {
+
+ protected static boolean contains(final Class<?>[] array, final Class<?> val) {
+ for (final Class<?> element : array) {
+ if (element == val) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected static boolean contains(final FeatureType[] array, final FeatureType val) {
+ for (final FeatureType element : array) {
+ if (element == val) {
+ return true;
+ }
+ }
+ return false;
+ }
+
protected static boolean contains(final List<FeatureType> list, final FeatureType val) {
return list.contains(val);
}
- protected static Method findMethod(final Class<?> type, final String methodName, final Class<?>[] methodTypes) {
- try {
- return type.getMethod(methodName, methodTypes);
- } catch (final SecurityException e) {
- return null;
- } catch (final NoSuchMethodException e) {
- return null;
- }
- }
-
- protected static Method findMethod(final Class<?> type, final String methodName) {
- return findMethod(type, methodName, new Class[0]);
- }
-
-}
-
+ protected static Method findMethod(final Class<?> type, final String methodName, final Class<?>[] methodTypes) {
+ try {
+ return type.getMethod(methodName, methodTypes);
+ } catch (final SecurityException e) {
+ return null;
+ } catch (final NoSuchMethodException e) {
+ return null;
+ }
+ }
+
+ protected static Method findMethod(final Class<?> type, final String methodName) {
+ return findMethod(type, methodName, new Class[0]);
+ }
+
+}