You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/11/20 17:03:30 UTC
isis git commit: ISIS-953: tiny fixes to
FixtureScript.ExecutionContext following code review.
Repository: isis
Updated Branches:
refs/heads/master a14951eea -> 8ae1792a8
ISIS-953: tiny fixes to FixtureScript.ExecutionContext following code review.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8ae1792a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8ae1792a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8ae1792a
Branch: refs/heads/master
Commit: 8ae1792a8116c73f293dca8ea677d514cfac28e6
Parents: a14951e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Nov 20 16:57:43 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Nov 20 16:57:43 2014 +0100
----------------------------------------------------------------------
.../org/apache/isis/applib/fixturescripts/FixtureScript.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8ae1792a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 4c0b22a..3d7c00b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -258,13 +258,12 @@ public abstract class FixtureScript
}
};
- private static Pattern keyEqualsValuePattern = Pattern.compile("([^=]*)=(.*)");
+ private final static Pattern keyEqualsValuePattern = Pattern.compile("([^=]*)=(.*)");
private final String parameters;
private final FixtureScripts fixtureScripts;
private final FixtureResultList fixtureResultList;
private final Map<String, String> parameterMap;
- ;
public ExecutionContext(final String parameters, final FixtureScripts fixtureScripts) {
this.fixtureScripts = fixtureScripts;
@@ -299,7 +298,7 @@ public abstract class FixtureScript
}
public String getParameter(String parameterName) {
- return getParameterMap().get(parameterName);
+ return parameterMap.get(parameterName);
}
public Map<String,String> getParameterMap() {
@@ -315,7 +314,7 @@ public abstract class FixtureScript
return;
}
if(parameterMap.containsKey(parameterName)) {
- // ignore; the supplies parameters take precedence
+ // ignore; the existing parameter take precedence
return;
}
parameterMap.put(parameterName, parameterValue);