Author: alexsmirnov
Date: 2010-11-29 19:05:46 -0500 (Mon, 29 Nov 2010)
New Revision: 20219
Modified:
branches/RF-8742-1/core/api/src/main/java/org/ajax4jsf/javascript/JSLiteral.java
branches/RF-8742-1/core/api/src/main/java/org/ajax4jsf/javascript/JSReference.java
branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java
branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ValidatorScriptBase.java
branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java
Log:
RESOLVED - issue RF-9565: Optimize JavaScript utils
https://jira.jboss.org/browse/RF-9565
Modified:
branches/RF-8742-1/core/api/src/main/java/org/ajax4jsf/javascript/JSLiteral.java
===================================================================
---
branches/RF-8742-1/core/api/src/main/java/org/ajax4jsf/javascript/JSLiteral.java 2010-11-29
23:32:20 UTC (rev 20218)
+++
branches/RF-8742-1/core/api/src/main/java/org/ajax4jsf/javascript/JSLiteral.java 2010-11-30
00:05:46 UTC (rev 20219)
@@ -31,19 +31,17 @@
* @author Andrey Markavtsov
*
*/
+@SuppressWarnings("serial")
public class JSLiteral extends ScriptStringBase implements Serializable{
- public static final JSLiteral EMPTY_HASH = new ImmutableJSLiteral("{}");
- public static final JSLiteral EMPTY_LIST = new ImmutableJSLiteral("[]");
+
+ public static final JSLiteral EMPTY_HASH = new JSLiteral("{}");
+
+ public static final JSLiteral EMPTY_LIST = new JSLiteral("[]");
+
/** Javascript literal text */
- private String literal;
+ private final String literal;
- /**
- * Default constructor
- */
- public JSLiteral() {
- super();
- }
/**
* Constructor using literal parameter
@@ -65,21 +63,5 @@
return literal;
}
- /**
- * @param literal the literal to set
- */
- public void setLiteral(String literal) {
- this.literal = literal;
- }
- private static final class ImmutableJSLiteral extends JSLiteral {
- public ImmutableJSLiteral(String literal) {
- super(literal);
- }
-
- @Override
- public void setLiteral(String literal) {
- throw new UnsupportedOperationException();
- }
- }
}
Modified:
branches/RF-8742-1/core/api/src/main/java/org/ajax4jsf/javascript/JSReference.java
===================================================================
---
branches/RF-8742-1/core/api/src/main/java/org/ajax4jsf/javascript/JSReference.java 2010-11-29
23:32:20 UTC (rev 20218)
+++
branches/RF-8742-1/core/api/src/main/java/org/ajax4jsf/javascript/JSReference.java 2010-11-30
00:05:46 UTC (rev 20219)
@@ -37,16 +37,16 @@
public static final JSReference TRUE = new JSReference("true");
public static final JSReference NULL = new JSReference("null");
public static final JSReference FALSE = new JSReference("false");
- private Object index = null;
- private String name;
+
+ private final Object index;
+ private final String name;
/**
* @param name
*/
public JSReference(String name) {
-
- // TODO Auto-generated constructor stub
this.name = name;
+ this.index = null;
}
/**
Modified:
branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java
===================================================================
---
branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java 2010-11-29
23:32:20 UTC (rev 20218)
+++
branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java 2010-11-30
00:05:46 UTC (rev 20219)
@@ -18,7 +18,7 @@
import javax.faces.event.PhaseId;
import javax.faces.render.ClientBehaviorRenderer;
-import org.ajax4jsf.javascript.JSLiteral;
+import org.ajax4jsf.javascript.JSReference;
import org.ajax4jsf.javascript.ScriptUtils;
import org.richfaces.application.ServiceTracker;
import org.richfaces.component.UIValidatorScript;
@@ -46,9 +46,9 @@
public static final String CONVERTED_VALUE_VAR = "convertedValue";
- public static final JSLiteral VALUE_LITERAL = new JSLiteral("value");
+ public static final JSReference VALUE_LITERAL = new JSReference("value");
- public static final JSLiteral CONVERTED_VALUE_LITERAL = new
JSLiteral("convertedValue");
+ public static final JSReference CONVERTED_VALUE_LITERAL = new
JSReference("convertedValue");
public ClientValidatorRenderer() {
super();
@@ -278,7 +278,7 @@
}
private LibraryScriptString createClientFunction(FacesContext facesContext,
FacesObjectDescriptor descriptor,
- JSLiteral variable, ClientScriptService clientScriptService) throws
ScriptNotFoundException {
+ JSReference variable, ClientScriptService clientScriptService) throws
ScriptNotFoundException {
LibraryFunction script = clientScriptService.getScript(facesContext,
descriptor.getImplementationClass());
return new LibraryScriptFunction(script, variable, descriptor.getMessage(),
descriptor.getAdditionalParameters());
}
Modified:
branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ValidatorScriptBase.java
===================================================================
---
branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ValidatorScriptBase.java 2010-11-29
23:32:20 UTC (rev 20218)
+++
branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ValidatorScriptBase.java 2010-11-30
00:05:46 UTC (rev 20219)
@@ -4,25 +4,24 @@
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
-import org.ajax4jsf.javascript.JSLiteral;
+import org.ajax4jsf.javascript.JSReference;
public abstract class ValidatorScriptBase extends JSFunctionDefinition implements
ComponentValidatorScript {
protected static final String ELEMENT = "element";
protected static final String EVENT = "event";
- protected static final JSLiteral EVENT_LITERAL = new JSLiteral(EVENT);
- protected static final JSLiteral THIS = new JSLiteral("this");
+ protected static final JSReference EVENT_LITERAL = new JSReference(EVENT);
protected static final String DISABLE_AJAX = "disableAjax";
protected static final String EOL = "\n;";
protected static final String CLIENT_ID = "clientId";
- protected static final JSLiteral CLIENT_ID_LITERAL = new JSLiteral(CLIENT_ID);
+ protected static final JSReference CLIENT_ID_LITERAL = new JSReference(CLIENT_ID);
protected static final String SOURCE_ID = "sourceId";
- protected static final JSLiteral SOURCE_ID_LITERAL = new JSLiteral(SOURCE_ID);
+ protected static final JSReference SOURCE_ID_LITERAL = new JSReference(SOURCE_ID);
protected static final NullConverterScript NULL_CONVERTER_SCRIPT = new
NullConverterScript();
protected static final String CSV_NAMESPACE = "RichFaces.csv.";
protected static final String VALUE_FUNCTION_NAME =
CSV_NAMESPACE+"getValue";
protected static final JSFunction GET_VALUE_FUNCTION = new
JSFunction(VALUE_FUNCTION_NAME,CLIENT_ID_LITERAL);
- protected static final JSFunction SEND_ERROR_FUNCTION = new
JSFunction(CSV_NAMESPACE+"sendMessage",CLIENT_ID_LITERAL,new
JSLiteral("e"));
+ protected static final JSFunction SEND_ERROR_FUNCTION = new
JSFunction(CSV_NAMESPACE+"sendMessage",CLIENT_ID_LITERAL,new
JSReference("e"));
protected static final JSFunction CLEAR_ERROR_FUNCTION = new
JSFunction(CSV_NAMESPACE+"clearMessage",CLIENT_ID_LITERAL);
private boolean bodyProcessed = false;
@@ -43,7 +42,7 @@
protected abstract Object buildBody();
public String createCallScript(String clientId,String sourceId) {
- JSFunction callFunction = new
JSFunction(getName(),clientId,null!=sourceId?sourceId:THIS,EVENT_LITERAL);
+ JSFunction callFunction = new
JSFunction(getName(),clientId,null!=sourceId?sourceId:JSReference.THIS,EVENT_LITERAL);
return callFunction.toScript();
}
Modified:
branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java
===================================================================
---
branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java 2010-11-29
23:32:20 UTC (rev 20218)
+++
branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java 2010-11-30
00:05:46 UTC (rev 20219)
@@ -16,7 +16,7 @@
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
-import org.ajax4jsf.javascript.JSLiteral;
+import org.ajax4jsf.javascript.JSReference;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
@@ -220,7 +220,7 @@
return CLIENT_VALIDATOR_LIBRARY;
}
};
- return new LibraryScriptFunction(libraryScript, new JSLiteral(var),
validatorMessage, VALIDATOR_PARAMS);
+ return new LibraryScriptFunction(libraryScript, new JSReference(var),
validatorMessage, VALIDATOR_PARAMS);
}
private ClientValidatorRenderer createStubRenderer(final LibraryScriptFunction
converterFunction,