You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2007/02/26 05:02:55 UTC
svn commit: r511714 - in
/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared:
config/ renderkit/ renderkit/html/ renderkit/html/util/ taglib/ util/
util/xml/
Author: dennisbyrne
Date: Sun Feb 25 20:02:54 2007
New Revision: 511714
URL: http://svn.apache.org/viewvc?view=rev&rev=511714
Log:
cleaned up more low hanging fruit, code reduction, extra else blocks
Modified:
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Sun Feb 25 20:02:54 2007
@@ -158,10 +158,9 @@
if (log.isInfoEnabled()) log.info("No context init parameter '" + paramName + "' found, using default value " + defaultValue); //defaultValue==null should not be a problem here
return defaultValue;
}
- else
- {
- return strValue;
- }
+
+ return strValue;
+
}
public boolean isPrettyHtml()
@@ -226,14 +225,8 @@
public static String getAddResourceClassFromServletContext(ServletContext servletContext)
{
String addResourceClass = servletContext.getInitParameter(INIT_PARAM_ADD_RESOURCE_CLASS);
- if (addResourceClass == null)
- {
- return INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT;
- }
- else
- {
- return addResourceClass;
- }
+
+ return addResourceClass == null ? INIT_PARAM_ADD_RESOURCE_CLASS_DEFAULT : addResourceClass;
}
/**
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Sun Feb 25 20:02:54 2007
@@ -150,11 +150,10 @@
{
return (Boolean) value;
}
- else
- {
- throw new IllegalArgumentException("Expected submitted value of type Boolean for Component : "+
+
+ throw new IllegalArgumentException("Expected submitted value of type Boolean for Component : "+
getPathToComponent(component));
- }
+
}
public static Date getDateValue(UIComponent component)
@@ -164,11 +163,9 @@
{
return (Date) value;
}
- else
- {
- throw new IllegalArgumentException("Expected submitted value of type Date for component : "
+
+ throw new IllegalArgumentException("Expected submitted value of type Date for component : "
+getPathToComponent(component));
- }
}
public static Object getObjectValue(UIComponent component)
@@ -211,11 +208,9 @@
log.info("returning 1 '" + submittedValue + "'");
return (String)submittedValue;
}
- else
- {
- throw new IllegalArgumentException("Expected submitted value of type String for component : "
+
+ throw new IllegalArgumentException("Expected submitted value of type String for component : "
+getPathToComponent(component));
- }
}
}
@@ -244,17 +239,15 @@
log.info("returning an empty string");
return "";
}
- else
- {
- log.info("returning an .toString");
- return value.toString();
- }
- }
- else
- {
- log.info("returning converter get as string " + converter);
- return converter.getAsString(facesContext, component, value);
+
+ log.info("returning an .toString");
+ return value.toString();
+
}
+
+ log.info("returning converter get as string " + converter);
+ return converter.getAsString(facesContext, component, value);
+
}
catch(PropertyNotFoundException ex)
{
@@ -600,14 +593,13 @@
{
return Collections.EMPTY_SET;
}
- else
- {
- HashSet set = new HashSet(HashMapUtils.calcCapacity(lst.size()));
- for(Iterator i =lst.iterator(); i.hasNext(); )
- set.add( getConvertedStringValue(context, component, converter, i.next()) );
- return set;
- }
+ HashSet set = new HashSet(HashMapUtils.calcCapacity(lst.size()));
+ for(Iterator i =lst.iterator(); i.hasNext(); )
+ set.add( getConvertedStringValue(context, component, converter, i.next()) );
+
+ return set;
+
}
else
{
@@ -642,19 +634,9 @@
throw new ConverterException(e);
}
- if (converter == null)
- {
- //No conversion needed
- return submittedValue;
- }
- else
- {
- //Conversion
- return converter.getAsObject(facesContext, output, (String)submittedValue);
- }
+ return converter == null ? submittedValue : converter.getAsObject(facesContext, output, (String)submittedValue);
}
-
public static Object getConvertedUISelectManyValue(FacesContext facesContext,
UISelectMany selectMany,
Object submittedValue)
@@ -664,14 +646,13 @@
{
return null;
}
- else
+
+ if (!(submittedValue instanceof String[]))
{
- if (!(submittedValue instanceof String[]))
- {
- throw new ConverterException("Submitted value of type String[] for component : "
- + getPathToComponent(selectMany) + "expected");
- }
+ throw new ConverterException("Submitted value of type String[] for component : "
+ + getPathToComponent(selectMany) + "expected");
}
+
return org.apache.myfaces.shared.renderkit._SharedRendererUtils.getConvertedUISelectManyValue(facesContext,
selectMany,
(String[])submittedValue);
@@ -822,25 +803,17 @@
//absolute id path
return forAttr.substring(1);
}
- else
- {
- //relative id path, we assume a component on the same level as the label component
- String labelClientId = uiComponent.getClientId(facesContext);
- int colon = labelClientId.lastIndexOf(UINamingContainer.SEPARATOR_CHAR);
- if (colon == -1)
- {
- return forAttr;
- }
- else
- {
- return labelClientId.substring(0, colon + 1)+forAttr;
- }
- }
- }
- else
- {
- return forComponent.getClientId(facesContext);
+
+ //relative id path, we assume a component on the same level as the label component
+ String labelClientId = uiComponent.getClientId(facesContext);
+ int colon = labelClientId.lastIndexOf(UINamingContainer.SEPARATOR_CHAR);
+
+ return colon == -1 ? forAttr : labelClientId.substring(0, colon + 1)+forAttr;
+
}
+
+ return forComponent.getClientId(facesContext);
+
}
public static List convertIdsToClientIds(String actionFor, FacesContext facesContext, UIComponent component)
@@ -990,10 +963,9 @@
{
throw new IllegalStateException("Factory is null");
}
- else
- {
- requestMap.put(ResponseStateManager.RENDER_KIT_ID_PARAM, factory);
- }
+
+ requestMap.put(ResponseStateManager.RENDER_KIT_ID_PARAM, factory);
+
renderKit = factory.getRenderKit(facesContext, renderKitId);
}
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java Sun Feb 25 20:02:54 2007
@@ -193,17 +193,16 @@
}
return convertedValues;
}
- else
+
+ //Object array
+ int len = submittedValue.length;
+ ArrayList convertedValues = new ArrayList(len);
+ for (int i = 0; i < len; i++)
{
- //Object array
- int len = submittedValue.length;
- ArrayList convertedValues = new ArrayList(len);
- for (int i = 0; i < len; i++)
- {
- convertedValues.add(i, converter.getAsObject(facesContext, component, submittedValue[i]));
- }
- return convertedValues.toArray((Object[]) Array.newInstance(arrayComponentType, len));
+ convertedValues.add(i, converter.getAsObject(facesContext, component, submittedValue[i]));
}
+ return convertedValues.toArray((Object[]) Array.newInstance(arrayComponentType, len));
+
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java Sun Feb 25 20:02:54 2007
@@ -222,10 +222,9 @@
{
return ((HtmlCommandButton)uiComponent).isDisabled();
}
- else
- {
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
- }
+
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
+
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Sun Feb 25 20:02:54 2007
@@ -130,9 +130,9 @@
protected String getLayout(UISelectMany selectMany) {
if (selectMany instanceof HtmlSelectManyCheckbox) {
return ((HtmlSelectManyCheckbox) selectMany).getLayout();
- } else {
- return (String) selectMany.getAttributes().get(JSFAttr.LAYOUT_ATTR);
- }
+ }
+
+ return (String) selectMany.getAttributes().get(JSFAttr.LAYOUT_ATTR);
}
protected void renderGroupOrItemCheckbox(FacesContext facesContext,
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Sun Feb 25 20:02:54 2007
@@ -114,10 +114,9 @@
{
return ((HtmlCommandLink)link).getStyle();
}
- else
- {
- return (String)link.getAttributes().get(HTML.STYLE_ATTR);
- }
+
+ return (String)link.getAttributes().get(HTML.STYLE_ATTR);
+
}
/**
@@ -129,10 +128,9 @@
{
return ((HtmlCommandLink)link).getStyleClass();
}
- else
- {
- return (String)link.getAttributes().get(HTML.STYLE_CLASS_ATTR);
- }
+
+ return (String)link.getAttributes().get(HTML.STYLE_CLASS_ATTR);
+
}
public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java Sun Feb 25 20:02:54 2007
@@ -260,10 +260,9 @@
{
return ((UIMessage) component).getFor();
}
- else
- {
- return (String) component.getAttributes().get(JSFAttr.FOR_ATTR);
- }
+
+ return (String) component.getAttributes().get(JSFAttr.FOR_ATTR);
+
}
protected String getTitle(UIComponent component)
@@ -272,10 +271,9 @@
{
return ((HtmlMessage) component).getTitle();
}
- else
- {
- return (String) component.getAttributes().get(JSFAttr.TITLE_ATTR);
- }
+
+ return (String) component.getAttributes().get(JSFAttr.TITLE_ATTR);
+
}
protected boolean isTooltip(UIComponent component)
@@ -284,10 +282,9 @@
{
return ((HtmlMessage) component).isTooltip();
}
- else
- {
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.TOOLTIP_ATTR, false);
- }
+
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.TOOLTIP_ATTR, false);
+
}
protected boolean isShowSummary(UIComponent component)
@@ -296,10 +293,9 @@
{
return ((UIMessage) component).isShowSummary();
}
- else
- {
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_SUMMARY_ATTR, false);
- }
+
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_SUMMARY_ATTR, false);
+
}
protected boolean isShowDetail(UIComponent component)
@@ -308,11 +304,9 @@
{
return ((UIMessage) component).isShowDetail();
}
- else
- {
- return RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_DETAIL_ATTR, false);
- }
- }
+ return RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_DETAIL_ATTR, false);
+
+ }
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java Sun Feb 25 20:02:54 2007
@@ -87,10 +87,9 @@
{
return ((HtmlInputSecret)uiComponent).isDisabled();
}
- else
- {
- return RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
- }
+
+ return RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
+
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java Sun Feb 25 20:02:54 2007
@@ -161,10 +161,9 @@
{
return ((HtmlInputText)component).isDisabled();
}
- else
- {
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, HTML.DISABLED_ATTR, false);
- }
+
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, HTML.DISABLED_ATTR, false);
+
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java Sun Feb 25 20:02:54 2007
@@ -74,10 +74,9 @@
{
return ((HtmlInputTextarea)uiComponent).isDisabled();
}
- else
- {
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
- }
+
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
+
}
public void decode(FacesContext facesContext, UIComponent component)
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java Sun Feb 25 20:02:54 2007
@@ -222,35 +222,20 @@
}
}
- if (sb == null)
- {
- return string;
- }
- else
- {
- return sb.toString();
- }
+ return sb == null ? string : sb.toString();
+
}
-
public static boolean isJavascriptAllowed(ExternalContext externalContext)
{
MyfacesConfig myfacesConfig = MyfacesConfig.getCurrentInstance(externalContext);
if (myfacesConfig.isAllowJavascript())
{
- if (myfacesConfig.isDetectJavascript())
- {
- return isJavascriptDetected(externalContext);
- }
- else
- {
- return true;
- }
- }
- else
- {
- return false;
+ return myfacesConfig.isDetectJavascript() ? isJavascriptDetected(externalContext) : true;
}
+
+ return false;
+
}
public static void setJavascriptDetected(HttpSession session, boolean value)
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java Sun Feb 25 20:02:54 2007
@@ -372,14 +372,7 @@
*/
public static Object evaluateValueExpression(ELContext elContext, ValueExpression valueExpression )
{
- if (valueExpression.isLiteralText())
- {
- return valueExpression.getExpressionString();
- }
- else
- {
- return valueExpression.getValue(elContext);
- }
+ return valueExpression.isLiteralText() ? valueExpression.getExpressionString() : valueExpression.getValue(elContext);
}
/**
@@ -389,18 +382,18 @@
{
if (valueExpression.isLiteralText()){
return Boolean.valueOf(valueExpression.getExpressionString());
- } else {
- return (Boolean) valueExpression.getValue(elContext);
}
+
+ return (Boolean) valueExpression.getValue(elContext);
}
public static Integer getIntegerValue(ELContext elContext, ValueExpression valueExpression)
{
if (valueExpression.isLiteralText()){
return Integer.valueOf(valueExpression.getExpressionString());
- } else {
- return (Integer) valueExpression.getValue(elContext);
}
+
+ return (Integer) valueExpression.getValue(elContext);
}
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java Sun Feb 25 20:02:54 2007
@@ -191,10 +191,9 @@
Class componentTypeClass = classForName(componentType);
return Array.newInstance(componentTypeClass, 0).getClass();
}
- else
- {
- return classForName(type);
- }
+
+ return classForName(type);
+
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java Sun Feb 25 20:02:54 2007
@@ -158,7 +158,7 @@
if(locale != null)
{
mf.setLocale(locale);
- b.append(mf.format(((Object) (params))));
+ b.append(mf.format(params));
localizedStr = b.toString();
}
return localizedStr;
@@ -368,11 +368,10 @@
if(message != null)
{
return message;
- } else
- {
- locale = Locale.getDefault();
- return getMessage(locale, messageId, params);
- }
+ }
+
+ return getMessage(Locale.getDefault(), messageId, params);
+
}
private static Application getApplication()
@@ -381,10 +380,10 @@
if(context != null)
{
return FacesContext.getCurrentInstance().getApplication();
- } else
- {
- ApplicationFactory afactory = (ApplicationFactory)FactoryFinder.getFactory("javax.faces.application.ApplicationFactory");
- return afactory.getApplication();
- }
+ }
+
+ ApplicationFactory afactory = (ApplicationFactory)FactoryFinder.getFactory("javax.faces.application.ApplicationFactory");
+ return afactory.getApplication();
+
}
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java Sun Feb 25 20:02:54 2007
@@ -460,29 +460,27 @@
return symmetric(data, secret, _algorithm, _algorithmParams, iv, mode);
- }else{
-
- Object object = ctx.getApplicationMap().get(INIT_SECRET_KEY_CACHE);
-
- if( object == null )
- throw new NullPointerException("The context parameter '"
- + INIT_SECRET_KEY_CACHE + "' is not set to false, "
- + "yet there is nothing stored in the application map "
- + "w/ the following key '" + INIT_SECRET_KEY_CACHE + "'. "
- + "It was either not placed there by StartupServletContextListener "
- + "or something has removed it.");
-
- if( ! ( object instanceof SecretKey ) )
- throw new ClassCastException("Did not find an instance of SecretKey "
- + "in application scope using the key '" + INIT_SECRET_KEY_CACHE + "'");
-
- if(log.isDebugEnabled())
- log.debug("using cached SecretKey");
-
- return symmetric(data, (SecretKey)object, _algorithm, _algorithmParams, iv, mode);
-
}
+
+ Object object = ctx.getApplicationMap().get(INIT_SECRET_KEY_CACHE);
+
+ if( object == null )
+ throw new NullPointerException("The context parameter '"
+ + INIT_SECRET_KEY_CACHE + "' is not set to false, "
+ + "yet there is nothing stored in the application map "
+ + "w/ the following key '" + INIT_SECRET_KEY_CACHE + "'. "
+ + "It was either not placed there by StartupServletContextListener "
+ + "or something has removed it.");
+
+ if( ! ( object instanceof SecretKey ) )
+ throw new ClassCastException("Did not find an instance of SecretKey "
+ + "in application scope using the key '" + INIT_SECRET_KEY_CACHE + "'");
+ if(log.isDebugEnabled())
+ log.debug("using cached SecretKey");
+
+ return symmetric(data, (SecretKey)object, _algorithm, _algorithmParams, iv, mode);
+
}
/**
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java?view=diff&rev=511714&r1=511713&r2=511714
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java Sun Feb 25 20:02:54 2007
@@ -73,10 +73,9 @@
{
return null;
}
- else
- {
- return getElementText((Element)nodeList.item(len - 1));
- }
+
+ return getElementText((Element)nodeList.item(len - 1));
+
}
@@ -94,15 +93,14 @@
{
return Collections.EMPTY_LIST;
}
- else
+
+ List list = new ArrayList(len);
+ for (int i = 0; i < len; i++)
{
- List list = new ArrayList(len);
- for (int i = 0; i < len; i++)
- {
- list.add(getElementText((Element)nodeList.item(i)));
- }
- return list;
+ list.add(getElementText((Element)nodeList.item(i)));
}
+ return list;
+
}
}