commit | adde823b659b44b5d2dc654e76b886475985554b | [log] [tgz] |
---|---|---|
author | Olivier Lamy <olamy@apache.org> | Sat Apr 05 12:44:37 2014 +0000 |
committer | Olivier Lamy <olamy@apache.org> | Sat Apr 05 12:44:37 2014 +0000 |
tree | 5391aff508841f167c6e05a711ddd6908345b7fe | |
parent | c32ca0957713786c45953551b6f94f86e9be15fc [diff] |
use diamond git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1585087 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java b/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java index 4bf8ae2..ba52fda 100644 --- a/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java
@@ -36,11 +36,11 @@ public class DefaultExpressionEvaluator implements ExpressionEvaluator { - private List expressionSources; + private List<ExpressionSource> expressionSources; public DefaultExpressionEvaluator() { - expressionSources = new ArrayList(); + expressionSources = new ArrayList<>(); } public void addExpressionSource( ExpressionSource source ) @@ -51,10 +51,10 @@ public String expand( String str ) throws EvaluatorException { - return recursiveExpand( str, new ArrayList() ); + return recursiveExpand( str, new ArrayList<String>() ); } - private String recursiveExpand( String str, List seenExpressions ) + private String recursiveExpand( String str, List<String> seenExpressions ) throws EvaluatorException { if ( StringUtils.isEmpty( str ) )