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:18:59 UTC
svn commit: r431746 - in /myfaces/shared/trunk/core/src:
main/java/org/apache/myfaces/shared/renderkit/html/
main/java/org/apache/myfaces/shared/util/
main/java/org/apache/myfaces/shared/webapp/webxml/
test/java/org/apache/myfaces/shared/util/
Author: mkienenb
Date: Tue Aug 15 17:18:59 2006
New Revision: 431746
URL: http://svn.apache.org/viewvc?rev=431746&view=rev
Log:
MYFACES-1385 -- Clean up of dead code, imports, and unused variables in MyFaces core.
Modified:
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/util/MessageUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.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/util/InitVector_CBCTestCase.java
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=431746&r1=431745&r2=431746&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 Tue Aug 15 17:18:59 2006
@@ -912,59 +912,6 @@
}
}
- //-------------------------------------------------------------
- // 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;
- }
- }
-
public void decode(FacesContext context, UIComponent component)
{
super.decode(context, component);
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=431746&r1=431745&r2=431746&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 Tue Aug 15 17:18:59 2006
@@ -51,7 +51,6 @@
{
// nope
}
- private static final Log LOG = LogFactory.getLog(MessageUtils.class);
/** Default bundle for messages (<code>javax.faces.Messages</code>) */
private static final String DEFAULT_BUNDLE = "javax.faces.Messages";
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java?rev=431746&r1=431745&r2=431746&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java Tue Aug 15 17:18:59 2006
@@ -1,7 +1,5 @@
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;
@@ -11,7 +9,6 @@
import javax.faces.el.ValueBinding;
import java.util.Iterator;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
/**
* @author Martin Marinschek (latest modification by $Author: grantsmith $)
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=431746&r1=431745&r2=431746&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 Tue Aug 15 17:18:59 2006
@@ -34,10 +34,6 @@
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$)
@@ -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/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=431746&r1=431745&r2=431746&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 Tue Aug 15 17:18:59 2006
@@ -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){