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/24 20:46:01 UTC
svn commit: r927165 - in /pivot/trunk: core/src/org/apache/pivot/util/
core/src/org/apache/pivot/util/concurrent/
core/test/org/apache/pivot/collections/test/
wtk/src/org/apache/pivot/wtk/skin/
Author: gbrown
Date: Wed Mar 24 19:46:01 2010
New Revision: 927165
URL: http://svn.apache.org/viewvc?rev=927165&view=rev
Log:
Fix bug in TaskGroup#abort(); minor code formatting cleanup.
Modified:
pivot/trunk/core/src/org/apache/pivot/util/Resources.java
pivot/trunk/core/src/org/apache/pivot/util/concurrent/Task.java
pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java
pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java
pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedStackTest.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
Modified: pivot/trunk/core/src/org/apache/pivot/util/Resources.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Resources.java?rev=927165&r1=927164&r2=927165&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Resources.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Resources.java Wed Mar 24 19:46:01 2010
@@ -168,8 +168,9 @@ public class Resources implements Dictio
@Override
public Object get(String key) {
Object o = JSON.get(resourceMap, key);
- if (o == null && parent != null) {
- return parent.get(key);
+ if (o == null
+ && parent != null) {
+ o = parent.get(key);
}
return o;
@@ -177,8 +178,9 @@ public class Resources implements Dictio
public String getString(String key) {
String s = JSON.getString(resourceMap, key);
- if (s == null && parent != null) {
- return parent.getString(key);
+ if (s == null
+ && parent != null) {
+ s = parent.getString(key);
}
return s;
@@ -225,94 +227,113 @@ public class Resources implements Dictio
public Number getNumber(String key) {
Number n = JSON.getNumber(resourceMap, key);
- if (n == null && parent != null) {
- return parent.getNumber(key);
+ if (n == null
+ && parent != null) {
+ n = parent.getNumber(key);
}
+
return n;
}
public Short getShort(String key) {
Short s = JSON.getShort(resourceMap, key);
- if (s == null && parent != null) {
- return parent.getShort(key);
+ if (s == null
+ && parent != null) {
+ s = parent.getShort(key);
}
+
return s;
}
public Integer getInteger(String key) {
Integer i = JSON.getInteger(resourceMap, key);
- if (i == null && parent != null) {
- return parent.getInteger(key);
+ if (i == null
+ && parent != null) {
+ i = parent.getInteger(key);
}
+
return i;
}
public Long getLong(String key) {
Long l = JSON.getLong(resourceMap, key);
- if (l == null && parent != null) {
- return parent.getLong(key);
+ if (l == null
+ && parent != null) {
+ l = parent.getLong(key);
}
+
return l;
}
public Float getFloat(String key) {
Float f = JSON.getFloat(resourceMap, key);
- if (f == null && parent != null) {
- return parent.getFloat(key);
+ if (f == null
+ && parent != null) {
+ f = parent.getFloat(key);
}
+
return f;
}
public Double getDouble(String key) {
Double d = JSON.getDouble(resourceMap, key);
- if (d == null && parent != null) {
- return parent.getDouble(key);
+ if (d == null
+ && parent != null) {
+ d = parent.getDouble(key);
}
+
return d;
}
public Boolean getBoolean(String key) {
Boolean b = JSON.getBoolean(resourceMap, key);
- if (b == null && parent != null) {
- return parent.getBoolean(key);
+ if (b == null
+ && parent != null) {
+ b = parent.getBoolean(key);
}
+
return b;
}
public List<?> getList(String key) {
List<?> list = JSON.getList(resourceMap, key);
- if (list == null && parent != null) {
- return parent.getList(key);
+ if (list == null
+ && parent != null) {
+ list = parent.getList(key);
}
+
return list;
}
public Map<String, ?> getMap(String key) {
Map<String, ?> map = JSON.getMap(resourceMap, key);
- if (map == null && parent != null) {
- return parent.getMap(key);
+ if (map == null
+ && parent != null) {
+ map = parent.getMap(key);
}
+
return map;
}
@Override
public Object put(String key, Object value) {
- throw new UnsupportedOperationException(
- "Resources instances are immutable");
+ throw new UnsupportedOperationException("Resources are immutable.");
}
@Override
public Object remove(String key) {
- throw new UnsupportedOperationException(
- "Resources instances are immutable");
+ throw new UnsupportedOperationException("Resources are immutable.");
}
@Override
public boolean containsKey(String key) {
boolean containsKey = resourceMap.containsKey(key);
- if (!containsKey && parent != null) {
+
+ if (!containsKey
+ && parent != null) {
return parent.containsKey(key);
}
+
return containsKey;
}
@@ -323,7 +344,7 @@ public class Resources implements Dictio
@SuppressWarnings( { "unchecked" })
private void applyOverrides(Map<String, Object> sourceMap,
- Map<String, Object> overridesMap) {
+ Map<String, Object> overridesMap) {
for (String key : overridesMap) {
if (sourceMap.containsKey(key)) {
@@ -331,31 +352,31 @@ public class Resources implements Dictio
Object override = overridesMap.get(key);
if (source instanceof Map<?, ?>
- && override instanceof Map<?, ?>) {
+ && override instanceof Map<?, ?>) {
applyOverrides((Map<String, Object>) source,
- (Map<String, Object>) override);
+ (Map<String, Object>) override);
} else {
sourceMap.put(key, overridesMap.get(key));
}
}
}
-
}
@SuppressWarnings("unchecked")
private Map<String, Object> readJSONResource(String name)
- throws IOException, SerializationException {
- InputStream in = getClass().getClassLoader().getResourceAsStream(name);
- if (in == null) {
- return null;
- }
-
- JSONSerializer serializer = new JSONSerializer(charset);
+ throws IOException, SerializationException {
Map<String, Object> resourceMap = null;
- try {
- resourceMap = (Map<String, Object>) serializer.readObject(in);
- } finally {
- in.close();
+
+ InputStream inputStream = ThreadUtilities.getClassLoader().getResourceAsStream(name);
+
+ if (inputStream != null) {
+ JSONSerializer serializer = new JSONSerializer(charset);
+
+ try {
+ resourceMap = (Map<String, Object>)serializer.readObject(inputStream);
+ } finally {
+ inputStream.close();
+ }
}
return resourceMap;
Modified: pivot/trunk/core/src/org/apache/pivot/util/concurrent/Task.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/concurrent/Task.java?rev=927165&r1=927164&r2=927165&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/concurrent/Task.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/concurrent/Task.java Wed Mar 24 19:46:01 2010
@@ -42,7 +42,7 @@ public abstract class Task<V> {
}
TaskListener<V> taskListener;
- synchronized(Task.this) {
+ synchronized (Task.this) {
Task.this.result = result;
Task.this.fault = fault;
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=927165&r1=927164&r2=927165&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 Wed Mar 24 19:46:01 2010
@@ -47,7 +47,7 @@ public class TaskGroup extends Task<Void
TaskListener<Object> taskListener = new TaskListener<Object>() {
@Override
public void taskExecuted(Task<Object> task) {
- synchronized(TaskGroup.this) {
+ synchronized (TaskGroup.this) {
complete++;
TaskGroup.this.notify();
}
@@ -55,7 +55,7 @@ public class TaskGroup extends Task<Void
@Override
public void executeFailed(Task<Object> task) {
- synchronized(TaskGroup.this) {
+ synchronized (TaskGroup.this) {
complete++;
TaskGroup.this.notify();
}
@@ -84,8 +84,8 @@ public class TaskGroup extends Task<Void
@Override
public synchronized void abort() {
for (Task<?> task : this) {
- synchronized(task) {
- if (!task.isPending()) {
+ synchronized (task) {
+ if (task.isPending()) {
task.abort();
}
}
Modified: pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java?rev=927165&r1=927164&r2=927165&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java Wed Mar 24 19:46:01 2010
@@ -78,7 +78,7 @@ public class SynchronizedQueueTest {
i++;
}
- synchronized(testTask) {
+ synchronized (testTask) {
if (testTask.isPending()) {
try {
testTask.wait(10000);
Modified: pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedStackTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedStackTest.java?rev=927165&r1=927164&r2=927165&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedStackTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedStackTest.java Wed Mar 24 19:46:01 2010
@@ -78,7 +78,7 @@ public class SynchronizedStackTest {
i++;
}
- synchronized(testTask) {
+ synchronized (testTask) {
if (testTask.isPending()) {
try {
testTask.wait(10000);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=927165&r1=927164&r2=927165&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Wed Mar 24 19:46:01 2010
@@ -107,17 +107,17 @@ public class LabelSkin extends Component
Label label = (Label)getComponent();
String text = label.getText();
- LineMetrics lm = font.getLineMetrics("", FONT_RENDER_CONTEXT);
- float lineHeight = lm.getHeight();
+ float preferredHeight;
+ if (text != null) {
+ LineMetrics lm = font.getLineMetrics("", FONT_RENDER_CONTEXT);
+ float lineHeight = lm.getHeight();
- float preferredHeight = lineHeight;
+ preferredHeight = lineHeight;
- if (text != null
- && wrapText
- && width != -1) {
int n = text.length();
-
- if (n > 0) {
+ if (n > 0
+ && wrapText
+ && width != -1) {
// Adjust width for padding
width -= (padding.left + padding.right);
@@ -148,6 +148,8 @@ public class LabelSkin extends Component
i++;
}
}
+ } else {
+ preferredHeight = 0;
}
preferredHeight += (padding.top + padding.bottom);