You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/04/04 15:05:11 UTC
svn commit: r930681 - in
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components:
CompilerComponent.java CompilerComponentRenderer.java TaintHistory.java
Author: werpu
Date: Sun Apr 4 13:05:11 2010
New Revision: 930681
URL: http://svn.apache.org/viewvc?rev=930681&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-111
some variable renames some constant externalization
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java?rev=930681&r1=930680&r2=930681&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java Sun Apr 4 13:05:11 2010
@@ -41,6 +41,9 @@ public class CompilerComponent extends U
String _errorsLabel = null;
String _warningsLabel = null;
private static final String RENDERER_TYPE = "org.apache.myfaces.scripting.components.CompilerComponentRenderer";
+ private static final String ERRORS_LABEL = "errorsLabel";
+ private static final String WARNINGS_LABEL = "warningsLabel";
+ private static final String SCRIPTING_LANGUAGE = "scriptingLanguage";
public CompilerComponent() {
super();
@@ -77,7 +80,7 @@ public class CompilerComponent extends U
if (_scriptingLanguage != null) {
return _scriptingLanguage;
}
- ValueExpression vb = getValueExpression("scriptingLanguage");
+ ValueExpression vb = getValueExpression(SCRIPTING_LANGUAGE);
return vb != null ? ((String) vb.getValue(getFacesContext().getELContext())) : null;
}
@@ -103,7 +106,7 @@ public class CompilerComponent extends U
if (_errorsLabel != null) {
return _errorsLabel;
}
- ValueExpression vb = getValueExpression("errorsLabel");
+ ValueExpression vb = getValueExpression(ERRORS_LABEL);
return vb != null ? ((String) vb.getValue(getFacesContext().getELContext())) : null;
}
@@ -115,7 +118,7 @@ public class CompilerComponent extends U
if (_warningsLabel != null) {
return _warningsLabel;
}
- ValueExpression vb = getValueExpression("warningsLabel");
+ ValueExpression vb = getValueExpression(WARNINGS_LABEL);
return vb != null ? ((String) vb.getValue(getFacesContext().getELContext())) : null;
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java?rev=930681&r1=930680&r2=930681&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java Sun Apr 4 13:05:11 2010
@@ -43,7 +43,7 @@ public class CompilerComponentRenderer e
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
- ResponseWriter wrtr = FacesContext.getCurrentInstance().getResponseWriter();
+ ResponseWriter responseWriter = FacesContext.getCurrentInstance().getResponseWriter();
CompilerComponent compilerComp = (CompilerComponent) component;
Integer scriptingLanguage = compilerComp.getScriptingLanguageAsInt();
@@ -74,18 +74,18 @@ public class CompilerComponentRenderer e
break;
}
- startDiv(component, wrtr, RendererConst.ERROR_BOX);
+ startDiv(component, responseWriter, RendererConst.ERROR_BOX);
if (result == null || (!result.hasErrors() && result.getWarnings().isEmpty())) {
- wrtr.write(RendererConst.NO_COMPILE_ERRORS);
+ responseWriter.write(RendererConst.NO_COMPILE_ERRORS);
} else {
- writeErrorsLabel(component, wrtr, compilerComp);
- writeErrors(component, wrtr, result);
- writeWarningsLabel(component, wrtr, compilerComp);
- writeWarnings(component, wrtr, result);
+ writeErrorsLabel(component, responseWriter, compilerComp);
+ writeErrors(component, responseWriter, result);
+ writeWarningsLabel(component, responseWriter, compilerComp);
+ writeWarnings(component, responseWriter, result);
}
- endDiv(wrtr);
+ endDiv(responseWriter);
- wrtr.flush();
+ responseWriter.flush();
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java?rev=930681&r1=930680&r2=930681&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java Sun Apr 4 13:05:11 2010
@@ -22,7 +22,6 @@ package org.apache.myfaces.scripting.com
import javax.el.ValueExpression;
import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
-import java.util.logging.Logger;
/**
* Component which allows to check which files
@@ -39,6 +38,7 @@ public class TaintHistory extends UIOutp
Integer _noEntries;
String _filter;
private static final String RENDERER_TYPE = "org.apache.myfaces.scripting.components.TaintHistoryRenderer";
+ private static final String NO_ENTRIES = "noEntries";
public TaintHistory() {
setRendererType(RENDERER_TYPE);
@@ -70,7 +70,7 @@ public class TaintHistory extends UIOutp
if (_noEntries != null) {
return _noEntries;
}
- ValueExpression vb = getValueExpression("noEntries");
+ ValueExpression vb = getValueExpression(NO_ENTRIES);
return vb != null ? ((Integer) vb.getValue(getFacesContext().getELContext())) : DEFAULT_NO_ENTRIES;
}
@@ -84,7 +84,7 @@ public class TaintHistory extends UIOutp
if (_filter != null) {
return _filter;
}
- ValueExpression vb = getValueExpression("noEntries");
+ ValueExpression vb = getValueExpression(NO_ENTRIES);
return vb != null ? ((String) vb.getValue(getFacesContext().getELContext())) : null;
}
}