You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/03 23:43:53 UTC
svn commit: r673826 - in /myfaces/shared/trunk/core/src:
main/java/org/apache/myfaces/shared/component/
main/java/org/apache/myfaces/shared/config/
main/java/org/apache/myfaces/shared/renderkit/
main/java/org/apache/myfaces/shared/renderkit/html/ main/...
Author: skitching
Date: Thu Jul 3 14:43:52 2008
New Revision: 673826
URL: http://svn.apache.org/viewvc?rev=673826&view=rev
Log:
Tabs to spaces
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/FormInfo.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java Thu Jul 3 14:43:52 2008
@@ -41,7 +41,7 @@
String getDisplayValueOnlyStyle();
void setDisplayValueOnlyStyle(String style);
-
+
String getDisplayValueOnlyStyleClass();
void setDisplayValueOnlyStyleClass(String styleClass);
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Thu Jul 3 14:43:52 2008
@@ -99,47 +99,47 @@
static
{
- boolean tomahawkAvailable;
- try
- {
- ClassUtils.classForName("org.apache.myfaces.webapp.filter.ExtensionsFilter");
- tomahawkAvailable = true;
- }
- catch (ClassNotFoundException e)
- {
- tomahawkAvailable = false;
- }
- TOMAHAWK_AVAILABLE = tomahawkAvailable;
+ boolean tomahawkAvailable;
+ try
+ {
+ ClassUtils.classForName("org.apache.myfaces.webapp.filter.ExtensionsFilter");
+ tomahawkAvailable = true;
+ }
+ catch (ClassNotFoundException e)
+ {
+ tomahawkAvailable = false;
+ }
+ TOMAHAWK_AVAILABLE = tomahawkAvailable;
}
static
{
- boolean myfacesImplAvailable;
- try
- {
- ClassUtils.classForName("org.apache.myfaces.application.ApplicationImpl");
- myfacesImplAvailable = true;
- }
- catch (ClassNotFoundException e)
- {
- myfacesImplAvailable = false;
- }
- MYFACES_IMPL_AVAILABLE = myfacesImplAvailable;
+ boolean myfacesImplAvailable;
+ try
+ {
+ ClassUtils.classForName("org.apache.myfaces.application.ApplicationImpl");
+ myfacesImplAvailable = true;
+ }
+ catch (ClassNotFoundException e)
+ {
+ myfacesImplAvailable = false;
+ }
+ MYFACES_IMPL_AVAILABLE = myfacesImplAvailable;
}
static
{
- boolean riImplAvailable;
- try
- {
- ClassUtils.classForName("com.sun.faces.application.ApplicationImpl");
- riImplAvailable = true;
- }
- catch (ClassNotFoundException e)
- {
- riImplAvailable = false;
- }
- RI_IMPL_AVAILABLE = riImplAvailable;
+ boolean riImplAvailable;
+ try
+ {
+ ClassUtils.classForName("com.sun.faces.application.ApplicationImpl");
+ riImplAvailable = true;
+ }
+ catch (ClassNotFoundException e)
+ {
+ riImplAvailable = false;
+ }
+ RI_IMPL_AVAILABLE = riImplAvailable;
}
public static MyfacesConfig getCurrentInstance(ExternalContext extCtx)
@@ -148,18 +148,18 @@
.getApplicationMap().get(APPLICATION_MAP_PARAM_NAME);
if (myfacesConfig == null)
{
-
+
myfacesConfig = createAndInitializeMyFacesConfig(extCtx);
extCtx.getApplicationMap().put(APPLICATION_MAP_PARAM_NAME, myfacesConfig);
-
+
}
return myfacesConfig;
}
- private static MyfacesConfig createAndInitializeMyFacesConfig(ExternalContext extCtx) {
- MyfacesConfig myfacesConfig = new MyfacesConfig();
+ private static MyfacesConfig createAndInitializeMyFacesConfig(ExternalContext extCtx) {
+ MyfacesConfig myfacesConfig = new MyfacesConfig();
myfacesConfig.setPrettyHtml(getBooleanInitParameter(extCtx, INIT_PARAM_PRETTY_HTML,
INIT_PARAM_PRETTY_HTML_DEFAULT));
@@ -180,21 +180,21 @@
{
myfacesConfig.setDetectJavascript(getBooleanInitParameter(extCtx, INIT_PARAM_DETECT_JAVASCRIPT,
INIT_PARAM_DETECT_JAVASCRIPT_DEFAULT));
- myfacesConfig.setAutoScroll(getBooleanInitParameter(extCtx, INIT_PARAM_AUTO_SCROLL,
- INIT_PARAM_AUTO_SCROLL_DEFAULT));
- myfacesConfig.setAddResourceClass(getStringInitParameter(extCtx, INIT_PARAM_ADD_RESOURCE_CLASS,
- INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT));
+ myfacesConfig.setAutoScroll(getBooleanInitParameter(extCtx, INIT_PARAM_AUTO_SCROLL,
+ INIT_PARAM_AUTO_SCROLL_DEFAULT));
+ myfacesConfig.setAddResourceClass(getStringInitParameter(extCtx, INIT_PARAM_ADD_RESOURCE_CLASS,
+ INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT));
myfacesConfig.setResourceVirtualPath(getStringInitParameter(extCtx, INIT_PARAM_RESOURCE_VIRTUAL_PATH,
INIT_PARAM_RESOURCE_VIRTUAL_PATH_DEFAULT));
myfacesConfig.setCheckExtensionsFilter(getBooleanInitParameter(extCtx, INIT_CHECK_EXTENSIONS_FILTER,
- INIT_CHECK_EXTENSIONS_FILTER_DEFAULT));
+ INIT_CHECK_EXTENSIONS_FILTER_DEFAULT));
}
else
{
if (log.isInfoEnabled())
{
- log.info("Tomahawk jar not available. Autoscrolling, DetectJavascript, AddResourceClass and CheckExtensionsFilter are disabled now.");
+ log.info("Tomahawk jar not available. Autoscrolling, DetectJavascript, AddResourceClass and CheckExtensionsFilter are disabled now.");
}
}
@@ -218,8 +218,8 @@
{
log.error("Both MyFaces and the RI are on your classpath. Please make sure to use only one of the two JSF-implementations.");
}
- return myfacesConfig;
- }
+ return myfacesConfig;
+ }
private static boolean getBooleanInitParameter(ExternalContext externalContext,
String paramName,
@@ -435,15 +435,15 @@
/**
* Should the environment be checked so that the ExtensionsFilter will work properly.
*/
- public boolean isCheckExtensionsFilter()
- {
- return _checkExtensionsFilter;
- }
-
- public void setCheckExtensionsFilter(boolean extensionsFilter)
- {
- _checkExtensionsFilter = extensionsFilter;
- }
+ public boolean isCheckExtensionsFilter()
+ {
+ return _checkExtensionsFilter;
+ }
+
+ public void setCheckExtensionsFilter(boolean extensionsFilter)
+ {
+ _checkExtensionsFilter = extensionsFilter;
+ }
public long getConfigRefreshPeriod() {
return _configRefreshPeriod;
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Thu Jul 3 14:43:52 2008
@@ -861,55 +861,55 @@
ByteArrayOutputStream content = new ByteArrayOutputStream(10240);
- InputStream in = null;
- try {
- in = ctx.getExternalContext().getResourceAsStream(file);
- if (in == null)
- {
- return null;
- }
-
- byte[] fileBuffer = new byte[10240];
- int read;
- while ((read = in.read(fileBuffer)) > -1)
- {
- content.write(fileBuffer, 0, read);
- }
- }
- catch (FileNotFoundException e) {
- if (log.isWarnEnabled())
- log.warn("no such file " + file, e);
- content = null;
- }
- catch (IOException e) {
- if (log.isWarnEnabled())
- log.warn("problems during processing resource " + file, e);
- content = null;
- }
- finally
- {
- try
- {
- content.close();
- }
- catch (IOException e)
- {
- log.warn(e.getLocalizedMessage(), e);
- }
- if (in != null)
- {
- try
- {
- in.close();
- }
- catch (IOException e)
- {
- log.warn(e.getLocalizedMessage(), e);
- }
- }
- }
+ InputStream in = null;
+ try {
+ in = ctx.getExternalContext().getResourceAsStream(file);
+ if (in == null)
+ {
+ return null;
+ }
+
+ byte[] fileBuffer = new byte[10240];
+ int read;
+ while ((read = in.read(fileBuffer)) > -1)
+ {
+ content.write(fileBuffer, 0, read);
+ }
+ }
+ catch (FileNotFoundException e) {
+ if (log.isWarnEnabled())
+ log.warn("no such file " + file, e);
+ content = null;
+ }
+ catch (IOException e) {
+ if (log.isWarnEnabled())
+ log.warn("problems during processing resource " + file, e);
+ content = null;
+ }
+ finally
+ {
+ try
+ {
+ content.close();
+ }
+ catch (IOException e)
+ {
+ log.warn(e.getLocalizedMessage(), e);
+ }
+ if (in != null)
+ {
+ try
+ {
+ in.close();
+ }
+ catch (IOException e)
+ {
+ log.warn(e.getLocalizedMessage(), e);
+ }
+ }
+ }
- return content.toString();
+ return content.toString();
}
/**
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Thu Jul 3 14:43:52 2008
@@ -119,8 +119,8 @@
SelectItem selectItem = (SelectItem) it.next();
renderGroupOrItemCheckbox(facesContext, selectMany,
- selectItem, useSubmittedValues, lookupSet,
- converter, pageDirectionLayout);
+ selectItem, useSubmittedValues, lookupSet,
+ converter, pageDirectionLayout);
}
if (!pageDirectionLayout)
@@ -137,18 +137,18 @@
}
protected void renderGroupOrItemCheckbox(FacesContext facesContext,
- UIComponent uiComponent, SelectItem selectItem,
- boolean useSubmittedValues, Set lookupSet,
- Converter converter, boolean pageDirectionLayout) throws IOException{
-
- ResponseWriter writer = facesContext.getResponseWriter();
-
- boolean isSelectItemGroup = (selectItem instanceof SelectItemGroup);
-
- Object itemValue = selectItem.getValue(); // TODO : Check here for getSubmittedValue. Look at RendererUtils.getValue
+ UIComponent uiComponent, SelectItem selectItem,
+ boolean useSubmittedValues, Set lookupSet,
+ Converter converter, boolean pageDirectionLayout) throws IOException{
+
+ ResponseWriter writer = facesContext.getResponseWriter();
+
+ boolean isSelectItemGroup = (selectItem instanceof SelectItemGroup);
+
+ Object itemValue = selectItem.getValue(); // TODO : Check here for getSubmittedValue. Look at RendererUtils.getValue
- UISelectMany selectMany = (UISelectMany)uiComponent;
-
+ UISelectMany selectMany = (UISelectMany)uiComponent;
+
String itemStrValue;
if (converter == null) {
itemStrValue = itemValue.toString();
@@ -158,37 +158,37 @@
}
if (isSelectItemGroup) {
- if (pageDirectionLayout)
+ if (pageDirectionLayout)
+ writer.startElement(HTML.TR_ELEM, selectMany);
+
+ writer.startElement(HTML.TD_ELEM, selectMany);
+ writer.write(selectItem.getLabel());
+ writer.endElement(HTML.TD_ELEM);
+
+ if (pageDirectionLayout) {
+ writer.endElement(HTML.TR_ELEM);
writer.startElement(HTML.TR_ELEM, selectMany);
-
- writer.startElement(HTML.TD_ELEM, selectMany);
- writer.write(selectItem.getLabel());
- writer.endElement(HTML.TD_ELEM);
-
- if (pageDirectionLayout) {
- writer.endElement(HTML.TR_ELEM);
- writer.startElement(HTML.TR_ELEM, selectMany);
- }
- writer.startElement(HTML.TD_ELEM, selectMany);
-
- writer.startElement(HTML.TABLE_ELEM, selectMany);
- writer.writeAttribute(HTML.BORDER_ATTR, "0", null);
-
- SelectItemGroup group = (SelectItemGroup) selectItem;
- SelectItem[] selectItems = group.getSelectItems();
-
- for (int i=0; i<selectItems.length; i++) {
- renderGroupOrItemCheckbox(facesContext, selectMany, selectItems[i], useSubmittedValues, lookupSet, converter, pageDirectionLayout);
- }
-
- writer.endElement(HTML.TD_ELEM);
- writer.endElement(HTML.TR_ELEM);
- writer.endElement(HTML.TABLE_ELEM);
- writer.endElement(HTML.TD_ELEM);
-
- if (pageDirectionLayout)
+ }
+ writer.startElement(HTML.TD_ELEM, selectMany);
+
+ writer.startElement(HTML.TABLE_ELEM, selectMany);
+ writer.writeAttribute(HTML.BORDER_ATTR, "0", null);
+
+ SelectItemGroup group = (SelectItemGroup) selectItem;
+ SelectItem[] selectItems = group.getSelectItems();
+
+ for (int i=0; i<selectItems.length; i++) {
+ renderGroupOrItemCheckbox(facesContext, selectMany, selectItems[i], useSubmittedValues, lookupSet, converter, pageDirectionLayout);
+ }
+
+ writer.endElement(HTML.TD_ELEM);
+ writer.endElement(HTML.TR_ELEM);
+ writer.endElement(HTML.TABLE_ELEM);
+ writer.endElement(HTML.TD_ELEM);
+
+ if (pageDirectionLayout)
writer.endElement(HTML.TR_ELEM);
-
+
} else {
writer.write("\t\t");
@@ -250,7 +250,7 @@
HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
if (disabled || isDisabled(facesContext, uiComponent)) {
- writer.writeAttribute(HTML.DISABLED_ATTR, HTML.DISABLED_ATTR, null);
+ writer.writeAttribute(HTML.DISABLED_ATTR, HTML.DISABLED_ATTR, null);
}
writer.endElement(HTML.INPUT_ELEM);
@@ -280,8 +280,8 @@
HTML.READONLY_ATTR, false);
}
if (!disabled && readonly) {
- disabled = MyfacesConfig.getCurrentInstance(facesContext
- .getExternalContext()).isReadonlyAsDisabledForSelect();
+ disabled = MyfacesConfig.getCurrentInstance(facesContext
+ .getExternalContext()).isReadonlyAsDisabledForSelect();
}
return disabled;
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java Thu Jul 3 14:43:52 2008
@@ -132,7 +132,7 @@
}
protected String getAcceptCharset(FacesContext facesContext, UIForm form ) {
- return (String)form.getAttributes().get( JSFAttr.ACCEPTCHARSET_ATTR );
+ return (String)form.getAttributes().get( JSFAttr.ACCEPTCHARSET_ATTR );
}
public void encodeEnd(FacesContext facesContext, UIComponent component)
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java Thu Jul 3 14:43:52 2008
@@ -107,9 +107,9 @@
readonly = RendererUtils.getBooleanAttribute(uiComponent, HTML.READONLY_ATTR, false);
}
if (!disabled && readonly) {
- disabled = MyfacesConfig.getCurrentInstance(facesContext
- .getExternalContext()).isReadonlyAsDisabledForSelect();
- }
+ disabled = MyfacesConfig.getCurrentInstance(facesContext
+ .getExternalContext()).isReadonlyAsDisabledForSelect();
+ }
return disabled;
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java Thu Jul 3 14:43:52 2008
@@ -87,8 +87,8 @@
readonly = RendererUtils.getBooleanAttribute(uiComponent, HTML.READONLY_ATTR, false);
}
if (!disabled && readonly) {
- disabled = MyfacesConfig.getCurrentInstance(facesContext
- .getExternalContext()).isReadonlyAsDisabledForSelect();
+ disabled = MyfacesConfig.getCurrentInstance(facesContext
+ .getExternalContext()).isReadonlyAsDisabledForSelect();
}
return disabled;
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Thu Jul 3 14:43:52 2008
@@ -141,7 +141,7 @@
// TODO : Check here for getSubmittedValue. Look at RendererUtils.getValue
// this is useless object creation
-// Object itemValue = selectItem.getValue();
+// Object itemValue = selectItem.getValue();
UISelectOne selectOne = (UISelectOne)uiComponent;
@@ -277,8 +277,8 @@
if (!disabled && readonly)
{
- disabled = MyfacesConfig.getCurrentInstance(facesContext
- .getExternalContext()).isReadonlyAsDisabledForSelect();
+ disabled = MyfacesConfig.getCurrentInstance(facesContext
+ .getExternalContext()).isReadonlyAsDisabledForSelect();
}
return disabled;
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Thu Jul 3 14:43:52 2008
@@ -104,22 +104,22 @@
beforeTable(facesContext, (UIData) uiComponent);
- startTable(facesContext, uiComponent);
+ startTable(facesContext, uiComponent);
}
- /**
- * actually render the start of the table
- */
- protected void startTable(FacesContext facesContext, UIComponent uiComponent) throws IOException
- {
- ResponseWriter writer = facesContext.getResponseWriter();
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.TABLE_ELEM, uiComponent);
- HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
- }
+ /**
+ * actually render the start of the table
+ */
+ protected void startTable(FacesContext facesContext, UIComponent uiComponent) throws IOException
+ {
+ ResponseWriter writer = facesContext.getResponseWriter();
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ writer.startElement(HTML.TABLE_ELEM, uiComponent);
+ HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
+ }
- /**
+ /**
* Render the TBODY section of the html table. See also method encodeInnerHtml.
*
* @see javax.faces.render.Renderer#encodeChildren(FacesContext, UIComponent)
@@ -262,7 +262,7 @@
for(int nc = 0; nc < newspaperColumns; nc++) {
// the current row in the 'real' table
- int currentRow;
+ int currentRow;
if (newspaperHorizontalOrientation)
currentRow = nr * newspaperColumns + nc + first;
else
@@ -279,7 +279,7 @@
}
if (nc == 0) {
- // first column in table, start new row
+ // first column in table, start new row
beforeRow(facesContext, uiData);
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
@@ -539,22 +539,22 @@
{
RendererUtils.checkParamValidity(facesContext, uiComponent, UIData.class);
- endTable(facesContext, uiComponent);
+ endTable(facesContext, uiComponent);
afterTable(facesContext, (UIData) uiComponent);
}
- /**
- * actually render the end of the table
- */
- protected void endTable(FacesContext facesContext, UIComponent uiComponent) throws IOException
- {
- ResponseWriter writer = facesContext.getResponseWriter();
- writer.endElement(HTML.TABLE_ELEM);
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- }
+ /**
+ * actually render the end of the table
+ */
+ protected void endTable(FacesContext facesContext, UIComponent uiComponent) throws IOException
+ {
+ ResponseWriter writer = facesContext.getResponseWriter();
+ writer.endElement(HTML.TABLE_ELEM);
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ }
- /**
+ /**
* Renders either the header or the footer facets for the UIData component
* and all the child UIColumn components, as a THEAD or TFOOT element
* containing TR (row) elements.
@@ -605,11 +605,11 @@
String elemName = determineHeaderFooterTag(facesContext, component, header);
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- if (elemName != null)
- {
- writer.startElement(elemName, component);
- }
- if (header)
+ if (elemName != null)
+ {
+ writer.startElement(elemName, component);
+ }
+ if (header)
{
String headerStyleClass = getHeaderClass(component);
if (facet != null)
@@ -625,19 +625,19 @@
if (facet != null)
renderTableFooterRow(facesContext, writer, component, facet, footerStyleClass, colspan);
}
- if (elemName != null)
- {
- writer.endElement(elemName);
- }
- }
+ if (elemName != null)
+ {
+ writer.endElement(elemName);
+ }
+ }
}
- protected String determineHeaderFooterTag(FacesContext facesContext, UIComponent component, boolean header)
- {
- return header ? HTML.THEAD_ELEM : HTML.TFOOT_ELEM;
- }
+ protected String determineHeaderFooterTag(FacesContext facesContext, UIComponent component, boolean header)
+ {
+ return header ? HTML.THEAD_ELEM : HTML.TFOOT_ELEM;
+ }
- /**
+ /**
* @param header
* @param uiComponent
* @return boolean
@@ -790,7 +790,7 @@
if (component instanceof UIData && uiComponent instanceof UIColumn)
beforeColumnHeaderOrFooter(facesContext, (UIData)component, header, columnIndex);
- renderColumnChildHeaderOrFooterRow(facesContext, writer, uiComponent, styleClass, header);
+ renderColumnChildHeaderOrFooterRow(facesContext, writer, uiComponent, styleClass, header);
if (component instanceof UIData && uiComponent instanceof UIColumn)
afterColumnHeaderOrFooter(facesContext, (UIData)component, header, columnIndex);
@@ -887,12 +887,12 @@
writer.endElement(determineHeaderCellTag(facesContext, uiComponent.getParent()));
}
- protected String determineHeaderCellTag(FacesContext facesContext, UIComponent uiComponent)
- {
- return HTML.TH_ELEM;
- }
+ protected String determineHeaderCellTag(FacesContext facesContext, UIComponent uiComponent)
+ {
+ return HTML.TH_ELEM;
+ }
- /**
+ /**
* Renders the footer facet for the given <code>UIColumn</code>.
* @param facesContext the <code>FacesContext</code>.
* @param writer the <code>ResponseWriter</code>.
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/FormInfo.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/FormInfo.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/FormInfo.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/FormInfo.java Thu Jul 3 14:43:52 2008
@@ -26,27 +26,27 @@
*/
public class FormInfo
{
- private final UIComponent form;
- private final String formName;
-
- /**
+ private final UIComponent form;
+ private final String formName;
+
+ /**
*
* @param form <code>UIComponent</code> that represents the used form
* @param formName the name of the form.
- */
+ */
public FormInfo(final UIComponent form, final String formName)
- {
- this.form = form;
- this.formName = formName;
- }
+ {
+ this.form = form;
+ this.formName = formName;
+ }
- public UIComponent getForm()
- {
- return form;
- }
+ public UIComponent getForm()
+ {
+ return form;
+ }
- public String getFormName()
- {
- return formName;
- }
+ public String getFormName()
+ {
+ return formName;
+ }
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java Thu Jul 3 14:43:52 2008
@@ -23,56 +23,56 @@
*/
public abstract class HTMLEncoder
{
- /**
- * Variant of {@link #encode} where encodeNewline is false and encodeNbsp is true.
- */
- public static String encode (String string)
- {
- return encode(string, false, true);
- }
-
- /**
- * Variant of {@link #encode} where encodeNbsp is true.
- */
- public static String encode (String string, boolean encodeNewline)
- {
- return encode(string, encodeNewline, true);
- }
-
- /**
- * Variant of {@link #encode} where encodeNbsp and encodeNonLatin are true
- */
- public static String encode (String string, boolean encodeNewline, boolean encodeSubsequentBlanksToNbsp)
- {
- return encode(string, encodeNewline, encodeSubsequentBlanksToNbsp, true);
- }
-
- /**
- * Encodes the given string, so that it can be used within a html page.
- * @param string the string to convert
- * @param encodeNewline if true newline characters are converted to <br>'s
- * @param encodeSubsequentBlanksToNbsp if true subsequent blanks are converted to &nbsp;'s
- * @param encodeNonLatin if true encode non-latin characters as numeric character references
- */
- public static String encode (String string,
- boolean encodeNewline,
- boolean encodeSubsequentBlanksToNbsp,
- boolean encodeNonLatin)
- {
- if (string == null)
- {
- return "";
- }
-
- StringBuffer sb = null; //create later on demand
- String app;
- char c;
- for (int i = 0; i < string.length (); ++i)
- {
- app = null;
- c = string.charAt(i);
- switch (c)
- {
+ /**
+ * Variant of {@link #encode} where encodeNewline is false and encodeNbsp is true.
+ */
+ public static String encode (String string)
+ {
+ return encode(string, false, true);
+ }
+
+ /**
+ * Variant of {@link #encode} where encodeNbsp is true.
+ */
+ public static String encode (String string, boolean encodeNewline)
+ {
+ return encode(string, encodeNewline, true);
+ }
+
+ /**
+ * Variant of {@link #encode} where encodeNbsp and encodeNonLatin are true
+ */
+ public static String encode (String string, boolean encodeNewline, boolean encodeSubsequentBlanksToNbsp)
+ {
+ return encode(string, encodeNewline, encodeSubsequentBlanksToNbsp, true);
+ }
+
+ /**
+ * Encodes the given string, so that it can be used within a html page.
+ * @param string the string to convert
+ * @param encodeNewline if true newline characters are converted to <br>'s
+ * @param encodeSubsequentBlanksToNbsp if true subsequent blanks are converted to &nbsp;'s
+ * @param encodeNonLatin if true encode non-latin characters as numeric character references
+ */
+ public static String encode (String string,
+ boolean encodeNewline,
+ boolean encodeSubsequentBlanksToNbsp,
+ boolean encodeNonLatin)
+ {
+ if (string == null)
+ {
+ return "";
+ }
+
+ StringBuffer sb = null; //create later on demand
+ String app;
+ char c;
+ for (int i = 0; i < string.length (); ++i)
+ {
+ app = null;
+ c = string.charAt(i);
+ switch (c)
+ {
case '"': app = """; break; //"
case '&': app = "&"; break; //&
case '<': app = "<"; break; //<
@@ -94,57 +94,57 @@
default:
- if (encodeNonLatin) switch(c) {
- //german umlauts
- case '\u00E4' : app = "ä"; break;
- case '\u00C4' : app = "Ä"; break;
- case '\u00F6' : app = "ö"; break;
- case '\u00D6' : app = "Ö"; break;
- case '\u00FC' : app = "ü"; break;
- case '\u00DC' : app = "Ü"; break;
- case '\u00DF' : app = "ß"; break;
-
- //misc
- //case 0x80: app = "€"; break; sometimes euro symbol is ascii 128, should we suport it?
- case '\u20AC': app = "€"; break;
- case '\u00AB': app = "«"; break;
- case '\u00BB': app = "»"; break;
- case '\u00A0': app = " "; break;
-
- default :
- if (((int)c) >= 0x80)
- {
- //encode all non basic latin characters
- app = "&#" + ((int)c) + ";";
- }
- break;
- }
- break;
- }
- if (app != null)
- {
- if (sb == null)
- {
- sb = new StringBuffer(string.substring(0, i));
- }
- sb.append(app);
- } else {
- if (sb != null)
- {
- sb.append(c);
- }
- }
- }
-
- if (sb == null)
- {
- return string;
- }
- else
- {
- return sb.toString();
- }
- }
+ if (encodeNonLatin) switch(c) {
+ //german umlauts
+ case '\u00E4' : app = "ä"; break;
+ case '\u00C4' : app = "Ä"; break;
+ case '\u00F6' : app = "ö"; break;
+ case '\u00D6' : app = "Ö"; break;
+ case '\u00FC' : app = "ü"; break;
+ case '\u00DC' : app = "Ü"; break;
+ case '\u00DF' : app = "ß"; break;
+
+ //misc
+ //case 0x80: app = "€"; break; sometimes euro symbol is ascii 128, should we suport it?
+ case '\u20AC': app = "€"; break;
+ case '\u00AB': app = "«"; break;
+ case '\u00BB': app = "»"; break;
+ case '\u00A0': app = " "; break;
+
+ default :
+ if (((int)c) >= 0x80)
+ {
+ //encode all non basic latin characters
+ app = "&#" + ((int)c) + ";";
+ }
+ break;
+ }
+ break;
+ }
+ if (app != null)
+ {
+ if (sb == null)
+ {
+ sb = new StringBuffer(string.substring(0, i));
+ }
+ sb.append(app);
+ } else {
+ if (sb != null)
+ {
+ sb.append(c);
+ }
+ }
+ }
+
+ if (sb == null)
+ {
+ return string;
+ }
+ else
+ {
+ return sb.toString();
+ }
+ }
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java Thu Jul 3 14:43:52 2008
@@ -190,7 +190,7 @@
{
return "";
}
- StringBuffer sb = null; //create later on demand
+ StringBuffer sb = null; //create later on demand
String app;
char c;
for (int i = 0; i < string.length (); ++i)
@@ -253,7 +253,7 @@
public static void setJavascriptDetected(HttpSession session, boolean value)
{
- session.setAttribute(JAVASCRIPT_DETECTED, Boolean.valueOf(value));
+ session.setAttribute(JAVASCRIPT_DETECTED, Boolean.valueOf(value));
}
public static boolean isJavascriptDetected(ExternalContext externalContext)
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java Thu Jul 3 14:43:52 2008
@@ -27,39 +27,39 @@
*/
public abstract class UnicodeEncoder
{
- /**
- * Encodes the given string, so that it can be used within a html page.
- * @param string the string to convert
- */
- public static String encode (String string)
- {
- if (string == null)
- {
- return "";
- }
+ /**
+ * Encodes the given string, so that it can be used within a html page.
+ * @param string the string to convert
+ */
+ public static String encode (String string)
+ {
+ if (string == null)
+ {
+ return "";
+ }
- StringBuffer sb = null;
- char c;
- for (int i = 0; i < string.length (); ++i)
- {
- c = string.charAt(i);
- if (((int)c) >= 0x80)
- {
- if( sb == null ){
- sb = new StringBuffer( string.length()+4 );
- sb.append( string.substring(0,i) );
- }
- //encode all non basic latin characters
- sb.append("&#" + ((int)c) + ";");
- }
- else if( sb != null )
- {
- sb.append(c);
- }
- }
+ StringBuffer sb = null;
+ char c;
+ for (int i = 0; i < string.length (); ++i)
+ {
+ c = string.charAt(i);
+ if (((int)c) >= 0x80)
+ {
+ if( sb == null ){
+ sb = new StringBuffer( string.length()+4 );
+ sb.append( string.substring(0,i) );
+ }
+ //encode all non basic latin characters
+ sb.append("&#" + ((int)c) + ";");
+ }
+ else if( sb != null )
+ {
+ sb.append(c);
+ }
+ }
- return sb != null ? sb.toString() : string;
- }
+ return sb != null ? sb.toString() : string;
+ }
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java Thu Jul 3 14:43:52 2008
@@ -114,7 +114,7 @@
}
else
{
- locale = LocaleUtils.converterTagLocaleFromString( value);
+ locale = LocaleUtils.converterTagLocaleFromString( value);
}
converter.setLocale(locale);
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java Thu Jul 3 14:43:52 2008
@@ -29,74 +29,74 @@
*/
public final class ExceptionUtils
{
- private ExceptionUtils()
- {
- }
+ private ExceptionUtils()
+ {
+ }
- /**
- * <p>
- * returns a list of all throwables (including the one you passed in) wrapped by the given throwable.
- * In contrast to a simple call to <code>getClause()</code> on each throwable it will also check if the throwable class
- * contain a method <code>getRootCause()</code> (e.g. ServletException or JspException) and call it instead.
- * </p>
- * <p>
- * The first list element will your passed in exception, the last list element is the cause.
- * </p>
- */
- public static List getExceptions(Throwable cause)
- {
- List exceptions = new ArrayList(10);
- exceptions.add(cause);
-
- do
- {
- Throwable nextCause;
- try
- {
- Method rootCause = cause.getClass().getMethod("getRootCause", new Class[]{});
- nextCause = (Throwable) rootCause.invoke(cause, new Object[]{});
- }
- catch(Exception e)
- {
- nextCause = cause.getCause();
- }
- if (cause == nextCause)
- {
- break;
- }
-
- if (nextCause != null)
- {
- exceptions.add(nextCause);
- }
-
- cause = nextCause;
- }
- while (cause != null);
-
- return exceptions;
- }
+ /**
+ * <p>
+ * returns a list of all throwables (including the one you passed in) wrapped by the given throwable.
+ * In contrast to a simple call to <code>getClause()</code> on each throwable it will also check if the throwable class
+ * contain a method <code>getRootCause()</code> (e.g. ServletException or JspException) and call it instead.
+ * </p>
+ * <p>
+ * The first list element will your passed in exception, the last list element is the cause.
+ * </p>
+ */
+ public static List getExceptions(Throwable cause)
+ {
+ List exceptions = new ArrayList(10);
+ exceptions.add(cause);
+
+ do
+ {
+ Throwable nextCause;
+ try
+ {
+ Method rootCause = cause.getClass().getMethod("getRootCause", new Class[]{});
+ nextCause = (Throwable) rootCause.invoke(cause, new Object[]{});
+ }
+ catch(Exception e)
+ {
+ nextCause = cause.getCause();
+ }
+ if (cause == nextCause)
+ {
+ break;
+ }
+
+ if (nextCause != null)
+ {
+ exceptions.add(nextCause);
+ }
+
+ cause = nextCause;
+ }
+ while (cause != null);
+
+ return exceptions;
+ }
- /**
- * Find a throwable message starting with the last element.<br />
- * Returns the first throwable message where <code>throwable.getMessage() != null</code>
- */
- public static String getExceptionMessage(List throwables)
- {
- if (throwables == null)
- {
- return null;
- }
+ /**
+ * Find a throwable message starting with the last element.<br />
+ * Returns the first throwable message where <code>throwable.getMessage() != null</code>
+ */
+ public static String getExceptionMessage(List throwables)
+ {
+ if (throwables == null)
+ {
+ return null;
+ }
- for (int i = throwables.size()-1; i>0; i--)
- {
- Throwable t = (Throwable) throwables.get(i);
- if (t.getMessage() != null)
- {
- return t.getMessage();
- }
- }
-
- return null;
- }
+ for (int i = throwables.size()-1; i>0; i--)
+ {
+ Throwable t = (Throwable) throwables.get(i);
+ if (t.getMessage() != null)
+ {
+ return t.getMessage();
+ }
+ }
+
+ return null;
+ }
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java Thu Jul 3 14:43:52 2008
@@ -50,10 +50,10 @@
public final class MessageUtils
{
/** Utility class, do not instatiate */
- private MessageUtils()
- {
- // nope
- }
+ private MessageUtils()
+ {
+ // nope
+ }
/** Default bundle for messages (<code>javax.faces.Messages</code>) */
private static final String DEFAULT_BUNDLE = "javax.faces.Messages";
@@ -159,7 +159,7 @@
StringBuffer b = new StringBuffer(100);
if(locale != null)
{
- MessageFormat mf = new MessageFormat(msgtext,locale);
+ MessageFormat mf = new MessageFormat(msgtext,locale);
b.append(mf.format(params));
localizedStr = b.toString();
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java Thu Jul 3 14:43:52 2008
@@ -113,15 +113,15 @@
/** Utility class, do not instatiate */
private StateUtils()
{
- //nope
+ //nope
}
private static void testConfiguration(String algorithmParams, String iv){
if (algorithmParams != null && algorithmParams.startsWith("CBC") )
{
- if(iv == null)
- throw new FacesException(INIT_ALGORITHM_PARAM +
+ if(iv == null)
+ throw new FacesException(INIT_ALGORITHM_PARAM +
" parameter has been set with CBC mode," +
" but no initialization vector has been set " +
" with " + INIT_ALGORITHM_IV);
@@ -139,10 +139,10 @@
public static boolean isSecure(ExternalContext ctx)
{
-
- if(ctx == null)
- throw new NullPointerException("ExternalContext ctx");
-
+
+ if(ctx == null)
+ throw new NullPointerException("ExternalContext ctx");
+
return ctx.getInitParameter(INIT_SECRET) != null || ctx.getInitParameter(INIT_SECRET.toLowerCase())!=null;
}
@@ -153,7 +153,7 @@
public static String construct(Object object, ExternalContext ctx){
byte[] bytes = getAsByteArray(object, ctx);
if( enableCompression(ctx) )
- bytes = compress(bytes);
+ bytes = compress(bytes);
if(isSecure(ctx))
bytes = encrypt(bytes, ctx);
bytes = encode(bytes);
@@ -169,7 +169,7 @@
public static byte[] getAsByteArray(Object object, ExternalContext ctx)
{
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
// get the Factory that was instantiated @ startup
SerialFactory serialFactory = (SerialFactory) ctx.getApplicationMap().get(SERIAL_FACTORY);
@@ -197,9 +197,9 @@
public static byte[] encrypt(byte[] insecure, ExternalContext ctx)
{
-
- return symmetric(insecure, ctx, Cipher.ENCRYPT_MODE);
-
+
+ return symmetric(insecure, ctx, Cipher.ENCRYPT_MODE);
+
}
public static byte[] compress(byte[] bytes)
@@ -225,7 +225,7 @@
public static byte[] encode(byte[] bytes)
{
- return new Base64().encode(bytes);
+ return new Base64().encode(bytes);
}
/**
@@ -233,7 +233,7 @@
*/
public static Object reconstruct(String string, ExternalContext ctx){
- byte[] bytes;
+ byte[] bytes;
try
{
if(log.isDebugEnabled())
@@ -255,14 +255,14 @@
public static byte[] decode(byte[] bytes)
{
- return new Base64().decode(bytes);
+ return new Base64().decode(bytes);
}
public static byte[] decompress(byte[] bytes)
{
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] buffer = new byte[2048];
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ byte[] buffer = new byte[2048];
int length;
try
@@ -290,14 +290,14 @@
public static byte[] decrypt(byte[] secure, ExternalContext ctx)
{
-
- return symmetric(secure, ctx, Cipher.DECRYPT_MODE);
+
+ return symmetric(secure, ctx, Cipher.DECRYPT_MODE);
}
public static Object getAsObject(byte[] bytes, ExternalContext ctx)
{
- ByteArrayInputStream input = new ByteArrayInputStream(bytes);
+ ByteArrayInputStream input = new ByteArrayInputStream(bytes);
// get the Factory that was instantiated @ startup
SerialFactory serialFactory = (SerialFactory) ctx.getApplicationMap().get(SERIAL_FACTORY);
@@ -305,7 +305,7 @@
if(serialFactory == null)
throw new NullPointerException("serialFactory");
- try
+ try
{
ObjectInputStream s = serialFactory.getObjectInputStream(input);
//new MyFacesObjectInputStream(input);
@@ -346,7 +346,7 @@
public static void main (String[] args) throws UnsupportedEncodingException
{
byte[] bytes = encode(args[0].getBytes(ZIP_CHARSET));
- System.out.println(new String(bytes, ZIP_CHARSET));
+ System.out.println(new String(bytes, ZIP_CHARSET));
}
private static byte[] symmetric(byte[] data, SecretKey secretKey,
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java Thu Jul 3 14:43:52 2008
@@ -417,7 +417,7 @@
*/
public static String[] splitLongString(String str, char separator)
{
- int len;
+ int len;
if (str == null || (len = str.length()) == 0)
{
return ArrayUtils.EMPTY_STRING_ARRAY;
@@ -453,7 +453,7 @@
public static String[] splitLongString(
String str, char separator, char quote)
{
- int len;
+ int len;
if (str == null || (len = str.length()) == 0)
{
return ArrayUtils.EMPTY_STRING_ARRAY;
@@ -518,7 +518,7 @@
*/
public static String[] splitShortString(String str, char separator)
{
- int len;
+ int len;
if (str == null || (len = str.length()) == 0)
{
return org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY;
@@ -569,7 +569,7 @@
public static String[] splitShortString(
String str, char separator, char quote)
{
- int len;
+ int len;
if (str == null || (len = str.length()) == 0)
{
return ArrayUtils.EMPTY_STRING_ARRAY;
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java Thu Jul 3 14:43:52 2008
@@ -29,14 +29,14 @@
* Example : in JSF pages, for dataTable, to remove elements :
* Backing bean (#{inboxFace}).
* public ActionsMap getRemoveEmailUnid(){
- * return new ActionsMap(){
- * public void performAction(String unid) {
- * InboxMailDAO<TInboxMail> dao = getInboxMailDAO();
- * TInboxMail email = dao.getByPrimaryKey( unid );
- * dao.remove( email );
- * }
- * };
- * }
+ * return new ActionsMap(){
+ * public void performAction(String unid) {
+ * InboxMailDAO<TInboxMail> dao = getInboxMailDAO();
+ * TInboxMail email = dao.getByPrimaryKey( unid );
+ * dao.remove( email );
+ * }
+ * };
+ * }
* JSF page :
* <h:selectBooleanCheckbox value="#{inboxFace.removeEmailUnid[email.unid]}"/>
*/
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java Thu Jul 3 14:43:52 2008
@@ -167,12 +167,12 @@
String filterName = (String)entry.getKey();
String filterClassName = (String)entry.getValue();
- if (!"org.apache.myfaces.component.html.util.ExtensionsFilter".equals(filterClassName) &&
- !"org.apache.myfaces.webapp.filter.ExtensionsFilter".equals(filterClassName))
- {
- // not an extensions filter
- continue;
- }
+ if (!"org.apache.myfaces.component.html.util.ExtensionsFilter".equals(filterClassName) &&
+ !"org.apache.myfaces.webapp.filter.ExtensionsFilter".equals(filterClassName))
+ {
+ // not an extensions filter
+ continue;
+ }
Class filterClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName(filterClassName);
List urlPatterns = (List)_filterMappings.get(filterName);
@@ -182,7 +182,7 @@
{
String urlpattern = (String)it2.next();
_facesExtensionsFilterMappings.add(new org.apache.myfaces.shared.webapp.webxml.FilterMapping(
- filterName, filterClass, urlpattern));
+ filterName, filterClass, urlpattern));
if (log.isTraceEnabled())
log.trace("adding mapping for filter + " + filterName + " urlpattern = " + urlpattern);
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Thu Jul 3 14:43:52 2008
@@ -349,7 +349,7 @@
}
else if (n.getNodeName().equals("servlet-name"))
{
- // we are not interested in servlet-name based mapping - for now
+ // we are not interested in servlet-name based mapping - for now
}
else if (n.getNodeName().equals("dispatcher"))
{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java Thu Jul 3 14:43:52 2008
@@ -36,54 +36,54 @@
*/
public class HtmlRendererUtilsTest extends AbstractJsfTestCase {
- public HtmlRendererUtilsTest(String name) {
- super(name);
- }
-
- public void setUp() {
- super.setUp();
- }
-
- public void tearDown() {
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(HtmlRendererUtilsTest.class);
- }
-
- public void testSelectContentType() {
- MockExternalContext mockExternalContext = new MockExternalContext(servletContext,request, response);
- facesContext.setExternalContext(mockExternalContext);
-
- mockExternalContext.getRequestHeaderMap().put("Accept", "text/html");
- String selectedContentType = HtmlRendererUtils.selectContentType(null);
- assertEquals("text/html", selectedContentType);
-
- mockExternalContext.getRequestHeaderMap().put("Accept", "text/*");
- selectedContentType = HtmlRendererUtils.selectContentType(null);
- assertEquals("text/html", selectedContentType);
-
- mockExternalContext.getRequestHeaderMap().put("Accept", "text/xml");
- selectedContentType = HtmlRendererUtils.selectContentType(null);
- assertEquals("application/xhtml+xml", selectedContentType);
- }
-
- //shale's external context does not support playing with request header map
- static public class MockExternalContext extends org.apache.shale.test.mock.MockExternalContext {
-
- private Map requestHeaderMap = new HashMap();
-
- public MockExternalContext(ServletContext context,HttpServletRequest request, HttpServletResponse response) {
- super(context, request, response);
- }
-
- public Map getRequestHeaderMap() {
- return requestHeaderMap;
- }
-
- public void setRequestHeaderMap(Map requestHeaderMap) {
- this.requestHeaderMap = requestHeaderMap;
- }
- }
+ public HtmlRendererUtilsTest(String name) {
+ super(name);
+ }
+
+ public void setUp() {
+ super.setUp();
+ }
+
+ public void tearDown() {
+ super.tearDown();
+ }
+
+ public static Test suite() {
+ return new TestSuite(HtmlRendererUtilsTest.class);
+ }
+
+ public void testSelectContentType() {
+ MockExternalContext mockExternalContext = new MockExternalContext(servletContext,request, response);
+ facesContext.setExternalContext(mockExternalContext);
+
+ mockExternalContext.getRequestHeaderMap().put("Accept", "text/html");
+ String selectedContentType = HtmlRendererUtils.selectContentType(null);
+ assertEquals("text/html", selectedContentType);
+
+ mockExternalContext.getRequestHeaderMap().put("Accept", "text/*");
+ selectedContentType = HtmlRendererUtils.selectContentType(null);
+ assertEquals("text/html", selectedContentType);
+
+ mockExternalContext.getRequestHeaderMap().put("Accept", "text/xml");
+ selectedContentType = HtmlRendererUtils.selectContentType(null);
+ assertEquals("application/xhtml+xml", selectedContentType);
+ }
+
+ //shale's external context does not support playing with request header map
+ static public class MockExternalContext extends org.apache.shale.test.mock.MockExternalContext {
+
+ private Map requestHeaderMap = new HashMap();
+
+ public MockExternalContext(ServletContext context,HttpServletRequest request, HttpServletResponse response) {
+ super(context, request, response);
+ }
+
+ public Map getRequestHeaderMap() {
+ return requestHeaderMap;
+ }
+
+ public void setRequestHeaderMap(Map requestHeaderMap) {
+ this.requestHeaderMap = requestHeaderMap;
+ }
+ }
}
\ No newline at end of file
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java Thu Jul 3 14:43:52 2008
@@ -35,10 +35,10 @@
public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase implements Serializable
{
public AbstractStateUtilsTest(String name) {
- super(name);
- }
+ super(name);
+ }
- //private static final Log log = LogFactory.getLog(StateUtilsAbstractCase.class);
+ //private static final Log log = LogFactory.getLog(StateUtilsAbstractCase.class);
protected String sensitiveString;
private static final String TEST_DATA = "This is the test data.";
// 76543210
@@ -51,14 +51,14 @@
public void setUp()
{
- super.setUp();
+ super.setUp();
sensitiveString = "this is my secret";
externalContext.getApplicationMap().put(StateUtils.SERIAL_FACTORY, new DefaultSerialFactory());
}
public void tearDown()
{
- super.tearDown();
+ super.tearDown();
sensitiveString = null;
}
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java Thu Jul 3 14:43:52 2008
@@ -32,71 +32,71 @@
public class InitVector_CBCTestCase extends AbstractJsfTestCase {
- public InitVector_CBCTestCase(String name) {
- super(name);
- }
-
+ public InitVector_CBCTestCase(String name) {
+ super(name);
+ }
+
public static Test suite() {
return null; // keep this method or maven won't run it
- }
+ }
- public void setUp(){
-
- super.setUp();
-
- servletContext.addInitParameter(StateUtils.INIT_SECRET, "shouldn't matter");
+ public void setUp(){
+
+ super.setUp();
+
+ servletContext.addInitParameter(StateUtils.INIT_SECRET, "shouldn't matter");
servletContext.addInitParameter(StateUtils.INIT_ALGORITHM, "shouldn't matter either");
servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_PARAM, "CBC/PKCS5Padding");
servletContext.addInitParameter(StateUtils.INIT_SECRET_KEY_CACHE, "false");
// DO NOT UNCOMMENT THIS ! we are simulating a bad conf
- //servletContext.addInitParameter(org.apache.myfaces.shared.util.StateUtils.INIT_ALGORITHM_IV, BASE64_KEY_SIZE_16);
-
- }
+ //servletContext.addInitParameter(org.apache.myfaces.shared.util.StateUtils.INIT_ALGORITHM_IV, BASE64_KEY_SIZE_16);
+
+ }
- public void testDecryption() {
-
- byte[] sensitiveBytes = "bound to fail".getBytes();
-
- boolean exeptionThrown = false;
-
- try{
-
- StateUtils.decrypt(sensitiveBytes, externalContext);
-
- }catch(FacesException fe){
-
- exeptionThrown = true;
-
- }
-
- assertTrue("MyFaces should throw a meaningful " +
- "exception when users opt for CBC mode " +
- "encryption w/out an initialization vector.",
- exeptionThrown);
-
- }
-
- public void testEncryption() {
-
- byte[] sensitiveBytes = "bound to fail".getBytes();
-
- boolean exeptionThrown = false;
-
- try{
-
- StateUtils.encrypt(sensitiveBytes, externalContext);
-
- }catch(FacesException fe){
-
- exeptionThrown = true;
-
- }
-
- assertTrue("MyFaces should throw a meaningful " +
- "exception when users opt for CBC mode " +
- "encryption w/out an initialization vector.",
- exeptionThrown);
-
- }
-
+ public void testDecryption() {
+
+ byte[] sensitiveBytes = "bound to fail".getBytes();
+
+ boolean exeptionThrown = false;
+
+ try{
+
+ StateUtils.decrypt(sensitiveBytes, externalContext);
+
+ }catch(FacesException fe){
+
+ exeptionThrown = true;
+
+ }
+
+ assertTrue("MyFaces should throw a meaningful " +
+ "exception when users opt for CBC mode " +
+ "encryption w/out an initialization vector.",
+ exeptionThrown);
+
+ }
+
+ public void testEncryption() {
+
+ byte[] sensitiveBytes = "bound to fail".getBytes();
+
+ boolean exeptionThrown = false;
+
+ try{
+
+ StateUtils.encrypt(sensitiveBytes, externalContext);
+
+ }catch(FacesException fe){
+
+ exeptionThrown = true;
+
+ }
+
+ assertTrue("MyFaces should throw a meaningful " +
+ "exception when users opt for CBC mode " +
+ "encryption w/out an initialization vector.",
+ exeptionThrown);
+
+ }
+
}
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java?rev=673826&r1=673825&r2=673826&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java Thu Jul 3 14:43:52 2008
@@ -72,7 +72,7 @@
public void testGetMessageSeverityStringObjectArray()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
-
+
FacesMessage msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Conversion Error", msg.getSummary());
@@ -126,7 +126,7 @@
public void testGetMessageFacesContextString()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
-
+
FacesMessage msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION");
assertEquals("Conversion Error", msg.getSummary());
@@ -144,7 +144,7 @@
public void testGetMessageFacesContextStringObjectArray()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
-
+
FacesMessage msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Conversion Error", msg.getSummary());
@@ -162,7 +162,7 @@
public void testGetMessageWithBundle()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
-
+
ResourceBundle bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE,
Locale.ENGLISH);
FacesMessage msg = MessageUtils.getMessage(bundle,
@@ -177,7 +177,7 @@
public void testGetMessageWithBundleName()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
-
+
FacesMessage msg = MessageUtils.getMessage(DEFAULT_BUNDLE,
"javax.faces.component.UIInput.CONVERSION", null);
@@ -199,20 +199,20 @@
* testSubstituteParamsWithDELocale(
*/
public void testSubstituteParamsWithDELocale() {
- String paramString = MessageUtils.substituteParams(Locale.GERMANY, "currency {0,number,currency}", new Object[]{new Double(100)});
+ String paramString = MessageUtils.substituteParams(Locale.GERMANY, "currency {0,number,currency}", new Object[]{new Double(100)});
System.out.println(paramString);
- //assertEquals("currency 100,00 ",paramString); // TODO: This fails on 1.4 for some reason.
+ //assertEquals("currency 100,00 ",paramString); // TODO: This fails on 1.4 for some reason.
}
/**
* testSubstituteParamsWithGBLocale(
*/
public void testSubstituteParamsWithGBLocale() {
- String paramString = MessageUtils.substituteParams(Locale.UK, "currency {0,number,currency}", new Object[]{new Double(100)});
-
- System.out.println(paramString);
- assertEquals("currency £100.00",paramString);
+ String paramString = MessageUtils.substituteParams(Locale.UK, "currency {0,number,currency}", new Object[]{new Double(100)});
+
+ System.out.println(paramString);
+ assertEquals("currency £100.00",paramString);
}