Author: sebb Date: Wed Apr 5 12:45:44 2006 New Revision: 391754 URL: http://svn.apache.org/viewcvs?rev=391754&view=rev Log: Tidy up; add NLS markers
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/CompoundVariable.java Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/CompoundVariable.java URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/CompoundVariable.java?rev=391754&r1=391753&r2=391754&view=diff ============================================================================== --- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/CompoundVariable.java (original) +++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/CompoundVariable.java Wed Apr 5 12:45:44 2006 @@ -1,4 +1,3 @@ -// $Header$ /* * Copyright 2003-2004 The Apache Software Foundation. * @@ -43,19 +42,19 @@ * @version $Id$ */ public class CompoundVariable implements Function { - transient private static Logger log = LoggingManager.getLoggerForClass(); + private static final Logger log = LoggingManager.getLoggerForClass(); private String rawParameters; - static FunctionParser functionParser = new FunctionParser(); + private static FunctionParser functionParser = new FunctionParser(); - static Map functions = new HashMap(); + private static Map functions = new HashMap(); private boolean hasFunction, isDynamic; - private String permanentResults = ""; + private String permanentResults = ""; // $NON-NLS-1$ - LinkedList compiledComponents = new LinkedList(); + private LinkedList compiledComponents = new LinkedList(); static { try { @@ -91,9 +90,8 @@ SampleResult previousResult = context.getPreviousResult(); Sampler currentSampler = context.getCurrentSampler(); return execute(previousResult, currentSampler); - } else { - return permanentResults; } + return permanentResults; // $NON-NLS-1$ } /** @@ -112,7 +110,7 @@ */ public String execute(SampleResult previousResult, Sampler currentSampler) { if (compiledComponents == null || compiledComponents.size() == 0) { - return ""; + return ""; // $NON-NLS-1$ } boolean testDynamic = false; StringBuffer results = new StringBuffer(); @@ -180,12 +178,11 @@ try { return ((Class) functions.get(functionName)).newInstance(); } catch (Exception e) { - log.error("", e); + log.error("", e); // $NON-NLS-1$ throw new InvalidVariableException(); } - } else { - return new SimpleVariable(functionName); } + return new SimpleVariable(functionName); } public boolean hasFunction() { @@ -196,12 +193,6 @@ * @see Function#getReferenceKey() */ public String getReferenceKey() { - return ""; + return ""; // $NON-NLS-1$ } - /* - * NOT USED - * - * private JMeterVariables getVariables() { return - * JMeterContextService.getContext().getVariables(); } - */ } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]