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/03/17 20:45:44 UTC
svn commit: r924449 - in /pivot/trunk:
core/src/org/apache/pivot/serialization/CSVSerializer.java
core/src/org/apache/pivot/serialization/JSONSerializer.java
wtk/src/org/apache/pivot/wtk/Form.java
wtk/src/org/apache/pivot/wtk/Spinner.java
Author: gbrown
Date: Wed Mar 17 19:45:43 2010
New Revision: 924449
URL: http://svn.apache.org/viewvc?rev=924449&view=rev
Log:
Various minor fixes.
Modified:
pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java
pivot/trunk/core/src/org/apache/pivot/serialization/JSONSerializer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java?rev=924449&r1=924448&r2=924449&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java Wed Mar 17 19:45:43 2010
@@ -268,14 +268,10 @@ public class CSVSerializer implements Se
item = readItem(lineNumberReader);
}
}
- } catch (IOException exception) {
- logException(exception);
- throw exception;
} catch (SerializationException exception) {
- logException(exception);
- throw exception;
- } catch (RuntimeException exception) {
- logException(exception);
+ System.err.println("An error occurred while processing input at line number "
+ + (lineNumberReader.getLineNumber() + 1));
+
throw exception;
}
@@ -284,11 +280,6 @@ public class CSVSerializer implements Se
return items;
}
- private void logException(Exception exception) {
- System.err.println("An error occurred while processing input at line number "
- + (lineNumberReader.getLineNumber() + 1));
- }
-
/**
* Reads values from a comma-separated value stream.
*
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/JSONSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/JSONSerializer.java?rev=924449&r1=924448&r2=924449&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/JSONSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/JSONSerializer.java Wed Mar 17 19:45:43 2010
@@ -188,14 +188,10 @@ public class JSONSerializer extends JSON
try {
object = readValue(lineNumberReader);
- } catch (IOException exception) {
- logException(exception);
- throw exception;
} catch (SerializationException exception) {
- logException(exception);
- throw exception;
- } catch (RuntimeException exception) {
- logException(exception);
+ System.err.println("An error occurred while processing input at line number "
+ + (lineNumberReader.getLineNumber() + 1));
+
throw exception;
}
@@ -204,11 +200,6 @@ public class JSONSerializer extends JSON
return object;
}
- private void logException(Exception exception) {
- System.err.println("An error occurred while processing input at line number "
- + (lineNumberReader.getLineNumber() + 1));
- }
-
private Object readValue(Reader reader)
throws IOException, SerializationException {
Object object = null;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java?rev=924449&r1=924448&r2=924449&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java Wed Mar 17 19:45:43 2010
@@ -26,7 +26,6 @@ import org.apache.pivot.serialization.Se
import org.apache.pivot.util.ImmutableIterator;
import org.apache.pivot.util.ListenerList;
-
/**
* A container that arranges field components in a form layout. Each field has
* an optional text label associated with it and may be flagged as requiring
@@ -441,6 +440,34 @@ public class Form extends Container {
return count;
}
+ /**
+ * Ensures that the first field with the given flag type is visible.
+ *
+ * @param messageType
+ * The message type, or <tt>null</tt> to scroll the first flag of any
+ * type to visible.
+ */
+ public void scrollFirstFlagToVisible(MessageType messageType) {
+ Flag flag = null;
+
+ for (Section section : sections) {
+ for (Component field : section) {
+ flag = getFlag(field);
+
+ if (flag != null
+ && (messageType == null
+ || flag.getMessageType() == messageType)) {
+ field.scrollAreaToVisible(0, 0, field.getWidth(), field.getHeight());
+ break;
+ }
+ }
+
+ if (flag != null) {
+ break;
+ }
+ }
+ }
+
@Override
public Sequence<Component> remove(int index, int count) {
for (int i = index, n = index + count; i < n; i++) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java?rev=924449&r1=924448&r2=924449&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java Wed Mar 17 19:45:43 2010
@@ -200,7 +200,7 @@ public class Spinner extends Container {
}
}
- private class SpinnerBindingListenerList extends ListenerList<SpinnerBindingListener>
+ private static class SpinnerBindingListenerList extends ListenerList<SpinnerBindingListener>
implements SpinnerBindingListener {
@Override
public void spinnerDataKeyChanged(Spinner spinner, String previousSpinnerDataKey) {