Author: nbubna
Date: Wed Aug 8 15:16:35 2007
New Revision: 564032
URL: http://svn.apache.org/viewvc?view=rev&rev=564032
Log:
use entrySet() to iterate over maps much more efficiently (FindBugs)
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java?view=diff&rev=564032&r1=564031&r2=564032
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
Wed Aug 8 15:16:35 2007
@@ -129,11 +129,11 @@
// only add those new properties for which we
// do not already have a value. first prop set wins.
Map<String,Object> properties = getProps();
- for (String key : parentProps.keySet())
+ for (Map.Entry<String,Object> prop : parentProps.entrySet())
{
- if (!properties.containsKey(key))
+ if (!properties.containsKey(prop.getKey()))
{
- properties.put(key, parentProps.get(key));
+ properties.put(prop.getKey(), prop.getValue());
}
}
}
@@ -246,9 +246,9 @@
{
//TODO: make this step optional?
// look for specific setters
- for (String name : configuration.keySet())
+ for (Map.Entry<String,Object> conf : configuration.entrySet())
{
- setProperty(tool, name, configuration.get(name));
+ setProperty(tool, conf.getKey(), conf.getValue());
}
if (hasConfigure())
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java?view=diff&rev=564032&r1=564031&r2=564032
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java
Wed Aug 8 15:16:35 2007
@@ -119,9 +119,9 @@
context = new ToolContext(this.engine);
if (toolProps != null && !toolProps.isEmpty())
{
- for (String key : toolProps.keySet())
+ for (Map.Entry<String,Object> prop : toolProps.entrySet())
{
- context.putToolProperty(key, toolProps.get(key));
+ context.putToolProperty(prop.getKey(), prop.getValue());
}
}
}
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java?view=diff&rev=564032&r1=564031&r2=564032
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java
Wed Aug 8 15:16:35 2007
@@ -125,9 +125,9 @@
}
Map<String,Object> simples = config.getSimpleProperties();
- for (String name : simples.keySet())
+ for (Map.Entry<String,Object> prop : simples.entrySet())
{
- setProperty(name, simples.get(name));
+ setProperty(prop.getKey(), prop.getValue());
}
}
@@ -147,11 +147,11 @@
out.append("with ");
out.append(props.size());
out.append(" properties [");
- for (String name : props.keySet())
+ for (Map.Entry<String,Object> prop : props.entrySet())
{
- out.append(name);
+ out.append(prop.getKey());
out.append(" => ");
- out.append(props.get(name));
+ out.append(prop.getValue());
out.append("; ");
}
out.append("]");
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java?view=diff&rev=564032&r1=564031&r2=564032
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
Wed Aug 8 15:16:35 2007
@@ -528,13 +528,12 @@
results.append("\", ");
results.append("new Function (\"varName\", \"");
- Map vars = field.getVars();
+ Map<String,Var> vars = (Map<String,Var>)field.getVars();
// Loop through the field's variables.
- Iterator varsIterator = vars.keySet().iterator();
- while (varsIterator.hasNext())
+ for (Map.Entry<String,Var> entry : vars.entrySet())
{
- String varName = (String)varsIterator.next(); // TODO:
escape?
- Var var = (Var)vars.get(varName);
+ String varName = entry.getKey(); // TODO: escape?
+ Var var = entry.getValue();
String varValue =
Resources.getVarValue(var, app, request, false);
String jsType = var.getJsType();
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java?view=diff&rev=564032&r1=564031&r2=564032
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java
Wed Aug 8 15:16:35 2007
@@ -259,7 +259,7 @@
* @param newQueryData the query parameters to add
* @since VelocityTools 1.3
*/
- protected LinkTool copyWith(Map newQueryData)
+ protected LinkTool copyWith(Map<Object,Object> newQueryData)
{
LinkTool copy = duplicate();
if (copy.queryData != null)
@@ -272,10 +272,10 @@
{
copy.queryData = new ArrayList();
}
- for (Iterator i = newQueryData.keySet().iterator(); i.hasNext(); )
+ for (Map.Entry<Object,Object> entry : newQueryData.entrySet())
{
- Object key = i.next();
- Object value = newQueryData.get(key);
+ Object key = entry.getKey();
+ Object value = entry.getValue();
copy.queryData.add(new QueryPair(String.valueOf(key), value));
}
return copy;
