Repository: tapestry-5 Updated Branches: refs/heads/master 47e20f4c7 -> 450b36abb
replace some inefficient map iterations Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/450b36ab Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/450b36ab Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/450b36ab Branch: refs/heads/master Commit: 450b36abb2278b01bc7562ffe83c72ac2eb1106a Parents: 47e20f4 Author: Jochen Kemnade <[email protected]> Authored: Fri May 22 14:11:15 2015 +0200 Committer: Jochen Kemnade <[email protected]> Committed: Fri May 22 14:11:15 2015 +0200 ---------------------------------------------------------------------- .../internal/services/ComponentClassResolverImpl.java | 12 +++++++----- .../ioc/internal/services/SystemEnvSymbolProvider.java | 4 ++-- .../java/org/apache/tapestry5/ioc/util/IdAllocator.java | 7 +++---- 3 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/450b36ab/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java index 7f8c666..e4c7a3a 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java @@ -414,11 +414,11 @@ public class ComponentClassResolverImpl implements ComponentClassResolver, Inval Data newData = new Data(); - for (String prefix : libraryNameToPackageNames.keySet()) + for (Map.Entry<String, List<String>> entry : libraryNameToPackageNames.entrySet()) { - List<String> packages = libraryNameToPackageNames.get(prefix); + List<String> packages = entry.getValue(); - String folder = prefix + "/"; + String folder = entry.getKey() + "/"; for (String packageName : packages) { @@ -693,9 +693,11 @@ public class ComponentClassResolverImpl implements ComponentClassResolver, Inval { Map<String, String> result = CollectionFactory.newCaseInsensitiveMap(); - for (String folder : libraryNameToPackageNames.keySet()) + for (Map.Entry<String, List<String>> entry : libraryNameToPackageNames.entrySet()) { - List<String> packageNames = libraryNameToPackageNames.get(folder); + String folder = entry.getKey(); + + List<String> packageNames = entry.getValue(); String packageName = findCommonPackageNameForFolder(folder, packageNames); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/450b36ab/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java index f2c7bcf..03025d7 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java @@ -36,9 +36,9 @@ public class SystemEnvSymbolProvider implements SymbolProvider { Map<String, String> env = System.getenv(); - for (String key : env.keySet()) + for (Map.Entry<String, String> entry : env.entrySet()) { - symbols.put("env." + key, env.get(key)); + symbols.put("env." + entry.getKey(), entry.getValue()); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/450b36ab/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java index 6bf275c..aaf267e 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java @@ -129,12 +129,11 @@ public final class IdAllocator Map<String, NameGenerator> mapCopy = CollectionFactory.newMap(); - for (String key : generatorMap.keySet()) + for (Map.Entry<String, NameGenerator> entry : generatorMap.entrySet()) { - NameGenerator original = generatorMap.get(key); - NameGenerator copy = transformMap.get(original); + NameGenerator copy = transformMap.get(entry.getValue()); - mapCopy.put(key, copy); + mapCopy.put(entry.getKey(), copy); } return new IdAllocator(namespace, mapCopy);
