Author: rwhitcomb Date: Fri Oct 5 22:49:05 2012 New Revision: 1394852 URL: http://svn.apache.org/viewvc?rev=1394852&view=rev Log: Reverting inappropriate merge changes.
Modified: pivot/branches/2.0.x/ (props changed) pivot/branches/2.0.x/build.properties pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSON.java Propchange: pivot/branches/2.0.x/ ------------------------------------------------------------------------------ Reverse-merged /pivot/trunk:r1394847 Modified: pivot/branches/2.0.x/build.properties URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/build.properties?rev=1394852&r1=1394851&r2=1394852&view=diff ============================================================================== --- pivot/branches/2.0.x/build.properties (original) +++ pivot/branches/2.0.x/build.properties Fri Oct 5 22:49:05 2012 @@ -27,7 +27,7 @@ compiler.source=1.6 compiler.target=1.6 compiler.encoding=UTF-8 compiler.indexJars=true -compiler.arg=-Xlint -bootclasspath c:/jdk1.6.0_16/jre/lib/rt.jar +compiler.arg=-Xlint # Test properties test.verbose=false Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSON.java URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSON.java?rev=1394852&r1=1394851&r2=1394852&view=diff ============================================================================== --- pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSON.java (original) +++ pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSON.java Fri Oct 5 22:49:05 2012 @@ -73,8 +73,7 @@ public class JSON { String key = keys.get(i); - Map<String, T> adapter = (Map<String, T>) (value instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) value) : - (value instanceof org.apache.pivot.collections.Map ? ((org.apache.pivot.collections.Map<String, T>) value): new BeanAdapter(value))); + Map<String, T> adapter = (Map<String, T>) (value instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) value) : new BeanAdapter(value)); if (adapter.containsKey(key)) { value = adapter.get(key); } else if (value instanceof Sequence<?>) { @@ -148,8 +147,7 @@ public class JSON { throw new IllegalArgumentException("Invalid path."); } - Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) parent) : - (parent instanceof org.apache.pivot.collections.Map ? ((org.apache.pivot.collections.Map<String, T>) parent): new BeanAdapter(parent))); + Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) parent) : new BeanAdapter(parent)); Object previousValue; if (adapter.containsKey(key)) { @@ -234,8 +232,7 @@ public class JSON { if (parent == null) { containsKey = false; } else { - Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) parent) : - (parent instanceof org.apache.pivot.collections.Map ? ((org.apache.pivot.collections.Map<String, T>) parent): new BeanAdapter(parent))); + Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) parent) : new BeanAdapter(parent)); containsKey = adapter.containsKey(key); if (!containsKey) {