You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2016/07/13 21:56:05 UTC
svn commit: r1752547 - in
/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example:
DBContext.java TreeMapContext.java
Author: cbrisson
Date: Wed Jul 13 21:56:05 2016
New Revision: 1752547
URL: http://svn.apache.org/viewvc?rev=1752547&view=rev
Log:
fix velocity-engine-examples for commit 1752378
Modified:
velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java
velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java
Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java?rev=1752547&r1=1752546&r2=1752547&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java (original)
+++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java Wed Jul 13 21:56:05 2016
@@ -142,7 +142,7 @@ public class DBContext extends AbstractC
* operation, so not bothering. As we say above :
* "very fragile, crappy code..."
*/
- public boolean internalContainsKey(Object key)
+ public boolean internalContainsKey(String key)
{
return false;
}
@@ -152,7 +152,7 @@ public class DBContext extends AbstractC
* operation, so not bothering. As we say above :
* "very fragile, crappy code..."
*/
- public Object[] internalGetKeys()
+ public String[] internalGetKeys()
{
return null;
}
@@ -162,7 +162,7 @@ public class DBContext extends AbstractC
* operation, so not bothering. As we say above :
* "very fragile, crappy code..."
*/
- public Object internalRemove(Object key)
+ public Object internalRemove(String key)
{
return null;
}
Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java?rev=1752547&r1=1752546&r2=1752547&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java (original)
+++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java Wed Jul 13 21:56:05 2016
@@ -18,6 +18,7 @@ package org.apache.velocity.example;
* under the License.
*/
+import java.util.Set;
import java.util.TreeMap;
import org.apache.velocity.context.AbstractContext;
@@ -58,17 +59,18 @@ public class TreeMapContext extends Abst
return context.put( key, value );
}
- public boolean internalContainsKey(Object key)
+ public boolean internalContainsKey(String key)
{
return context.containsKey( key );
}
- public Object[] internalGetKeys()
+ public String[] internalGetKeys()
{
- return context.keySet().toArray();
+ Set<String> keys = context.keySet();
+ return keys.toArray(new String[keys.size()]);
}
- public Object internalRemove(Object key)
+ public Object internalRemove(String key)
{
return context.remove( key );
}