You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/02/26 00:30:22 UTC
svn commit: r916488 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/text/validation/
Author: gbrown
Date: Thu Feb 25 23:30:21 2010
New Revision: 916488
URL: http://svn.apache.org/viewvc?rev=916488&view=rev
Log:
Various fixes.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/DoubleRangeValidator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/FloatRangeValidator.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=916488&r1=916487&r2=916488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Thu Feb 25 23:30:21 2010
@@ -412,7 +412,6 @@
int maximumLabelWidth = 0;
int maximumFieldWidth = 0;
- int maximumFlagMessageWidth = 0;
int maximumSeparatorWidth = 0;
Form form = (Form)getComponent();
@@ -436,7 +435,8 @@
if (field.isVisible()) {
Label label = labels.get(sectionIndex).get(fieldIndex);
maximumLabelWidth = Math.max(maximumLabelWidth, label.getPreferredWidth());
- maximumFieldWidth = Math.max(maximumFieldWidth, field.getPreferredWidth());
+
+ int fieldWidth = field.getPreferredWidth();
if (showFlagMessagesInline) {
// Calculate maximum flag message width
@@ -447,11 +447,13 @@
if (message != null) {
flagMessageLabel.setText(message);
- maximumFlagMessageWidth = Math.max(maximumFlagMessageWidth,
- flagMessageLabel.getPreferredWidth());
+ fieldWidth += (INLINE_FIELD_INDICATOR_WIDTH - 2)
+ + flagMessageLabel.getPreferredWidth();
}
}
}
+
+ maximumFieldWidth = Math.max(maximumFieldWidth, fieldWidth);
}
}
}
@@ -462,10 +464,6 @@
preferredWidth += maximumFlagImageWidth + flagIconOffset;
}
- if (showFlagMessagesInline) {
- preferredWidth += maximumFlagMessageWidth + (INLINE_FIELD_INDICATOR_WIDTH - 2);
- }
-
preferredWidth = Math.max(preferredWidth + padding.left + padding.right,
maximumSeparatorWidth);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java?rev=916488&r1=916487&r2=916488&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java Thu Feb 25 23:30:21 2010
@@ -353,16 +353,22 @@
&& JSONSerializer.containsKey(context, selectedDateKey)) {
Object value = JSONSerializer.get(context, selectedDateKey);
+ CalendarDate selectedDate = null;
+
if (value instanceof CalendarDate) {
- setSelectedDate((CalendarDate)value);
- } else if (bindMapping != null) {
- setSelectedDate(bindMapping.toDate(value));
- } else if (value instanceof String) {
- setSelectedDate((String)value);
+ selectedDate = (CalendarDate)value;
+ } else if (bindMapping == null) {
+ if (value instanceof String) {
+ selectedDate = CalendarDate.decode((String)value);
+ } else if (value != null) {
+ throw new IllegalArgumentException("Invalid date type: " +
+ value.getClass().getName());
+ }
} else {
- throw new IllegalArgumentException("Invalid date type: " +
- value.getClass().getName());
+ selectedDate = bindMapping.toDate(value);
}
+
+ setSelectedDate(selectedDate);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java?rev=916488&r1=916487&r2=916488&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java Thu Feb 25 23:30:21 2010
@@ -299,16 +299,22 @@
&& JSONSerializer.containsKey(context, selectedDateKey)) {
Object value = JSONSerializer.get(context, selectedDateKey);
+ CalendarDate selectedDate = null;
+
if (value instanceof CalendarDate) {
- setSelectedDate((CalendarDate)value);
- } else if (bindMapping != null) {
- setSelectedDate(bindMapping.toDate(value));
- } else if (value instanceof String) {
- setSelectedDate((String)value);
+ selectedDate = (CalendarDate)value;
+ } else if (bindMapping == null) {
+ if (value instanceof String) {
+ selectedDate = CalendarDate.decode((String)value);
+ } else if (value != null) {
+ throw new IllegalArgumentException("Invalid date type: " +
+ value.getClass().getName());
+ }
} else {
- throw new IllegalArgumentException("Invalid date type: " +
- value.getClass().getName());
+ selectedDate = bindMapping.toDate(value);
}
+
+ setSelectedDate(selectedDate);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/DoubleRangeValidator.java?rev=916488&r1=916487&r2=916488&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/DoubleRangeValidator.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/DoubleRangeValidator.java Thu Feb 25 23:30:21 2010
@@ -22,13 +22,13 @@
private double minValue, maxValue;
public DoubleRangeValidator() {
- this.minValue = Double.MIN_VALUE;
+ this.minValue = -Double.MIN_VALUE;
this.maxValue = Double.MAX_VALUE;
}
public DoubleRangeValidator(Locale locale) {
super(locale);
- this.minValue = Double.MIN_VALUE;
+ this.minValue = -Double.MAX_VALUE;
this.maxValue = Double.MAX_VALUE;
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/FloatRangeValidator.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/FloatRangeValidator.java?rev=916488&r1=916487&r2=916488&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/FloatRangeValidator.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/text/validation/FloatRangeValidator.java Thu Feb 25 23:30:21 2010
@@ -22,13 +22,13 @@
private float minValue, maxValue;
public FloatRangeValidator() {
- this.minValue = Float.MIN_VALUE;
+ this.minValue = -Float.MAX_VALUE;
this.maxValue = Float.MAX_VALUE;
}
public FloatRangeValidator(Locale locale) {
super(locale);
- this.minValue = Float.MIN_VALUE;
+ this.minValue = -Float.MAX_VALUE;
this.maxValue = Float.MAX_VALUE;
}