svn commit: r783159 - in /incubator/pivot/trunk: core/src/pivot/util/Resources.java core/test/pivot/util/test/ResourcesTest.java wtk/src/pivot/wtk/DesktopApplicationContext.java

[gb...@apache.org]

Author: gbrown
Date: Tue Jun  9 22:24:28 2009
New Revision: 783159

URL: http://svn.apache.org/viewvc?rev=783159&view=rev
Log:
Add some utility methods to pivot.util.Resources; fix minor issue in DesktopApplicationContext.

Modified:
    incubator/pivot/trunk/core/src/pivot/util/Resources.java
    incubator/pivot/trunk/core/test/pivot/util/test/ResourcesTest.java
    incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java

Modified: incubator/pivot/trunk/core/src/pivot/util/Resources.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/pivot/util/Resources.java?rev=783159&r1=783158&r2=783159&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/pivot/util/Resources.java (original)
+++ incubator/pivot/trunk/core/src/pivot/util/Resources.java Tue Jun  9 22:24:28 2009
@@ -24,6 +24,7 @@
 import java.util.MissingResourceException;
 
 import pivot.collections.Dictionary;
+import pivot.collections.List;
 import pivot.collections.Map;
 import pivot.serialization.JSONSerializer;
 import pivot.serialization.SerializationException;
@@ -49,6 +50,16 @@
 
     private Map<String, Object> resourceMap = null;
 
+    public Resources(Object baseObject)
+        throws IOException, SerializationException {
+        this(baseObject.getClass());
+    }
+
+    public Resources(Class<?> baseObjectClass)
+        throws IOException, SerializationException {
+        this(baseObjectClass.getName());
+    }
+
     public Resources(String baseName)
         throws IOException, SerializationException {
         this(baseName, Locale.getDefault(), Charset.defaultCharset());
@@ -146,6 +157,46 @@
         return JSONSerializer.get(resourceMap, key);
     }
 
+    public String getString(String key) {
+        return JSONSerializer.getString(resourceMap, key);
+    }
+
+    public Number getNumber(String key) {
+        return JSONSerializer.getNumber(resourceMap, key);
+    }
+
+    public Short getShort(String key) {
+        return JSONSerializer.getShort(resourceMap, key);
+    }
+
+    public Integer getInteger(String key) {
+        return JSONSerializer.getInteger(resourceMap, key);
+    }
+
+    public Long getLong(String key) {
+        return JSONSerializer.getLong(resourceMap, key);
+    }
+
+    public Float getFloat(String key) {
+        return JSONSerializer.getFloat(resourceMap, key);
+    }
+
+    public Double getDouble(String key) {
+        return JSONSerializer.getDouble(resourceMap, key);
+    }
+
+    public Boolean getBoolean(String key) {
+        return JSONSerializer.getBoolean(resourceMap, key);
+    }
+
+    public List<?> getList(String key) {
+        return JSONSerializer.getList(resourceMap, key);
+    }
+
+    public Map<String, ?> getMap(String key) {
+        return JSONSerializer.getMap(resourceMap, key);
+    }
+
     public Object put(String key, Object value) {
         throw new UnsupportedOperationException("Resources instances are immutable");
     }

Modified: incubator/pivot/trunk/core/test/pivot/util/test/ResourcesTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/test/pivot/util/test/ResourcesTest.java?rev=783159&r1=783158&r2=783159&view=diff
==============================================================================
--- incubator/pivot/trunk/core/test/pivot/util/test/ResourcesTest.java (original)
+++ incubator/pivot/trunk/core/test/pivot/util/test/ResourcesTest.java Tue Jun  9 22:24:28 2009
@@ -112,7 +112,7 @@
 
     @Test(expected=NullPointerException.class)
     public void testNullBaseName() throws Exception {
-        new Resources(null);
+        new Resources((String)null);
     }
 
     @SuppressWarnings("unchecked")

Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java?rev=783159&r1=783158&r2=783159&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java Tue Jun  9 22:24:28 2009
@@ -314,7 +314,8 @@
         fullScreenHostFrame.setUndecorated(true);
 
         // Hook into OS X application menu
-        if (System.getProperty("mrj.version") != null) {
+        String osName = System.getProperty("os.name").toLowerCase();
+        if (osName.toLowerCase().startsWith("mac os x")) {
             try {
                 // Get the EAWT classes and methods
                 Class<?> eawtApplicationClass = Class.forName("com.apple.eawt.Application");