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 [15/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/dateutil/JavaUtilDateValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/dateutil/JavaUtilDateValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/dateutil/JavaUtilDateValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/dateutil/JavaUtilDateValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,14 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.dateutil;
import java.util.Calendar;
import java.util.Date;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.clock.Clock;
@@ -35,10 +32,11 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
import org.apache.isis.core.progmodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
/**
* An adapter that handles {@link java.util.Date} as both a date AND time component.
- *
+ *
* @see JavaSqlDateValueSemanticsProvider
* @see JavaSqlTimeValueSemanticsProvider
*/
@@ -55,10 +53,8 @@ public class JavaUtilDateValueSemanticsP
this(null, null, null);
}
- public JavaUtilDateValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public JavaUtilDateValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Date.class, IMMUTABLE, EQUAL_BY_CONTENT, configuration, context);
}
@@ -68,13 +64,8 @@ public class JavaUtilDateValueSemanticsP
}
@Override
- protected Date add(
- final Date original,
- final int years,
- final int months,
- final int days,
- final int hours,
- final int minutes) {
+ protected Date add(final Date original, final int years, final int months, final int days, final int hours,
+ final int minutes) {
final Date date = original;
final Calendar cal = Calendar.getInstance();
cal.setTime(date);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/dateutil/JavaUtilDateValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/dateutil/JavaUtilDateValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/dateutil/JavaUtilDateValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/dateutil/JavaUtilDateValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.dateutil;
-package org.apache.isis.core.progmodel.facets.value.dateutil;
-
import java.util.Date;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
-
-
-public class JavaUtilDateValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Date> {
-
- public JavaUtilDateValueTypeFacetFactory() {
- super(DateValueFacet.class); // as per inherited TimeValueSemanticsProvider#facetType (inherited)
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class JavaUtilDateValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Date> {
+
+ public JavaUtilDateValueTypeFacetFactory() {
+ super(DateValueFacet.class); // as per inherited TimeValueSemanticsProvider#facetType (inherited)
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Date.class) {
- return;
- }
- addFacets(new JavaUtilDateValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Date.class) {
+ return;
+ }
+ addFacets(new JavaUtilDateValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatPrimitiveValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatPrimitiveValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.floats;
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 FloatPrimitiveValueSemanticsProvider extends FloatValueSemanticsProviderAbstract implements PropertyDefaultFacet {
+public class FloatPrimitiveValueSemanticsProvider extends FloatValueSemanticsProviderAbstract implements
+ PropertyDefaultFacet {
/**
* Required because implementation of {@link Parser} and {@link EncoderDecoder}.
@@ -38,10 +37,8 @@ public class FloatPrimitiveValueSemantic
this(null, null, null);
}
- public FloatPrimitiveValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public FloatPrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, float.class, configuration, context);
}
@@ -54,5 +51,4 @@ public class FloatPrimitiveValueSemantic
return createAdapter(float.class, new Float(0.0f));
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatPrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatPrimitiveValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatPrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatPrimitiveValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.floats;
-package org.apache.isis.core.progmodel.facets.value.floats;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class FloatPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Float> {
-
- public FloatPrimitiveValueTypeFacetFactory() {
- super(FloatingPointValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class FloatPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Float> {
+
+ public FloatPrimitiveValueTypeFacetFactory() {
+ super(FloatingPointValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != float.class) {
- return;
- }
- addFacets(new FloatPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != float.class) {
+ return;
+ }
+ addFacets(new FloatPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.floats;
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 FloatValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Float> implements FloatingPointValueFacet {
+public class FloatValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Float> implements
+ FloatingPointValueFacet {
public static Class<? extends Facet> type() {
return FloatingPointValueFacet.class;
@@ -47,12 +46,10 @@ public class FloatValueSemanticsProvider
private final NumberFormat format;
- public FloatValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<Float> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public FloatValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Float> 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.float");
}
@@ -70,10 +67,10 @@ public class FloatValueSemanticsProvider
}
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return titleString(format, value);
}
-
+
@Override
public String titleStringWithMask(final Object value, final String usingMask) {
return titleString(new DecimalFormat(usingMask), value);
@@ -114,5 +111,4 @@ public class FloatValueSemanticsProvider
return "FloatValueSemanticsProvider: " + format;
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatWrapperValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatWrapperValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.floats;
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 FloatWrapperValueSemanticsProvider extends FloatValueSemanticsProviderAbstract {
/**
@@ -36,10 +34,8 @@ public class FloatWrapperValueSemanticsP
this(null, null, null);
}
- public FloatWrapperValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public FloatWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Float.class, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatWrapperValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatWrapperValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.floats;
-package org.apache.isis.core.progmodel.facets.value.floats;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class FloatWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Float> {
-
- public FloatWrapperValueTypeFacetFactory() {
- super(FloatingPointValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class FloatWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Float> {
+
+ public FloatWrapperValueTypeFacetFactory() {
+ super(FloatingPointValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Float.class) {
- return;
- }
- addFacets(new FloatWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Float.class) {
+ return;
+ }
+ addFacets(new FloatWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatingPointValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatingPointValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatingPointValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/floats/FloatingPointValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.floats;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface FloatingPointValueFacet extends Facet {
Float floatValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.image;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface ImageValueFacet extends Facet {
ObjectAdapter createValue(java.awt.Image image);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,90 +17,86 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.image;
-package org.apache.isis.core.progmodel.facets.value.image;
-
import org.apache.isis.applib.value.Image;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-
-public class ImageValueSemanticsProvider extends ImageValueSemanticsProviderAbstract<Image> {
-
- public ImageValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(holder, Image.class, configuration, context);
- }
-
- @Override
- public int getHeight(final ObjectAdapter object) {
- return image(object).getHeight();
- }
-
- private Image image(final ObjectAdapter object) {
- return (Image) object.getObject();
- }
-
- @Override
- public java.awt.Image getImage(final ObjectAdapter object) {
- return createImage(image(object).getImage());
- }
-
- @Override
- protected int[][] getPixels(final Object object) {
- return ((Image) object).getImage();
- }
-
- public Class<?> getValueClass() {
- return Image.class;
- }
-
- @Override
- public int getWidth(final ObjectAdapter object) {
- return image(object).getWidth();
- }
-
- @Override
- protected Image setPixels(final int[][] pixels) {
- return new Image(pixels);
- }
-
- @Override
- public Facet getUnderlyingFacet() {
- return null;
- }
-
- /**
- * Not required because {@link #alwaysReplace()} is <tt>false</tt>.
- */
- @Override
- public void setUnderlyingFacet(Facet underlyingFacet) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean alwaysReplace() {
- return false;
- }
-
- @Override
- public boolean isNoop() {
- return false;
- }
-
- @Override
- public String toString() {
- return "ImageValueSemanticsProvider: ";
- }
-
- @Override
- public ObjectAdapter createValue(final java.awt.Image image) {
- return getAdapterMap().adapterFor(new Image(grabPixels(image)));
- }
-
-}
+
+public class ImageValueSemanticsProvider extends ImageValueSemanticsProviderAbstract<Image> {
+
+ public ImageValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
+ super(holder, Image.class, configuration, context);
+ }
+
+ @Override
+ public int getHeight(final ObjectAdapter object) {
+ return image(object).getHeight();
+ }
+
+ private Image image(final ObjectAdapter object) {
+ return (Image) object.getObject();
+ }
+
+ @Override
+ public java.awt.Image getImage(final ObjectAdapter object) {
+ return createImage(image(object).getImage());
+ }
+
+ @Override
+ protected int[][] getPixels(final Object object) {
+ return ((Image) object).getImage();
+ }
+
+ public Class<?> getValueClass() {
+ return Image.class;
+ }
+
+ @Override
+ public int getWidth(final ObjectAdapter object) {
+ return image(object).getWidth();
+ }
+
+ @Override
+ protected Image setPixels(final int[][] pixels) {
+ return new Image(pixels);
+ }
+
+ @Override
+ public Facet getUnderlyingFacet() {
+ return null;
+ }
+
+ /**
+ * Not required because {@link #alwaysReplace()} is <tt>false</tt>.
+ */
+ @Override
+ public void setUnderlyingFacet(final Facet underlyingFacet) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean alwaysReplace() {
+ return false;
+ }
+
+ @Override
+ public boolean isNoop() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return "ImageValueSemanticsProvider: ";
+ }
+
+ @Override
+ public ObjectAdapter createValue(final java.awt.Image image) {
+ return getAdapterMap().adapterFor(new Image(grabPixels(image)));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.image;
-package org.apache.isis.core.progmodel.facets.value.image;
-
import java.awt.Image;
import java.awt.image.ColorModel;
import java.awt.image.ImageObserver;
@@ -36,272 +35,271 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-
-public abstract class ImageValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAndFacetAbstract<T> implements ImageValueFacet {
-
- private static final boolean IMMUTABLE = false;
- private static final boolean EQUAL_BY_CONTENT = false;
- private static final Object DEFAULT_VALUE = null; // no default
- private static final int TYPICAL_LENGTH = 18;
-
- private static final char[] BASE_64_CHARS = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
- 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
- '+', '/', };
-
- protected static final byte[] REVERSE_BASE_64_CHARS = new byte[0x100];
-
- static {
- for (int i = 0; i < REVERSE_BASE_64_CHARS.length; i++) {
- REVERSE_BASE_64_CHARS[i] = -1;
- }
- for (byte i = 0; i < BASE_64_CHARS.length; i++) {
- REVERSE_BASE_64_CHARS[BASE_64_CHARS[i]] = i;
- }
- }
-
- private FacetHolder facetHolder;
-
+
+public abstract class ImageValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAndFacetAbstract<T>
+ implements ImageValueFacet {
+
+ private static final boolean IMMUTABLE = false;
+ private static final boolean EQUAL_BY_CONTENT = false;
+ private static final Object DEFAULT_VALUE = null; // no default
+ private static final int TYPICAL_LENGTH = 18;
+
+ private static final char[] BASE_64_CHARS = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+ 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
+ '6', '7', '8', '9', '+', '/', };
+
+ protected static final byte[] REVERSE_BASE_64_CHARS = new byte[0x100];
+
+ static {
+ for (int i = 0; i < REVERSE_BASE_64_CHARS.length; i++) {
+ REVERSE_BASE_64_CHARS[i] = -1;
+ }
+ for (byte i = 0; i < BASE_64_CHARS.length; i++) {
+ REVERSE_BASE_64_CHARS[BASE_64_CHARS[i]] = i;
+ }
+ }
+
+ private FacetHolder facetHolder;
+
@SuppressWarnings("unchecked")
- public ImageValueSemanticsProviderAbstract(final FacetHolder holder,
- final Class<T> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(ImageValueFacet.class, holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, (T)DEFAULT_VALUE, configuration, context);
- }
-
-
- /**
- * Returns null to indicate that this value does not parse entry strings
- */
- @Override
- public Parser<T> getParser() {
- return null;
- }
-
- @Override
- protected T doParse(Object original, String entry) {
- throw new UnexpectedCallException();
- }
-
- public byte[] getAsByteArray(final ObjectAdapter object) {
- final int[] flatIntArray = flatten(object);
- final byte[] byteArray = new byte[flatIntArray.length * 4];
- for (int i = 0; i < flatIntArray.length; i++) {
- final int value = flatIntArray[i];
- byteArray[i * 4] = (byte) ((value >> 24) & 0xff);
- byteArray[i * 4 + 1] = (byte) ((value >> 16) & 0xff);
- byteArray[i * 4 + 2] = (byte) ((value >> 8) & 0xff);
- byteArray[i * 4 + 3] = (byte) (value & 0xff);
- }
- return byteArray;
- }
-
- private static int byteArrayToInt(final byte[] byteArray, final int offset) {
- int value = 0;
- for (int i = 0; i < 4; i++) {
- final int shift = (4 - 1 - i) * 8;
- value += (byteArray[i + offset] & 0x000000FF) << shift;
- }
- return value;
- }
-
- @Override
- public boolean alwaysReplace() {
- return false;
- }
-
- @Override
- public Facet getUnderlyingFacet() {
- return null;
- }
-
- /**
- * Not required because {@link #alwaysReplace()} is <tt>false</tt>.
- */
- @Override
- public void setUnderlyingFacet(Facet underlyingFacet) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean isDerived() {
- return false;
- }
-
- public T restoreFromByteArray(final byte[] byteArray) {
- final int[] flatIntArray = new int[byteArray.length / 4];
- for (int i = 0; i < flatIntArray.length; i++) {
- flatIntArray[i] = byteArrayToInt(byteArray, i * 4);
- }
- return setPixels(inflate(flatIntArray));
- }
-
- private int[] flatten(final ObjectAdapter object) {
- final int[][] image = getPixels(object);
- final int[] flatArray = new int[(getHeight(object) * getWidth(object)) + 2];
- int flatIndex = 0;
- flatArray[flatIndex++] = getHeight(object);
- flatArray[flatIndex++] = getWidth(object);
- for (int i = 0; i < getHeight(object); i++) {
- for (int j = 0; j < getWidth(object); j++) {
- flatArray[flatIndex++] = image[i][j];
- }
- }
- return flatArray;
- }
-
- private static int[][] inflate(final int[] flatIntArray) {
- int flatIndex = 0;
- final int height = flatIntArray[flatIndex++];
- final int width = flatIntArray[flatIndex++];
-
- final int[][] newImage = new int[height][width];
-
- for (int i = 0; i < height; i++) {
- for (int j = 0; j < width; j++) {
- newImage[i][j] = flatIntArray[flatIndex++];
- }
- }
- return newImage;
- }
-
- @Override
- protected String doEncode(Object object) {
- final int[][] image = getPixels(object);
- final int lines = image.length;
- final int width = image[0].length;
- final StringBuffer encodeData = new StringBuffer(lines * width * 4);
- encodePixel(lines, encodeData);
- encodePixel(width, encodeData);
- for (int line = 0; line < lines; line++) {
- for (int pixel = 0; pixel < width; pixel++) {
- encodePixel(image[line][pixel], encodeData);
- }
- }
- return encodeData.toString();
- }
-
- protected Image createImage(final int[][] pixels) {
- final int lines = pixels.length;
- final int width = pixels[0].length;
- final int[] pix = new int[lines * width];
- int offset = 0;
- for (int line = 0; line < lines; line++) {
- System.arraycopy(pixels[line], 0, pix, offset, width);
- offset += width;
- }
- final MemoryImageSource source = new MemoryImageSource(width, lines, pix, 0, width);
- return java.awt.Toolkit.getDefaultToolkit().createImage(source);
- }
-
- private int decodePixel(final String data, final int item) {
- final int offset = item * 4;
- int pixel = 0;
- for (int i = 0; i < 4; i++) {
- final char c = data.charAt(offset + i);
- final byte b = REVERSE_BASE_64_CHARS[c];
- if (i== 0 && b >= 32) {
- pixel = 0xff;
- }
- pixel = (pixel << 6) + b;
- }
- return pixel;
- }
-
- private void encodePixel(final int pixel, final StringBuffer encodeData) {
- // TODO the encoding is poor as the negative numbers are not dealt with properly because the 6 MSBs
- // are not included.
- if (pixel > 0x7FFFFF || pixel < -0x7FFFFF) {
- // throw new IsisException("" + pixel);
- }
- for (int i = 3; i >= 0; i--) {
- final int bitsToShift = i * 6;
- final int c = pixel >> bitsToShift;
- final char cc = BASE_64_CHARS[c & 0x3F];
- encodeData.append(cc);
- }
- }
-
- public String getIconName() {
- return null;
- }
-
- protected abstract int[][] getPixels(Object object);
-
- protected int[][] grabPixels(final Image image) {
- final int width = image.getWidth(null);
- final int lines = image.getHeight(null);
- final int pixels[] = new int[width * lines];
- final PixelGrabber grabber = new PixelGrabber(image, 0, 0, width, lines, pixels, 0, width);
- grabber.setColorModel(ColorModel.getRGBdefault());
- try {
- if (grabber.grabPixels() && (grabber.status() & ImageObserver.ALLBITS) != 0) {
- final int[][] array = new int[lines][width];
- int srcPos = 0;
- for (int line = 0; line < lines; line++) {
- array[line] = new int[width];
- System.arraycopy(pixels, srcPos, array[line], 0, width);
- for (int pixel = 0; pixel < array[line].length; pixel++ ) {
- array[line][pixel] =array[line][pixel] | 0xFF000000;
- }
- srcPos += width;
- }
- return array;
- }
- // TODO what happens if the grab fails?
- return new int[lines][width];
- } catch (final InterruptedException e) {
- throw new IsisException(e);
- }
- }
-
- @Override
- public T doRestore(final String data) {
- final int lines = decodePixel(data, 0);
- final int width = decodePixel(data, 1);
- final int[][] imageData = new int[lines][width];
- int offset = 2;
- for (int line = 0; line < lines; line++) {
- for (int pixel = 0; pixel < width; pixel++) {
- imageData[line][pixel] = decodePixel(data, offset++);
- imageData[line][pixel] =imageData[line][pixel] | 0xFF000000;
- }
- }
- final T image = setPixels(imageData);
- return image;
- }
-
- protected abstract T setPixels(int[][] pixels);
-
- public void setMask(final String mask) {}
-
- @Override
- public String titleString(final Object value, Localization localization) {
- return "image";
- }
-
- @Override
- public String titleStringWithMask(Object value, String usingMask) {
- return "image";
- }
-
- @Override
- public FacetHolder getFacetHolder() {
- return facetHolder;
- }
-
- @Override
- public void setFacetHolder(final FacetHolder facetHolder) {
- this.facetHolder = facetHolder;
- }
-
- // /////// toString ///////
-
- @Override
- public String toString() {
- return "ImageValueSemanticsProvider";
- }
-
-}
+ public ImageValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass,
+ final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
+ super(ImageValueFacet.class, holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT,
+ (T) DEFAULT_VALUE, configuration, context);
+ }
+
+ /**
+ * Returns null to indicate that this value does not parse entry strings
+ */
+ @Override
+ public Parser<T> getParser() {
+ return null;
+ }
+
+ @Override
+ protected T doParse(final Object original, final String entry) {
+ throw new UnexpectedCallException();
+ }
+
+ public byte[] getAsByteArray(final ObjectAdapter object) {
+ final int[] flatIntArray = flatten(object);
+ final byte[] byteArray = new byte[flatIntArray.length * 4];
+ for (int i = 0; i < flatIntArray.length; i++) {
+ final int value = flatIntArray[i];
+ byteArray[i * 4] = (byte) ((value >> 24) & 0xff);
+ byteArray[i * 4 + 1] = (byte) ((value >> 16) & 0xff);
+ byteArray[i * 4 + 2] = (byte) ((value >> 8) & 0xff);
+ byteArray[i * 4 + 3] = (byte) (value & 0xff);
+ }
+ return byteArray;
+ }
+
+ private static int byteArrayToInt(final byte[] byteArray, final int offset) {
+ int value = 0;
+ for (int i = 0; i < 4; i++) {
+ final int shift = (4 - 1 - i) * 8;
+ value += (byteArray[i + offset] & 0x000000FF) << shift;
+ }
+ return value;
+ }
+
+ @Override
+ public boolean alwaysReplace() {
+ return false;
+ }
+
+ @Override
+ public Facet getUnderlyingFacet() {
+ return null;
+ }
+
+ /**
+ * Not required because {@link #alwaysReplace()} is <tt>false</tt>.
+ */
+ @Override
+ public void setUnderlyingFacet(final Facet underlyingFacet) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean isDerived() {
+ return false;
+ }
+
+ public T restoreFromByteArray(final byte[] byteArray) {
+ final int[] flatIntArray = new int[byteArray.length / 4];
+ for (int i = 0; i < flatIntArray.length; i++) {
+ flatIntArray[i] = byteArrayToInt(byteArray, i * 4);
+ }
+ return setPixels(inflate(flatIntArray));
+ }
+
+ private int[] flatten(final ObjectAdapter object) {
+ final int[][] image = getPixels(object);
+ final int[] flatArray = new int[(getHeight(object) * getWidth(object)) + 2];
+ int flatIndex = 0;
+ flatArray[flatIndex++] = getHeight(object);
+ flatArray[flatIndex++] = getWidth(object);
+ for (int i = 0; i < getHeight(object); i++) {
+ for (int j = 0; j < getWidth(object); j++) {
+ flatArray[flatIndex++] = image[i][j];
+ }
+ }
+ return flatArray;
+ }
+
+ private static int[][] inflate(final int[] flatIntArray) {
+ int flatIndex = 0;
+ final int height = flatIntArray[flatIndex++];
+ final int width = flatIntArray[flatIndex++];
+
+ final int[][] newImage = new int[height][width];
+
+ for (int i = 0; i < height; i++) {
+ for (int j = 0; j < width; j++) {
+ newImage[i][j] = flatIntArray[flatIndex++];
+ }
+ }
+ return newImage;
+ }
+
+ @Override
+ protected String doEncode(final Object object) {
+ final int[][] image = getPixels(object);
+ final int lines = image.length;
+ final int width = image[0].length;
+ final StringBuffer encodeData = new StringBuffer(lines * width * 4);
+ encodePixel(lines, encodeData);
+ encodePixel(width, encodeData);
+ for (int line = 0; line < lines; line++) {
+ for (int pixel = 0; pixel < width; pixel++) {
+ encodePixel(image[line][pixel], encodeData);
+ }
+ }
+ return encodeData.toString();
+ }
+
+ protected Image createImage(final int[][] pixels) {
+ final int lines = pixels.length;
+ final int width = pixels[0].length;
+ final int[] pix = new int[lines * width];
+ int offset = 0;
+ for (int line = 0; line < lines; line++) {
+ System.arraycopy(pixels[line], 0, pix, offset, width);
+ offset += width;
+ }
+ final MemoryImageSource source = new MemoryImageSource(width, lines, pix, 0, width);
+ return java.awt.Toolkit.getDefaultToolkit().createImage(source);
+ }
+
+ private int decodePixel(final String data, final int item) {
+ final int offset = item * 4;
+ int pixel = 0;
+ for (int i = 0; i < 4; i++) {
+ final char c = data.charAt(offset + i);
+ final byte b = REVERSE_BASE_64_CHARS[c];
+ if (i == 0 && b >= 32) {
+ pixel = 0xff;
+ }
+ pixel = (pixel << 6) + b;
+ }
+ return pixel;
+ }
+
+ private void encodePixel(final int pixel, final StringBuffer encodeData) {
+ // TODO the encoding is poor as the negative numbers are not dealt with properly because the 6 MSBs
+ // are not included.
+ if (pixel > 0x7FFFFF || pixel < -0x7FFFFF) {
+ // throw new IsisException("" + pixel);
+ }
+ for (int i = 3; i >= 0; i--) {
+ final int bitsToShift = i * 6;
+ final int c = pixel >> bitsToShift;
+ final char cc = BASE_64_CHARS[c & 0x3F];
+ encodeData.append(cc);
+ }
+ }
+
+ public String getIconName() {
+ return null;
+ }
+
+ protected abstract int[][] getPixels(Object object);
+
+ protected int[][] grabPixels(final Image image) {
+ final int width = image.getWidth(null);
+ final int lines = image.getHeight(null);
+ final int pixels[] = new int[width * lines];
+ final PixelGrabber grabber = new PixelGrabber(image, 0, 0, width, lines, pixels, 0, width);
+ grabber.setColorModel(ColorModel.getRGBdefault());
+ try {
+ if (grabber.grabPixels() && (grabber.status() & ImageObserver.ALLBITS) != 0) {
+ final int[][] array = new int[lines][width];
+ int srcPos = 0;
+ for (int line = 0; line < lines; line++) {
+ array[line] = new int[width];
+ System.arraycopy(pixels, srcPos, array[line], 0, width);
+ for (int pixel = 0; pixel < array[line].length; pixel++) {
+ array[line][pixel] = array[line][pixel] | 0xFF000000;
+ }
+ srcPos += width;
+ }
+ return array;
+ }
+ // TODO what happens if the grab fails?
+ return new int[lines][width];
+ } catch (final InterruptedException e) {
+ throw new IsisException(e);
+ }
+ }
+
+ @Override
+ public T doRestore(final String data) {
+ final int lines = decodePixel(data, 0);
+ final int width = decodePixel(data, 1);
+ final int[][] imageData = new int[lines][width];
+ int offset = 2;
+ for (int line = 0; line < lines; line++) {
+ for (int pixel = 0; pixel < width; pixel++) {
+ imageData[line][pixel] = decodePixel(data, offset++);
+ imageData[line][pixel] = imageData[line][pixel] | 0xFF000000;
+ }
+ }
+ final T image = setPixels(imageData);
+ return image;
+ }
+
+ protected abstract T setPixels(int[][] pixels);
+
+ public void setMask(final String mask) {
+ }
+
+ @Override
+ public String titleString(final Object value, final Localization localization) {
+ return "image";
+ }
+
+ @Override
+ public String titleStringWithMask(final Object value, final String usingMask) {
+ return "image";
+ }
+
+ @Override
+ public FacetHolder getFacetHolder() {
+ return facetHolder;
+ }
+
+ @Override
+ public void setFacetHolder(final FacetHolder facetHolder) {
+ this.facetHolder = facetHolder;
+ }
+
+ // /////// toString ///////
+
+ @Override
+ public String toString() {
+ return "ImageValueSemanticsProvider";
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/image/ImageValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,27 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.image;
-package org.apache.isis.core.progmodel.facets.value.image;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class ImageValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Image> {
-
- public ImageValueTypeFacetFactory() {
- super(ImageValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class ImageValueTypeFacetFactory extends
+ ValueUsingValueSemanticsProviderFacetFactory<org.apache.isis.applib.value.Image> {
+
+ public ImageValueTypeFacetFactory() {
+ super(ImageValueFacet.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.Image.class) {
- return;
- }
- addFacets(new ImageValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != org.apache.isis.applib.value.Image.class) {
+ return;
+ }
+ addFacets(new ImageValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.imageawt;
import java.awt.Image;
@@ -28,17 +27,14 @@ 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.image.ImageValueSemanticsProviderAbstract;
-
public class JavaAwtImageValueSemanticsProvider extends ImageValueSemanticsProviderAbstract<Image> {
- public JavaAwtImageValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public JavaAwtImageValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Image.class, configuration, context);
}
- @Override
+ @Override
public int getHeight(final ObjectAdapter object) {
return image(object).getHeight(null);
}
@@ -71,7 +67,6 @@ public class JavaAwtImageValueSemanticsP
return createImage(pixels);
}
-
@Override
public boolean isNoop() {
return false;
@@ -85,7 +80,6 @@ public class JavaAwtImageValueSemanticsP
@Override
public ObjectAdapter createValue(final Image image) {
return getAdapterMap().adapterFor(image);
- }
-
-}
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/imageawt/JavaAwtImageValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/imageawt/JavaAwtImageValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/imageawt/JavaAwtImageValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/imageawt/JavaAwtImageValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,29 +17,27 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.imageawt;
-package org.apache.isis.core.progmodel.facets.value.imageawt;
-
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.image.ImageValueFacet;
-
-
-public class JavaAwtImageValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<java.awt.Image> {
-
- public JavaAwtImageValueTypeFacetFactory() {
- super(ImageValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class JavaAwtImageValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<java.awt.Image> {
+
+ public JavaAwtImageValueTypeFacetFactory() {
+ super(ImageValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != java.awt.Image.class) {
- return;
- }
- addFacets(new JavaAwtImageValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != java.awt.Image.class) {
+ return;
+ }
+ addFacets(new JavaAwtImageValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntPrimitiveValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntPrimitiveValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.integer;
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 IntPrimitiveValueSemanticsProvider extends IntValueSemanticsProviderAbstract implements PropertyDefaultFacet {
+public class IntPrimitiveValueSemanticsProvider extends IntValueSemanticsProviderAbstract implements
+ PropertyDefaultFacet {
/**
* Required because implementation of {@link Parser} and {@link EncoderDecoder}.
@@ -38,10 +37,8 @@ public class IntPrimitiveValueSemanticsP
this(null, null, null);
}
- public IntPrimitiveValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public IntPrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, int.class, configuration, context);
}
@@ -54,6 +51,4 @@ public class IntPrimitiveValueSemanticsP
return createAdapter(int.class, Integer.valueOf(0));
}
-
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntPrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntPrimitiveValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntPrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntPrimitiveValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.integer;
-package org.apache.isis.core.progmodel.facets.value.integer;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class IntPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Integer> {
-
- public IntPrimitiveValueTypeFacetFactory() {
- super(IntegerValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class IntPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Integer> {
+
+ public IntPrimitiveValueTypeFacetFactory() {
+ super(IntegerValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != int.class) {
- return;
- }
- addFacets(new IntPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != int.class) {
+ return;
+ }
+ addFacets(new IntPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.integer;
import java.text.DecimalFormat;
@@ -33,8 +32,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public abstract class IntValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Integer> implements IntegerValueFacet {
+public abstract class IntValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Integer>
+ implements IntegerValueFacet {
public static Class<? extends Facet> type() {
return IntegerValueFacet.class;
@@ -47,12 +46,10 @@ public abstract class IntValueSemanticsP
private final NumberFormat format;
- public IntValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<Integer> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public IntValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Integer> 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.int");
}
@@ -70,7 +67,7 @@ public abstract class IntValueSemanticsP
}
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return titleString(format, value);
}
@@ -114,6 +111,4 @@ public abstract class IntValueSemanticsP
return "IntegerValueSemanticsProvider: " + format;
}
-
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntWrapperValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntWrapperValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.integer;
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 IntWrapperValueSemanticsProvider extends IntValueSemanticsProviderAbstract {
/**
@@ -36,10 +34,8 @@ public class IntWrapperValueSemanticsPro
this(null, null, null);
}
- public IntWrapperValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public IntWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Integer.class, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntWrapperValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntWrapperValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.integer;
-package org.apache.isis.core.progmodel.facets.value.integer;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class IntWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Integer> {
-
- public IntWrapperValueTypeFacetFactory() {
- super(IntegerValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class IntWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Integer> {
+
+ public IntWrapperValueTypeFacetFactory() {
+ super(IntegerValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Integer.class) {
- return;
- }
- addFacets(new IntWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Integer.class) {
+ return;
+ }
+ addFacets(new IntWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntegerValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntegerValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntegerValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/integer/IntegerValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.integer;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface IntegerValueFacet extends Facet {
Integer integerValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleFloatingPointValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleFloatingPointValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleFloatingPointValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleFloatingPointValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.longs;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface DoubleFloatingPointValueFacet extends Facet {
Double doubleValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoublePrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoublePrimitiveValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoublePrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoublePrimitiveValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.longs;
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 DoublePrimitiveValueSemanticsProvider extends DoubleValueSemanticsProviderAbstract implements PropertyDefaultFacet {
+public class DoublePrimitiveValueSemanticsProvider extends DoubleValueSemanticsProviderAbstract implements
+ PropertyDefaultFacet {
/**
* Required because implementation of {@link Parser} and {@link EncoderDecoder}.
@@ -38,10 +37,8 @@ public class DoublePrimitiveValueSemanti
this(null, null, null);
}
- public DoublePrimitiveValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public DoublePrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, double.class, configuration, context);
}
@@ -54,5 +51,4 @@ public class DoublePrimitiveValueSemanti
return createAdapter(double.class, new Double(0.0));
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoublePrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoublePrimitiveValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoublePrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoublePrimitiveValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.longs;
-package org.apache.isis.core.progmodel.facets.value.longs;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class DoublePrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Double> {
-
- public DoublePrimitiveValueTypeFacetFactory() {
- super(DoubleFloatingPointValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class DoublePrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Double> {
+
+ public DoublePrimitiveValueTypeFacetFactory() {
+ super(DoubleFloatingPointValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != double.class) {
- return;
- }
- addFacets(new DoublePrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != double.class) {
+ return;
+ }
+ addFacets(new DoublePrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.longs;
import java.text.DecimalFormat;
@@ -33,9 +32,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public abstract class DoubleValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Double> implements
- DoubleFloatingPointValueFacet {
+public abstract class DoubleValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Double>
+ implements DoubleFloatingPointValueFacet {
private static Class<? extends Facet> type() {
return DoubleFloatingPointValueFacet.class;
@@ -48,12 +46,10 @@ public abstract class DoubleValueSemanti
private final NumberFormat format;
- public DoubleValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<Double> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public DoubleValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Double> 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.double");
}
@@ -75,7 +71,7 @@ public abstract class DoubleValueSemanti
// ///////////////////////////////////////////////////////////////////////////
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return titleString(format, value);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleWrapperValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleWrapperValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.longs;
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 DoubleWrapperValueSemanticsProvider extends DoubleValueSemanticsProviderAbstract {
/**
@@ -36,10 +34,8 @@ public class DoubleWrapperValueSemantics
this(null, null, null);
}
- public DoubleWrapperValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public DoubleWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Double.class, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleWrapperValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleWrapperValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.longs;
-package org.apache.isis.core.progmodel.facets.value.longs;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class DoubleWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Double> {
-
- public DoubleWrapperValueTypeFacetFactory() {
- super(DoubleFloatingPointValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class DoubleWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Double> {
+
+ public DoubleWrapperValueTypeFacetFactory() {
+ super(DoubleFloatingPointValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Double.class) {
- return;
- }
- addFacets(new DoubleWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Double.class) {
+ return;
+ }
+ addFacets(new DoubleWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongPrimitiveValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongPrimitiveValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.longs;
import org.apache.isis.applib.adapters.EncoderDecoder;
@@ -28,9 +27,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public class LongPrimitiveValueSemanticsProvider extends LongValueSemanticsProviderAbstract implements PropertyDefaultFacet {
-
+public class LongPrimitiveValueSemanticsProvider extends LongValueSemanticsProviderAbstract implements
+ PropertyDefaultFacet {
/**
* Required because implementation of {@link Parser} and {@link EncoderDecoder}.
@@ -39,10 +37,8 @@ public class LongPrimitiveValueSemantics
this(null, null, null);
}
- public LongPrimitiveValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public LongPrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, long.class, configuration, context);
}
@@ -55,5 +51,4 @@ public class LongPrimitiveValueSemantics
return createAdapter(long.class, Long.valueOf(0L));
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongPrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongPrimitiveValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongPrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongPrimitiveValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.longs;
-package org.apache.isis.core.progmodel.facets.value.longs;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class LongPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Long> {
-
- public LongPrimitiveValueTypeFacetFactory() {
- super(LongValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class LongPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Long> {
+
+ public LongPrimitiveValueTypeFacetFactory() {
+ super(LongValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != long.class) {
- return;
- }
- addFacets(new LongPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != long.class) {
+ return;
+ }
+ addFacets(new LongPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongValueFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongValueFacet.java Tue Apr 26 22:03:43 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.longs;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
-
public interface LongValueFacet extends Facet {
Long longValue(ObjectAdapter object);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongValueSemanticsProviderAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongValueSemanticsProviderAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.longs;
import java.text.DecimalFormat;
@@ -33,8 +32,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-
-public abstract class LongValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Long> implements LongValueFacet {
+public abstract class LongValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Long> implements
+ LongValueFacet {
public static Class<? extends Facet> type() {
return LongValueFacet.class;
@@ -45,14 +44,12 @@ public abstract class LongValueSemantics
private static final boolean IMMUTABLE = true;
private static final boolean EQUAL_BY_CONTENT = true;
- private NumberFormat format;
+ private final NumberFormat format;
- public LongValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<Long> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super(type(), holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, DEFAULT_VALUE, configuration, context);
+ public LongValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Long> 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.long");
}
@@ -70,7 +67,7 @@ public abstract class LongValueSemantics
}
@Override
- public String titleString(final Object value, Localization localization) {
+ public String titleString(final Object value, final Localization localization) {
return titleString(format, value);
}
@@ -113,5 +110,4 @@ public abstract class LongValueSemantics
return "LongValueSemanticsProvider: " + format;
}
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongWrapperValueSemanticsProvider.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongWrapperValueSemanticsProvider.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.longs;
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 LongWrapperValueSemanticsProvider extends LongValueSemanticsProviderAbstract {
/**
@@ -36,10 +34,8 @@ public class LongWrapperValueSemanticsPr
this(null, null, null);
}
- public LongWrapperValueSemanticsProvider(
- final FacetHolder holder,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
+ public LongWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration,
+ final ValueSemanticsProviderContext context) {
super(holder, Long.class, configuration, context);
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongWrapperValueTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/LongWrapperValueTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.value.longs;
-package org.apache.isis.core.progmodel.facets.value.longs;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
-
-
-public class LongWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Long> {
-
- public LongWrapperValueTypeFacetFactory() {
- super(LongValueFacet.class);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class LongWrapperValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Long> {
+
+ public LongWrapperValueTypeFacetFactory() {
+ super(LongValueFacet.class);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder holder = processClassContext.getFacetHolder();
-
- if (type != Long.class) {
- return;
- }
- addFacets(new LongWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
- }
-
-}
+
+ if (type != Long.class) {
+ return;
+ }
+ addFacets(new LongWrapperValueSemanticsProvider(holder, getConfiguration(), getContext()));
+ }
+
+}