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 03:58:33 UTC
svn commit: r511707 - in /myfaces:
core/branches/jsf12/api/src/main/java/javax/faces/component/
core/branches/jsf12/api/src/main/java/javax/faces/webapp/
core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/
core/branches/jsf12/impl/sr...
Author: dennisbyrne
Date: Sun Feb 25 18:58:32 2007
New Revision: 511707
URL: http://svn.apache.org/viewvc?view=rev&rev=511707
Log:
cleaned up some of the low hanging fruit ... unused imports, classes, methods and references
Modified:
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIForm.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentTag.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorTag.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandler.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedRuntimeExceptionManagedBeanHandlerTestCase.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmTextRendererTest.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.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/RestoreStateUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIForm.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIForm.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIForm.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIForm.java Sun Feb 25 18:58:32 2007
@@ -34,8 +34,6 @@
private boolean _submitted;
- private boolean prependId ;
-
public boolean isSubmitted()
{
return _submitted;
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java Sun Feb 25 18:58:32 2007
@@ -15,11 +15,6 @@
*/
package javax.faces.webapp;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTag;
-
/**
* see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
*
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentTag.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentTag.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentTag.java Sun Feb 25 18:58:32 2007
@@ -15,30 +15,13 @@
*/
package javax.faces.webapp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.FacesException;
-import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.context.ExternalContext;
import javax.faces.el.ValueBinding;
-import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
-
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Stack;
/**
* Base class for all JSP tags that represent a JSF UIComponent.
@@ -66,7 +49,6 @@
private String _rendered = null;
private Boolean _suppressed = null;
- private ResponseWriter _writer = null;
public UIComponentTag()
{
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorTag.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorTag.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorTag.java Sun Feb 25 18:58:32 2007
@@ -15,7 +15,6 @@
*/
package javax.faces.webapp;
-import javax.el.ValueExpression;
import javax.faces.application.Application;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java Sun Feb 25 18:58:32 2007
@@ -15,9 +15,6 @@
*/
package org.apache.myfaces.application;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.faces.FacesException;
import javax.faces.application.Application;
import javax.faces.application.NavigationHandler;
@@ -38,9 +35,8 @@
public class ActionListenerImpl
implements ActionListener
{
- private static final Log log = LogFactory.getLog(ActionListenerImpl.class);
- public void processAction(ActionEvent actionEvent) throws AbortProcessingException
+ public void processAction(ActionEvent actionEvent) throws AbortProcessingException
{
FacesContext facesContext = FacesContext.getCurrentInstance();
Application application = facesContext.getApplication();
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java Sun Feb 25 18:58:32 2007
@@ -1,11 +1,11 @@
package org.apache.myfaces.application.jsp;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
/**
* @author Bruno Aranda (latest modification by $Author$)
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java Sun Feb 25 18:58:32 2007
@@ -125,7 +125,7 @@
try
{
- Class clazz = ClassUtils.classForName(className);
+ ClassUtils.classForName(className);
}
catch (ClassNotFoundException e)
{
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Sun Feb 25 18:58:32 2007
@@ -390,47 +390,6 @@
}
}
- private String getSecondSegment(String expression, String firstSegment)
- {
- String tmp = expression.substring(firstSegment.length());
-
- if (tmp.length() == 0) {
- return null;
- }
- if (tmp.charAt(0) == '.') {
- return getFirstSegment(tmp.substring(1));
- }
- // starts with [
- tmp = tmp.substring(1).trim();
- int index;
-
- if (tmp.charAt(0) == '"') {
- index = tmp.indexOf('"', 1);
-
- if (index < 0) {
- throw new ELException(tmp);
- }
- return tmp.substring(1, index);
- }
- if (tmp.charAt(0) == '\'') {
- index = tmp.indexOf('\'', 1);
-
- if (index < 0) {
- throw new ELException(tmp);
- }
- return tmp.substring(1, index);
- }
-
- index = tmp.indexOf(']');
-
- if (index < 0) {
- throw new ELException(tmp);
- }
-
- return tmp.substring(1, index);
- }
-
-
private String[] extractExpressions(String expressionString)
{
String[] expressions = expressionString.split("\\#\\{");
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandler.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandler.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandler.java Sun Feb 25 18:58:32 2007
@@ -9,7 +9,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.config.ManagedBeanBuilder;
-import org.apache.myfaces.config.element.ManagedBean;
/**
* @see JSF spec 1.2, section 5.4
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java Sun Feb 25 18:58:32 2007
@@ -15,13 +15,13 @@
*/
package org.apache.myfaces.context.servlet;
-import org.apache.myfaces.shared_impl.util.NullEnumeration;
+import java.util.Enumeration;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import java.util.Enumeration;
-import java.util.Map;
-import javax.portlet.PortletSession;
+
+import org.apache.myfaces.shared_impl.util.NullEnumeration;
/**
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java Sun Feb 25 18:58:32 2007
@@ -20,13 +20,12 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ELResolver;
import javax.el.PropertyNotFoundException;
import javax.el.PropertyNotWritableException;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
/**
* See JSF 1.2 spec sections 5.6.1.1 and 5.6.2.1
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java Sun Feb 25 18:58:32 2007
@@ -31,8 +31,7 @@
AnnotatedManagedBeanHandler handler =
new AnnotatedManagedBeanHandler(value, scope, name);
- boolean threwUnChecked = handler.invokePreDestroy();
-
+ handler.invokePreDestroy();
}
}
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java Sun Feb 25 18:58:32 2007
@@ -12,8 +12,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.config.impl.digester.elements.ListEntries;
import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
import org.apache.myfaces.config.impl.digester.elements.ManagedProperty;
@@ -27,7 +25,6 @@
super(name);
}
- private static Log log = LogFactory.getLog(AbstractManagedBeanBuilderTestCase.class);
protected MangedBeanExample example;
// managed property values
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java Sun Feb 25 18:58:32 2007
@@ -24,8 +24,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
import org.apache.shale.test.base.AbstractJsfTestCase;
@@ -33,7 +31,6 @@
public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
{
- private Log log = LogFactory.getLog(FacesConfigValidatorTestCase.class);
private FacesConfigDispenser dispenser;
private FacesConfigUnmarshaller unmarshaller;
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java Sun Feb 25 18:58:32 2007
@@ -1,10 +1,8 @@
package org.apache.myfaces.config.annotation;
-import org.apache.myfaces.config.ManagedBeanBuilder;
-import org.apache.myfaces.config.annotation.AnnotatedManagedBeanHandler;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
-
import junit.framework.TestCase;
+
+import org.apache.myfaces.config.ManagedBeanBuilder;
/**
* @author Dennis Byrne
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java Sun Feb 25 18:58:32 2007
@@ -3,8 +3,6 @@
import junit.framework.TestCase;
import org.apache.myfaces.config.ManagedBeanBuilder;
-import org.apache.myfaces.config.annotation.AnnotatedManagedBeanHandler;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
/**
* @author Dennis Byrne
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedRuntimeExceptionManagedBeanHandlerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedRuntimeExceptionManagedBeanHandlerTestCase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedRuntimeExceptionManagedBeanHandlerTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedRuntimeExceptionManagedBeanHandlerTestCase.java Sun Feb 25 18:58:32 2007
@@ -3,8 +3,6 @@
import junit.framework.TestCase;
import org.apache.myfaces.config.ManagedBeanBuilder;
-import org.apache.myfaces.config.annotation.AnnotatedManagedBeanHandler;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
/**
* @author Dennis Byrne
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmTextRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmTextRendererTest.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmTextRendererTest.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmTextRendererTest.java Sun Feb 25 18:58:32 2007
@@ -1,16 +1,12 @@
package org.apache.myfaces.renderkit.html;
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockResponseWriter;
-import org.apache.shale.test.mock.MockRenderKitFactory;
+import java.io.StringWriter;
-import javax.faces.component.html.HtmlSelectOneRadio;
import javax.faces.component.html.HtmlInputText;
-import javax.faces.component.UISelectItems;
-import javax.faces.model.SelectItem;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.ArrayList;
+
+import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.shale.test.mock.MockRenderKitFactory;
+import org.apache.shale.test.mock.MockResponseWriter;
/**
* @author Bruno Aranda (latest modification by $Author: baranda $)
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java Sun Feb 25 18:58:32 2007
@@ -15,13 +15,14 @@
*/
package org.apache.myfaces.renderkit.html;
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockRenderKitFactory;
-import org.apache.shale.test.mock.MockResponseWriter;
+import java.io.StringWriter;
import javax.faces.application.FacesMessage;
import javax.faces.component.html.HtmlMessages;
-import java.io.StringWriter;
+
+import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.shale.test.mock.MockRenderKitFactory;
+import org.apache.shale.test.mock.MockResponseWriter;
/**
* @author Bruno Aranda (latest modification by $Author$)
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java Sun Feb 25 18:58:32 2007
@@ -91,7 +91,7 @@
try
{
- Class c1 = getClass().getClassLoader().loadClass(clazz);
+ getClass().getClassLoader().loadClass(clazz);
}
catch (ClassNotFoundException e)
@@ -99,7 +99,7 @@
try{
- Class c2 = Thread.currentThread().getContextClassLoader().loadClass(clazz);
+ Thread.currentThread().getContextClassLoader().loadClass(clazz);
}catch(ClassNotFoundException e2){
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Sun Feb 25 18:58:32 2007
@@ -15,12 +15,9 @@
*/
package org.apache.myfaces.shared.renderkit.html;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.util.ArrayUtils;
-import org.apache.myfaces.shared.util.StringUtils;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
@@ -28,10 +25,13 @@
import javax.faces.component.html.HtmlDataTable;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.ArrayUtils;
+import org.apache.myfaces.shared.util.StringUtils;
/**
* Common methods for renderers for components that subclass the standard
@@ -913,59 +913,6 @@
else
{
return (String) component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.FOOTER_CLASS_ATTR);
- }
- }
-
- //-------------------------------------------------------------
- // Helper class Styles
- //-------------------------------------------------------------
- private static class StyleIterator implements Iterator
- {
- //~ Instance fields
- // ------------------------------------------------------------------------
-
- private String[] _style;
- private int _idx = 0;
-
- //~ Constructors
- // ---------------------------------------------------------------------------
- StyleIterator(String styles)
- {
- _style = (styles == null) ? org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY : org.apache.myfaces.shared.util.StringUtils.trim(org.apache.myfaces.shared.util.StringUtils
- .splitShortString(styles, ','));
- }
-
- /**
- * @see java.util.Iterator#hasNext()
- */
- public boolean hasNext()
- {
- return _style.length > 0;
- }
-
- /**
- * @see java.util.Iterator#next()
- */
- public Object next()
- {
- if(hasNext())
- {
- return _style[_idx++ % _style.length];
- }
- throw new NoSuchElementException("no style defined");
- }
-
- /**
- * @see java.util.Iterator#remove()
- */
- public void remove()
- {
- throw new UnsupportedOperationException("remove is not supported");
- }
-
- public void reset()
- {
- _idx = 0;
}
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java Sun Feb 25 18:58:32 2007
@@ -15,14 +15,12 @@
*/
package org.apache.myfaces.shared.taglib;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-
-import javax.faces.webapp.UIComponentTag;
-import javax.faces.webapp.UIComponentELTag;
-import javax.faces.component.UIComponent;
-import javax.el.ValueExpression;
-import javax.el.ELContext;
import javax.el.MethodExpression;
+import javax.el.ValueExpression;
+import javax.faces.component.UIComponent;
+import javax.faces.webapp.UIComponentELTag;
+
+import org.apache.myfaces.shared.renderkit.JSFAttr;
/**
* @author Manfred Geiler (latest modification by $Author$)
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=511707&r1=511706&r2=511707
==============================================================================
--- 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 18:58:32 2007
@@ -15,20 +15,20 @@
*/
package org.apache.myfaces.shared.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.application.ApplicationFactory;
-import javax.faces.application.Application;
-import javax.faces.context.FacesContext;
-import javax.faces.FactoryFinder;
-
import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import javax.faces.FactoryFinder;
+import javax.faces.application.Application;
+import javax.faces.application.ApplicationFactory;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Utility class to support multilingual FacesMessages using ResourceBundles.
* Standard messages are stored at <code>DEFAULT_BUNDLE</code>.<br>
@@ -51,9 +51,8 @@
{
// nope
}
- private static final Log LOG = LogFactory.getLog(MessageUtils.class);
- /** Default bundle for messages (<code>javax.faces.Messages</code>) */
+ /** Default bundle for messages (<code>javax.faces.Messages</code>) */
private static final String DEFAULT_BUNDLE = "javax.faces.Messages";
/** Suffix for message details (<code>_detail</code>)*/
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java Sun Feb 25 18:58:32 2007
@@ -1,18 +1,15 @@
package org.apache.myfaces.shared.util;
-import org.apache.myfaces.shared.component.BindingAware;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.lang.reflect.Method;
+import java.util.Iterator;
-import javax.faces.context.FacesContext;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
-import javax.faces.el.ValueBinding;
-import javax.el.ValueExpression;
-import java.util.Iterator;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
+import javax.faces.context.FacesContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @author Martin Marinschek (latest modification by $Author: grantsmith $)
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java Sun Feb 25 18:58:32 2007
@@ -16,7 +16,6 @@
package org.apache.myfaces.shared.util;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIForm;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Sun Feb 25 18:58:32 2007
@@ -15,11 +15,19 @@
*/
package org.apache.myfaces.shared.webapp.webxml;
-import org.apache.myfaces.shared.util.xml.MyFacesErrorHandler;
-import org.apache.myfaces.shared.util.xml.XmlUtils;
-import org.apache.myfaces.shared.webapp.webxml.WebXml;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared.util.xml.MyFacesErrorHandler;
+import org.apache.myfaces.shared.util.xml.XmlUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -27,18 +35,6 @@
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import javax.faces.FacesException;
-import javax.faces.context.ExternalContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -55,7 +51,6 @@
*/
private static final String WEB_XML_PATH = "/WEB-INF/web.xml";
- private static final String DEFAULT_ENCODING = "ISO-8859-1";
private static final String WEB_APP_2_2_J2EE_SYSTEM_ID = "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";
private static final String WEB_APP_2_2_SYSTEM_ID = "http://java.sun.com/dtd/web-app_2_2.dtd";
Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java?view=diff&rev=511707&r1=511706&r2=511707
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java Sun Feb 25 18:58:32 2007
@@ -58,7 +58,7 @@
try{
- byte[] secure = StateUtils.decrypt(sensitiveBytes, externalContext);
+ StateUtils.decrypt(sensitiveBytes, externalContext);
}catch(FacesException fe){
@@ -81,7 +81,7 @@
try{
- byte[] secure = StateUtils.encrypt(sensitiveBytes, externalContext);
+ StateUtils.encrypt(sensitiveBytes, externalContext);
}catch(FacesException fe){