\r
public abstract Pazpar2Command copy ();\r
\r
- public String getName() {\r
+ public String getCommandName() {\r
return name;\r
}\r
\r
return (parameters.keySet().size()>0);\r
}\r
\r
- public boolean hasParameterSet(String parameterName) {\r
- return (parameters.get(parameterName) != null);\r
+ public boolean hasParameterValue(String parameterName) {\r
+ return (parameters.get(parameterName) != null && parameters.get(parameterName).hasValue());\r
}\r
\r
public String getEncodedQueryString () {\r
StringBuilder queryString = new StringBuilder("command="+name);\r
for (CommandParameter parameter : parameters.values()) {\r
- queryString.append("&"+parameter.getEncodedQueryString()); \r
+ if (parameter.hasValue()) {\r
+ queryString.append("&"+parameter.getEncodedQueryString());\r
+ }\r
}\r
return queryString.toString();\r
} \r
public String getValueWithExpressions() { \r
StringBuilder value = new StringBuilder("");\r
for (CommandParameter parameter : parameters.values()) {\r
- value.append("&" + parameter.getName() + parameter.operator + parameter.getValueWithExpressions()); \r
+ if (parameter.hasValue()) {\r
+ value.append("&" + parameter.getName() + parameter.operator + parameter.getValueWithExpressions());\r
+ }\r
}\r
return value.toString();\r
}\r
if (stateMgr != null) {\r
stateMgr.checkIn(command);\r
} else {\r
- logger.info("Command '" + command.getName() + "' not affecting state (history) as no state manager was defined for this command.");\r
+ logger.info("Command '" + command.getCommandName() + "' not affecting state (history) as no state manager was defined for this command.");\r
}\r
}\r
\r