You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mk...@apache.org on 2006/08/16 02:19:10 UTC
svn commit: r431747 - in /myfaces/core/trunk/impl/src:
main/java/org/apache/myfaces/application/
main/java/org/apache/myfaces/config/ main/java/org/apache/myfaces/el/
main/java/org/apache/myfaces/lifecycle/
main/java/org/apache/myfaces/renderkit/html/ ...
Author: mkienenb
Date: Tue Aug 15 17:19:09 2006
New Revision: 431747
URL: http://svn.apache.org/viewvc?rev=431747&view=rev
Log:
MYFACES-1385 -- Clean up of dead code, imports, and unused variables in MyFaces core.
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ValueBindingImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java Tue Aug 15 17:19:09 2006
@@ -38,8 +38,6 @@
public class ActionListenerImpl
implements ActionListener
{
- private static final Log log = LogFactory.getLog(ActionListenerImpl.class);
-
public void processAction(ActionEvent actionEvent) throws AbortProcessingException
{
FacesContext facesContext = FacesContext.getCurrentInstance();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java Tue Aug 15 17:19:09 2006
@@ -125,7 +125,7 @@
try
{
- Class clazz = ClassUtils.classForName(className);
+ ClassUtils.classForName(className);
}
catch (ClassNotFoundException e)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Tue Aug 15 17:19:09 2006
@@ -41,7 +41,6 @@
*/
public class ManagedBeanBuilder
{
- private static Log log = LogFactory.getLog(ManagedBeanBuilder.class);
private RuntimeConfig _runtimeConfig;
@@ -348,47 +347,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 EvaluationException(tmp);
- }
- return tmp.substring(1, index);
- }
- if (tmp.charAt(0) == '\'') {
- index = tmp.indexOf('\'', 1);
-
- if (index < 0) {
- throw new EvaluationException(tmp);
- }
- return tmp.substring(1, index);
- }
-
- index = tmp.indexOf(']');
-
- if (index < 0) {
- throw new EvaluationException(tmp);
- }
-
- return tmp.substring(1, index);
- }
-
private String[] extractExpressions(String expressionString)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ValueBindingImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ValueBindingImpl.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ValueBindingImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ValueBindingImpl.java Tue Aug 15 17:19:09 2006
@@ -500,13 +500,6 @@
return new Object[] {base, index};
}
- private Object coerce(Object value, Class clazz) throws ELException
- {
- return (value == null) ? null
- : (clazz == null) ? value :
- Coercions.coerce(value, clazz, ELParserHelper.LOGGER);
- }
-
protected RuntimeConfig getRuntimeConfig(FacesContext facesContext)
{
if (_runtimeConfig == null)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Tue Aug 15 17:19:09 2006
@@ -28,7 +28,6 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
import javax.faces.lifecycle.Lifecycle;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java Tue Aug 15 17:19:09 2006
@@ -42,7 +42,6 @@
private static final String VIEWID_PARAM = "jsf_viewid";
private static final String BASE64_TREE_PARAM = "jsf_tree_64";
private static final String BASE64_STATE_PARAM = "jsf_state_64";
- private static final String ZIP_CHARSET = "ISO-8859-1";
public void writeState(FacesContext facescontext,
StateManager.SerializedView serializedview) throws IOException
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java Tue Aug 15 17:19:09 2006
@@ -30,7 +30,6 @@
public abstract class AbstractManagedBeanBuilderTestCase extends TestCase {
- private static Log log = LogFactory.getLog(AbstractManagedBeanBuilderTestCase.class);
protected MangedBeanExample example;
// managed property values
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java Tue Aug 15 17:19:09 2006
@@ -33,7 +33,6 @@
public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
{
- private Log log = LogFactory.getLog(FacesConfigValidatorTestCase.class);
private FacesConfigDispenser dispenser;
private FacesConfigUnmarshaller unmarshaller;
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java?rev=431747&r1=431746&r2=431747&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java Tue Aug 15 17:19:09 2006
@@ -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){