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/06 21:09:00 UTC
svn commit: r919838 - in /pivot/trunk:
core/src/org/apache/pivot/util/concurrent/TaskGroup.java
wtk/src/org/apache/pivot/wtk/Button.java
wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
wtk/src/org/apache/pivot/wtk/media/Image.java
Author: gbrown
Date: Sat Mar 6 20:09:00 2010
New Revision: 919838
URL: http://svn.apache.org/viewvc?rev=919838&view=rev
Log:
Various minor updates and fixes.
Modified:
pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java
Modified: pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java?rev=919838&r1=919837&r2=919838&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java Sat Mar 6 20:09:00 2010
@@ -127,6 +127,10 @@
return tasks.contains(element);
}
+ public int getCount() {
+ return tasks.getCount();
+ }
+
@Override
public Iterator<Task<?>> iterator() {
return new ImmutableIterator<Task<?>>(tasks.iterator());
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java?rev=919838&r1=919837&r2=919838&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java Sat Mar 6 20:09:00 2010
@@ -76,14 +76,14 @@
*
* @param value
*/
- public Boolean isSelected(Object value);
+ public boolean isSelected(Object value);
/**
* Converts a selection state to a context value.
*
* @param selected
*/
- public Object valueOf(Boolean selected);
+ public Object valueOf(boolean selected);
}
/**
@@ -680,14 +680,14 @@
if (stateKey != null
&& stateBindType != BindType.LOAD) {
JSONSerializer.put(context, selectedKey, (stateBindMapping == null) ?
- isSelected() : stateBindMapping.valueOf(state));
+ state : stateBindMapping.valueOf(state));
}
} else {
// Bind using selected key
if (selectedKey != null
&& selectedBindType != BindType.LOAD) {
- JSONSerializer.put(context, stateKey, (stateBindMapping == null) ?
- state : stateBindMapping.valueOf(state));
+ JSONSerializer.put(context, selectedKey, (selectedBindMapping == null) ?
+ isSelected() : selectedBindMapping.valueOf(isSelected()));
}
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java?rev=919838&r1=919837&r2=919838&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java Sat Mar 6 20:09:00 2010
@@ -101,6 +101,10 @@
}
public void setMode(Mode mode) {
+ if (mode == null) {
+ throw new IllegalArgumentException();
+ }
+
Mode previousMode = this.mode;
if (previousMode != mode) {
@@ -109,6 +113,14 @@
}
}
+ public final void setMode(String mode) {
+ if (mode == null) {
+ throw new IllegalArgumentException();
+ }
+
+ setMode(Mode.valueOf(mode.toUpperCase()));
+ }
+
public File getRootDirectory() {
return rootDirectory;
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java?rev=919838&r1=919837&r2=919838&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java Sat Mar 6 20:09:00 2010
@@ -68,17 +68,21 @@
* Task that executes an image load operation.
*/
public static class LoadTask extends IOTask<Image> {
- private URL url = null;
+ private URL location = null;
private static Dispatcher DEFAULT_DISPATCHER = new Dispatcher();
- public LoadTask(URL url) {
- this(url, DEFAULT_DISPATCHER);
+ public LoadTask(URL location) {
+ this(location, DEFAULT_DISPATCHER);
}
- public LoadTask(URL url, Dispatcher dispatcher) {
+ public LoadTask(URL location, Dispatcher dispatcher) {
super(dispatcher);
- this.url = url;
+ this.location = location;
+ }
+
+ public URL getLocation() {
+ return location;
}
@Override
@@ -92,9 +96,9 @@
// NOTE We don't open the stream until the callback
// executes because this is a potentially time-consuming
// operation
- inputStream = new MonitoredInputStream(new BufferedInputStream(url.openStream()));
+ inputStream = new MonitoredInputStream(new BufferedInputStream(location.openStream()));
- if (url.getFile().endsWith("wtkd")) {
+ if (location.getFile().endsWith("wtkd")) {
WTKXSerializer serializer = new WTKXSerializer();
image = (Drawing)serializer.readObject(inputStream);
} else {
@@ -132,13 +136,13 @@
return imageListeners;
}
- public static Image load(URL url) throws TaskExecutionException {
- LoadTask loadTask = new LoadTask(url);
+ public static Image load(URL location) throws TaskExecutionException {
+ LoadTask loadTask = new LoadTask(location);
return loadTask.execute();
}
- public static Image.LoadTask load(URL url, TaskListener<Image> loadListener) {
- LoadTask loadTask = new LoadTask(url);
+ public static Image.LoadTask load(URL location, TaskListener<Image> loadListener) {
+ LoadTask loadTask = new LoadTask(location);
loadTask.execute(loadListener);
return loadTask;
}