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/09/14 11:10:42 UTC
svn commit: r1384688 - in /incubator/isis/trunk/framework:
core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/
core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/
core/progmodel/src/main...
Author: danhaywood
Date: Fri Sep 14 09:10:41 2012
New Revision: 1384688
URL: http://svn.apache.org/viewvc?rev=1384688&view=rev
Log:
ISIS-232: numeric text fields in tables
Added:
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
Modified:
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java Fri Sep 14 09:10:41 2012
@@ -41,7 +41,7 @@ public class BigDecimalValueSemanticsPro
return BigDecimalValueFacet.class;
}
- private static final int TYPICAL_LENGTH = 8;
+ private static final int TYPICAL_LENGTH = 10;
private static final BigDecimal DEFAULT_VALUE = new BigDecimal(0);
private final NumberFormat format;
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java Fri Sep 14 09:10:41 2012
@@ -35,7 +35,7 @@ import org.apache.isis.core.progmodel.fa
public class BigIntegerValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigInteger> implements BigIntegerValueFacet {
- private static final int TYPICAL_LENGTH = 8;
+ private static final int TYPICAL_LENGTH = 10;
private static Class<? extends Facet> type() {
return BigIntegerValueFacet.class;
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/longs/DoubleValueSemanticsProviderAbstract.java Fri Sep 14 09:10:41 2012
@@ -39,7 +39,7 @@ public abstract class DoubleValueSemanti
}
private static final Double DEFAULT_VALUE = new Double(0.0d);
- private static final int TYPICAL_LENGTH = 22;
+ private static final int TYPICAL_LENGTH = 10;
private final NumberFormat format;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css Fri Sep 14 09:10:41 2012
@@ -36,7 +36,7 @@ table.collectionContentsAsAjaxTable tr.o
table.collectionContentsAsAjaxTable tr td {
padding-left: 8px;
- padding-right: 30px;
+ padding-right: 10px;
padding-left: 4px;
padding-right: 4px;
}
@@ -45,7 +45,7 @@ table.collectionContentsAsAjaxTable tr t
padding-top: 3px;
padding-bottom: 3px;
padding-left: 8px;
- padding-right: 30px;
+ padding-right: 10px;
background-color: #EEEEEE;
/*border-bottom: 1px solid #407098;*/
border-top: 1px solid #407098;
@@ -77,3 +77,8 @@ table.collectionContentsAsAjaxTable #mes
table.collectionContentsAsAjaxTable caption {
padding-bottom: 2px;
}
+
+table.collectionContentsAsAjaxTable input:disabled {
+ background-color: white;
+ border: none;
+}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java Fri Sep 14 09:10:41 2012
@@ -19,6 +19,9 @@
package org.apache.isis.viewer.wicket.ui.components.scalars;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
@@ -26,8 +29,10 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
@@ -38,7 +43,7 @@ import org.apache.isis.viewer.wicket.ui.
* Adapter for {@link ScalarPanelAbstract scalar panel}s that are implemented
* using a simple {@link TextField}.
*/
-public abstract class ScalarPanelTextFieldAbstract<T> extends ScalarPanelAbstract {
+public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> extends ScalarPanelAbstract {
private static final long serialVersionUID = 1L;
@@ -46,12 +51,15 @@ public abstract class ScalarPanelTextFie
private static final String ID_SCALAR_NAME = "scalarName";
private static final String ID_FEEDBACK = "feedback";
- private static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
+ protected static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
+ protected final Class<T> cls;
+
private AbstractTextComponent<T> textField;
- public ScalarPanelTextFieldAbstract(final String id, final ScalarModel scalarModel) {
+ public ScalarPanelTextFieldAbstract(final String id, final ScalarModel scalarModel, final Class<T> cls) {
super(id, scalarModel);
+ this.cls = cls;
}
protected AbstractTextComponent<T> getTextField() {
@@ -86,6 +94,7 @@ public abstract class ScalarPanelTextFie
protected abstract AbstractTextComponent<T> createTextField();
+
private FormComponentLabel createFormComponentLabel() {
final AbstractTextComponent<T> textField = getTextField();
final String name = getModel().getName();
@@ -103,7 +112,7 @@ public abstract class ScalarPanelTextFie
protected void addStandardSemantics() {
setRequiredIfSpecified();
- setTextFieldSizeIfSpecified();
+ setTextFieldSizeIfSpecified(textField);
}
private void setRequiredIfSpecified() {
@@ -112,7 +121,7 @@ public abstract class ScalarPanelTextFie
textField.setRequired(required);
}
- private void setTextFieldSizeIfSpecified() {
+ protected void setTextFieldSizeIfSpecified(AbstractTextComponent<T> textField) {
final Integer size = determineSize();
if (size != null) {
textField.add(new AttributeModifier("size", true, new Model<String>("" + size)));
@@ -120,7 +129,7 @@ public abstract class ScalarPanelTextFie
}
@SuppressWarnings("unchecked")
- private Integer determineSize() {
+ protected Integer determineSize() {
return firstValueOf(getModel(), TypicalLengthFacet.class, MaxLengthFacet.class);
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java Fri Sep 14 09:10:41 2012
@@ -46,7 +46,7 @@ public abstract class ScalarPanelTextFie
private final String idScalarValue;
public ScalarPanelTextFieldDatePickerAbstract(final String id, String idScalarValue, final ScalarModel scalarModel) {
- super(id, scalarModel);
+ super(id, scalarModel, java.util.Date.class);
this.idScalarValue = idScalarValue;
}
Added: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java?rev=1384688&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java (added)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java Fri Sep 14 09:10:41 2012
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.viewer.wicket.ui.components.scalars;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.form.AbstractTextComponent;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+
+/**
+ * Panel for rendering numeric scalars.
+ */
+public abstract class ScalarPanelTextFieldNumeric<T extends Serializable> extends ScalarPanelTextFieldAbstract<T> {
+
+ private static final long serialVersionUID = 1L;
+ private static final String ID_SCALAR_VALUE = "scalarValue";
+
+ public ScalarPanelTextFieldNumeric(final String id, final ScalarModel scalarModel, final Class<T> cls) {
+ super(id, scalarModel, cls);
+ }
+
+ @Override
+ protected void addSemantics() {
+ super.addSemantics();
+
+ }
+
+ @Override
+ protected AbstractTextComponent<T> createTextField() {
+ return createTextField(ID_SCALAR_VALUE);
+ }
+
+ /**
+ * Helper method for subtypes.
+ */
+ protected TextField<T> createTextField(final String id) {
+ return new TextField<T>(id, new TextFieldValueModel<T>(this), cls);
+ }
+
+ //@SuppressWarnings("unchecked")
+ protected Component addComponentForCompact() {
+ final AbstractTextComponent<T> textField = createTextField(ID_SCALAR_IF_COMPACT);
+ final IModel<T> model = textField.getModel();
+ final T object = (T) model.getObject();
+ //model.setObject((T) (object != null? object.getObject(): null));
+ model.setObject(object);
+
+ textField.setEnabled(false);
+ setTextFieldSizeIfSpecified(textField);
+
+ addOrReplace(textField);
+ return textField;
+ }
+
+}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java Fri Sep 14 09:10:41 2012
@@ -42,7 +42,7 @@ public abstract class ScalarPanelTextFie
protected final String idTextField;
public ScalarPanelTextFieldParseableAbstract(final String id, final String idTextField, final ScalarModel scalarModel) {
- super(id, scalarModel);
+ super(id, scalarModel, String.class);
this.idTextField = idTextField;
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java Fri Sep 14 09:10:41 2012
@@ -44,7 +44,7 @@ public class IsisDatePanel extends Scala
private static final String DATE_PATTERN = "MM/dd/yyyy"; // TODO: i18n, see for example http://apache-wicket.1842946.n4.nabble.com/DatePicker-format-td1847739.html
public IsisDatePanel(final String id, final ScalarModel scalarModel) {
- super(id, scalarModel);
+ super(id, scalarModel, java.util.Date.class);
}
@Override
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html Fri Sep 14 09:10:41 2012
@@ -33,7 +33,7 @@
<span wicket:id="feedback"></span>
</span>
</label>
- <label wicket:id="scalarIfCompact"></label>
+ <input type="text" wicket:id="scalarIfCompact"></input>
</div>
</wicket:panel>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java Fri Sep 14 09:10:41 2012
@@ -21,33 +21,18 @@ package org.apache.isis.viewer.wicket.ui
import java.math.BigDecimal;
-import org.apache.wicket.markup.html.form.AbstractTextComponent;
-import org.apache.wicket.markup.html.form.TextField;
-
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldAbstract;
-import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
/**
* Panel for rendering scalars of type {@link BigDecimal}.
*/
-public class JavaMathBigDecimalPanel extends ScalarPanelTextFieldAbstract<BigDecimal> {
+public class JavaMathBigDecimalPanel extends ScalarPanelTextFieldNumeric<BigDecimal> {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_VALUE = "scalarValue";
public JavaMathBigDecimalPanel(final String id, final ScalarModel scalarModel) {
- super(id, scalarModel);
- }
-
- @Override
- protected void addSemantics() {
- super.addSemantics();
-
+ super(id, scalarModel, BigDecimal.class);
}
- @Override
- protected AbstractTextComponent<BigDecimal> createTextField() {
- return new TextField<BigDecimal>(ID_SCALAR_VALUE, new TextFieldValueModel<BigDecimal>(this), BigDecimal.class);
- }
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java Fri Sep 14 09:10:41 2012
@@ -28,13 +28,13 @@ import org.apache.wicket.util.convert.IC
import org.apache.wicket.util.convert.converters.AbstractIntegerConverter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel;
/**
* Panel for rendering scalars of type {@link BigInteger}.
*/
-public class JavaMathBigIntegerPanel extends ScalarPanelTextFieldAbstract<BigInteger> {
+public class JavaMathBigIntegerPanel extends ScalarPanelTextFieldNumeric<BigInteger> {
private static final long serialVersionUID = 1L;
private static final String ID_SCALAR_VALUE = "scalarValue";
@@ -52,12 +52,7 @@ public class JavaMathBigIntegerPanel ext
};
public JavaMathBigIntegerPanel(final String id, final ScalarModel scalarModel) {
- super(id, scalarModel);
- }
-
- @Override
- protected void addSemantics() {
- super.addSemantics();
+ super(id, scalarModel, BigInteger.class);
}
@Override
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html Fri Sep 14 09:10:41 2012
@@ -33,7 +33,7 @@
<span wicket:id="feedback"></span>
</span>
</label>
- <label wicket:id="scalarIfCompact"></label>
+ <input type="text" wicket:id="scalarIfCompact"></input>
</div>
</wicket:panel>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java Fri Sep 14 09:10:41 2012
@@ -20,23 +20,18 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
/**
* Panel for rendering scalars of type {@link Byte} or <tt>byte</tt>.
*/
-public class BytePanel extends ScalarPanelTextFieldParseableAbstract {
+public class BytePanel extends ScalarPanelTextFieldNumeric<Byte> {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_VALUE = "scalarValue";
public BytePanel(final String id, final ScalarModel scalarModel) {
- super(id, ID_SCALAR_VALUE, scalarModel);
+ super(id, scalarModel, Byte.class);
}
- @Override
- protected void addSemantics() {
- // don't call textField.setType(), since NO does the parsing, not wicket
- }
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html Fri Sep 14 09:10:41 2012
@@ -33,7 +33,7 @@
<span wicket:id="feedback"></span>
</span>
</label>
- <label wicket:id="scalarIfCompact"></label>
+ <input type="text" wicket:id="scalarIfCompact"></input>
</div>
</wicket:panel>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java Fri Sep 14 09:10:41 2012
@@ -20,23 +20,16 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
/**
* Panel for rendering scalars of type {@link Double} or <tt>double</tt>.
*/
-public class DoublePanel extends ScalarPanelTextFieldParseableAbstract {
+public class DoublePanel extends ScalarPanelTextFieldNumeric<Double> {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_VALUE = "scalarValue";
public DoublePanel(final String id, final ScalarModel scalarModel) {
- super(id, ID_SCALAR_VALUE, scalarModel);
+ super(id, scalarModel, Double.class);
}
-
- @Override
- protected void addSemantics() {
- super.addSemantics();
- }
-
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html Fri Sep 14 09:10:41 2012
@@ -33,7 +33,7 @@
<span wicket:id="feedback"></span>
</span>
</label>
- <label wicket:id="scalarIfCompact"></label>
+ <input type="text" wicket:id="scalarIfCompact"></input>
</div>
</wicket:panel>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java Fri Sep 14 09:10:41 2012
@@ -20,23 +20,17 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
/**
* Panel for rendering scalars of type {@link Float} or <tt>float</tt>.
*/
-public class FloatPanel extends ScalarPanelTextFieldParseableAbstract {
+public class FloatPanel extends ScalarPanelTextFieldNumeric<Float> {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_VALUE = "scalarValue";
public FloatPanel(final String id, final ScalarModel scalarModel) {
- super(id, ID_SCALAR_VALUE, scalarModel);
- }
-
- @Override
- protected void addSemantics() {
- super.addSemantics();
+ super(id, scalarModel, Float.class);
}
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html Fri Sep 14 09:10:41 2012
@@ -33,7 +33,7 @@
<span wicket:id="feedback"></span>
</span>
</label>
- <label wicket:id="scalarIfCompact"></label>
+ <input type="text" wicket:id="scalarIfCompact"></input>
</div>
</wicket:panel>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java Fri Sep 14 09:10:41 2012
@@ -20,23 +20,17 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
/**
* Panel for rendering scalars of type {@link Integer} or <tt>int</tt>.
*/
-public class IntegerPanel extends ScalarPanelTextFieldParseableAbstract {
+public class IntegerPanel extends ScalarPanelTextFieldNumeric<Integer> {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_VALUE = "scalarValue";
public IntegerPanel(final String id, final ScalarModel scalarModel) {
- super(id, ID_SCALAR_VALUE, scalarModel);
- }
-
- @Override
- protected void addSemantics() {
- super.addSemantics();
+ super(id, scalarModel, Integer.class);
}
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html Fri Sep 14 09:10:41 2012
@@ -33,7 +33,7 @@
<span wicket:id="feedback"></span>
</span>
</label>
- <label wicket:id="scalarIfCompact"></label>
+ <input type="text" wicket:id="scalarIfCompact"></input>
</div>
</wicket:panel>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java Fri Sep 14 09:10:41 2012
@@ -20,23 +20,17 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
/**
* Panel for rendering scalars of type {@link Long} or <tt>long</tt>.
*/
-public class LongPanel extends ScalarPanelTextFieldParseableAbstract {
+public class LongPanel extends ScalarPanelTextFieldNumeric<Long> {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_VALUE = "scalarValue";
public LongPanel(final String id, final ScalarModel scalarModel) {
- super(id, ID_SCALAR_VALUE, scalarModel);
- }
-
- @Override
- protected void addSemantics() {
- super.addSemantics();
+ super(id, scalarModel, Long.class);
}
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html Fri Sep 14 09:10:41 2012
@@ -33,7 +33,7 @@
<span wicket:id="feedback"></span>
</span>
</label>
- <label wicket:id="scalarIfCompact"></label>
+ <input type="text" wicket:id="scalarIfCompact"></input>
</div>
</wicket:panel>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java?rev=1384688&r1=1384687&r2=1384688&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java Fri Sep 14 09:10:41 2012
@@ -19,19 +19,23 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
+import org.apache.wicket.markup.html.form.AbstractTextComponent;
+import org.apache.wicket.markup.html.form.TextField;
+
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel;
/**
* Panel for rendering scalars of type {@link Short} or <tt>short</tt>.
*/
-public class ShortPanel extends ScalarPanelTextFieldParseableAbstract {
+public class ShortPanel extends ScalarPanelTextFieldAbstract<Short> {
private static final long serialVersionUID = 1L;
private static final String ID_SCALAR_VALUE = "scalarValue";
public ShortPanel(final String id, final ScalarModel scalarModel) {
- super(id, ID_SCALAR_VALUE, scalarModel);
+ super(id, scalarModel, Short.class);
}
@Override
@@ -39,4 +43,9 @@ public class ShortPanel extends ScalarPa
super.addSemantics();
}
+ @Override
+ protected AbstractTextComponent<Short> createTextField() {
+ return new TextField<Short>(ID_SCALAR_VALUE, new TextFieldValueModel<Short>(this), Short.class);
+ }
+
}