Author: pyaschenko Date: 2011-04-28 10:16:16 -0400 (Thu, 28 Apr 2011) New Revision: 22450 Modified: trunk/core/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java trunk/core/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java Log: RF-10940 - refactoring Modified: trunk/core/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java =================================================================== --- trunk/core/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java 2011-04-28 11:38:21 UTC (rev 22449) +++ trunk/core/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java 2011-04-28 14:16:16 UTC (rev 22450) @@ -34,18 +34,6 @@ * */ public class JSFunctionDefinition extends ScriptStringBase implements ScriptString { - protected static final String FUNCTION = "function"; - protected static final String EQUALS = "="; - protected static final String DOT = "."; - protected static final String COMMA = ","; - protected static final String EMPTY_STRING = " "; - protected static final String LEFT_CURLY_BRACKET = "{"; - protected static final String RIGHT_CURLY_BRACKET = "}"; - protected static final String LEFT_ROUND_BRACKET = "("; - protected static final String RIGHT_ROUND_BRACKET = ")"; - protected static final String LEFT_SQUARE_BRACKET = "["; - protected static final String RIGHT_SQUARE_BRACKET = "]"; - protected static final String COLON = ":"; private List<Object> parameters = new ArrayList<Object>(); private StringBuffer body = new StringBuffer(); private String name; Modified: trunk/core/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java =================================================================== --- trunk/core/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java 2011-04-28 11:38:21 UTC (rev 22449) +++ trunk/core/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java 2011-04-28 14:16:16 UTC (rev 22450) @@ -34,6 +34,19 @@ * */ public abstract class ScriptStringBase implements ScriptString { + public static final String FUNCTION = "function"; + public static final String EQUALS = "="; + public static final String DOT = "."; + public static final String COMMA = ","; + public static final String EMPTY_STRING = " "; + public static final String LEFT_CURLY_BRACKET = "{"; + public static final String RIGHT_CURLY_BRACKET = "}"; + public static final String LEFT_ROUND_BRACKET = "("; + public static final String RIGHT_ROUND_BRACKET = ")"; + public static final String LEFT_SQUARE_BRACKET = "["; + public static final String RIGHT_SQUARE_BRACKET = "]"; + public static final String COLON = ":"; + public String toScript() { StringBuilder builder = new StringBuilder();