svn commit: r1185022 - in /commons/proper/ognl/trunk/src: main/java/org/apache/commons/ognl/DynamicSubscript.java test/java/org/apache/commons/ognl/test/objects/Root.java

[grobmeier]

Author: grobmeier
Date: Mon Oct 17 06:38:21 2011
New Revision: 1185022

URL: http://svn.apache.org/viewvc?rev=1185022&view=rev
Log:
reverted OGNL-11 renaming is at conflicts with generated code

Modified:
    
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DynamicSubscript.java
    
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java

Modified: 
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DynamicSubscript.java
URL: 
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DynamicSubscript.java?rev=1185022&r1=1185021&r2=1185022&view=diff
==============================================================================
--- 
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DynamicSubscript.java
 (original)
+++ 
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DynamicSubscript.java
 Mon Oct 17 06:38:21 2011
@@ -37,13 +37,13 @@ public class DynamicSubscript
 
     public static final int ALL = 3;
 
-    public static final DynamicSubscript DS_FIRST = new DynamicSubscript( 
FIRST );
+    public static final DynamicSubscript first = new DynamicSubscript( FIRST );
 
-    public static final DynamicSubscript DS_MID = new DynamicSubscript( MID );
+    public static final DynamicSubscript mid = new DynamicSubscript( MID );
 
-    public static final DynamicSubscript DS_LAST = new DynamicSubscript( LAST 
);
+    public static final DynamicSubscript last = new DynamicSubscript( LAST );
 
-    public static final DynamicSubscript DS_ALL = new DynamicSubscript( ALL );
+    public static final DynamicSubscript all = new DynamicSubscript( ALL );
 
     private int flag;
 

Modified: 
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java
URL: 
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java?rev=1185022&r1=1185021&r2=1185022&view=diff
==============================================================================
--- 
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java
 (original)
+++ 
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java
 Mon Oct 17 06:38:21 2011
@@ -127,7 +127,7 @@ public class Root
         map.put( "array", array );
         map.put( "list", list );
         map.put( "size", new Integer( 5000 ) );
-        map.put( DynamicSubscript.DS_FIRST, new Integer( 99 ) );
+        map.put( DynamicSubscript.first, new Integer( 99 ) );
         map.put( "baz", array );
         map.put( "value", new Bean2() );
         map.put( "bar", new Bean3() );