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 03:14:44 UTC
svn commit: r431755 - in /myfaces/tomahawk/trunk/core/src:
main/java/org/apache/myfaces/component/html/ext/
main/java/org/apache/myfaces/component/html/util/
main/java/org/apache/myfaces/custom/buffer/
main/java/org/apache/myfaces/custom/calendar/ main...
Author: mkienenb
Date: Tue Aug 15 18:14:42 2006
New Revision: 431755
URL: http://svn.apache.org/viewvc?rev=431755&view=rev
Log:
TOMAHAWK-603 -- Clean up of dead code, imports, and unused variables in MyFaces Tomahawk.
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingResourceLoader.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/Buffer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/BufferRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/document/DocumentBodyRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlCommandNavigation.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItem.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeWalkerBase.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParser.java
myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java
myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeTest.java
myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java
myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java
myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java Tue Aug 15 18:14:42 2006
@@ -688,7 +688,6 @@
public Object saveState(FacesContext context)
{
boolean preserveSort = isPreserveSort();
- boolean sortable = isSortable();
Object values[] = new Object[33];
values[0] = super.saveState(context);
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java Tue Aug 15 18:14:42 2006
@@ -23,8 +23,6 @@
import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* <p>Utility class for providing basic functionality to the HTML faces
@@ -35,8 +33,6 @@
*/
public final class HtmlComponentUtils
{
- private static Log log = LogFactory.getLog(HtmlComponentUtils.class);
-
/**
* Constructor (Private)
*/
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingResourceLoader.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingResourceLoader.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/StreamingResourceLoader.java Tue Aug 15 18:14:42 2006
@@ -23,7 +23,6 @@
{
int pos = resourceUri.indexOf("/");
Long requestId = new Long(Long.parseLong(resourceUri.substring(0, pos), 10));
- String resourceType = resourceUri.substring(pos+1);
StreamingAddResource.HeaderInfoEntry headerInfoEntry = StreamingAddResource.getHeaderInfo(requestId);
if (headerInfoEntry == null)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/Buffer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/Buffer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/Buffer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/Buffer.java Tue Aug 15 18:14:42 2006
@@ -18,8 +18,6 @@
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import javax.faces.render.Renderer;
-import java.io.IOException;
/**
* @author Sylvain Vieujot (latest modification by $Author$)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/BufferRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/BufferRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/BufferRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/buffer/BufferRenderer.java Tue Aug 15 18:14:42 2006
@@ -20,7 +20,6 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
import javax.faces.render.Renderer;
import org.apache.commons.logging.Log;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Tue Aug 15 18:14:42 2006
@@ -55,7 +55,6 @@
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
import org.apache.myfaces.shared_tomahawk.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared_tomahawk.util.MessageUtils;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
/**
* @author Martin Marinschek (latest modification by $Author$)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/HtmlSimpleColumn.java Tue Aug 15 18:14:42 2006
@@ -16,10 +16,8 @@
package org.apache.myfaces.custom.column;
import javax.faces.component.UIColumn;
-import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import org.apache.myfaces.component.html.ext.HtmlDataTable;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java Tue Aug 15 18:14:42 2006
@@ -27,8 +27,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRenderer;
@@ -40,8 +38,6 @@
*/
public class HtmlDataScrollerRenderer extends HtmlRenderer
{
- private static final Log log = LogFactory.getLog(HtmlDataScrollerRenderer.class);
-
public static final String RENDERER_TYPE = "org.apache.myfaces.DataScroller";
protected static final String PAGE_NAVIGATION = "idx".intern();
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/document/DocumentBodyRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/document/DocumentBodyRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/document/DocumentBodyRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/document/DocumentBodyRenderer.java Tue Aug 15 18:14:42 2006
@@ -17,12 +17,8 @@
import java.io.IOException;
-import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.renderkit.html.util.ExtensionsPhaseListener;
/**
@@ -34,8 +30,6 @@
*/
public class DocumentBodyRenderer extends AbstractDocumentRenderer
{
- private static final Log log = LogFactory.getLog(DocumentBodyRenderer.class);
-
public static final String RENDERER_TYPE = "org.apache.myfaces.DocumentBody";
protected String getHtmlTag()
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java Tue Aug 15 18:14:42 2006
@@ -30,7 +30,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.context.ExternalContext;
-import javax.faces.render.Renderer;
import javax.faces.convert.ConverterException;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java Tue Aug 15 18:14:42 2006
@@ -17,10 +17,8 @@
import org.apache.myfaces.component.UserRoleAware;
import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.shared_tomahawk.util.MessageUtils;
import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-import javax.faces.application.FacesMessage;
import javax.faces.component.html.HtmlInputText;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlCommandNavigation.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlCommandNavigation.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlCommandNavigation.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlCommandNavigation.java Tue Aug 15 18:14:42 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.custom.navigation;
import org.apache.myfaces.component.html.ext.HtmlCommandLink;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java Tue Aug 15 18:14:42 2006
@@ -29,10 +29,7 @@
{
private static final String ICON_ATTR = "icon";
- private static final String ACTION_ATTR = "action";
private static final String SPLIT_ATTR = "split";
- private static final String OPEN_ATTR = "open";
- private static final String ACTIVE_ATTR = "active";
private static final String TARGET_ATTR = "target";
private static final String DISABLED_ATTR = "disabled";
private static final String DISABLED_STYLE_ATTR = "disabledStyle";
@@ -44,8 +41,6 @@
private String _actionListener;
private String _immediate;
private String _split;
- private String _open;
- private String _active;
private String _target;
private String _disabled;
private String _disabledStyle;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItem.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItem.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItem.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItem.java Tue Aug 15 18:14:42 2006
@@ -241,20 +241,6 @@
return value.split(",");
}
- private void openParents() {
- UIComponent comp = this;
-
- while ((comp = comp.getParent()) instanceof HtmlCommandNavigationItem) {
- HtmlCommandNavigationItem parent = (HtmlCommandNavigationItem) comp;
- if (!parent.isOpen()) {
- parent.setOpen(true);
- }
- else {
- return;
- }
- }
- }
-
public void deactivateAll() {
UIComponent parent = this.getParent();
while (!(parent instanceof HtmlPanelNavigationMenu) && parent != null) {
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java Tue Aug 15 18:14:42 2006
@@ -26,21 +26,16 @@
import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.ext.HtmlLinkRenderer;
import javax.faces.component.*;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.event.ActionListener;
import javax.faces.el.ValueBinding;
-import javax.faces.event.ActionListener;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
/**
* Many thanks to the guys from Swiss Federal Institute of Intellectual Property & Marc Bouquet
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java Tue Aug 15 18:14:42 2006
@@ -34,11 +34,8 @@
import javax.faces.event.ActionEvent;
import java.util.List;
import java.util.Iterator;
-import java.util.Map;
import java.io.IOException;
-import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
-
/**
* @author Thomas Spiegl
* @author Manfred Geiler
@@ -61,7 +58,6 @@
if (!child.isRendered()) continue;
if (child instanceof UINavigationMenuItem) {
- UINavigationMenuItem navItem = (UINavigationMenuItem) child;
renderChildrenListLayout(facesContext, writer, panelNav, child.getChildren(), level);
}
if (child instanceof HtmlCommandNavigationItem) {
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java Tue Aug 15 18:14:42 2006
@@ -22,7 +22,6 @@
import org.apache.myfaces.custom.navmenu.UINavigationMenuItem;
import org.apache.myfaces.renderkit.html.util.AddResource;
import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
import org.apache.myfaces.shared_tomahawk.el.SimpleActionMethodBinding;
import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java Tue Aug 15 18:14:42 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.custom.sortheader;
import java.io.IOException;
-import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java Tue Aug 15 18:14:42 2006
@@ -27,7 +27,6 @@
private String description;
private boolean leaf;
private String identifier;
- private TreeNode parent;
public TreeNodeBase()
{}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeWalkerBase.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeWalkerBase.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeWalkerBase.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeWalkerBase.java Tue Aug 15 18:14:42 2006
@@ -18,7 +18,6 @@
import org.apache.commons.lang.StringUtils;
import java.util.Stack;
-import java.util.List;
/**
* A base implementation of the {@link TreeWalker} interface. Uses a simple node naming
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java Tue Aug 15 18:14:42 2006
@@ -19,8 +19,6 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import java.util.Hashtable;
-import java.util.Enumeration;
import java.util.Map;
import javax.faces.component.UIComponent;
@@ -43,13 +41,8 @@
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlTableRendererBase;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
-import java.io.IOException;
import java.util.*;
/**
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java Tue Aug 15 18:14:42 2006
@@ -16,10 +16,6 @@
package org.apache.myfaces.renderkit.html.util;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -33,9 +29,6 @@
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,8 +37,6 @@
import org.apache.myfaces.shared_tomahawk.util.ClassUtils;
import org.apache.myfaces.shared_tomahawk.webapp.webxml.WebXml;
import org.apache.myfaces.webapp.filter.ExtensionsFilter;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* This class provides the ability to instantiate AddResource objects. By
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParser.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParser.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParser.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParser.java Tue Aug 15 18:14:42 2006
@@ -308,7 +308,6 @@
String consumeAttrValue()
{
consumeWhitespace();
- char singleQuote = '\'';
if (consumeMatch("'"))
{
@@ -568,7 +567,7 @@
// html can have "stand-alone" attributes with no following equals sign
if (consumeMatch("="))
{
- String attrValue = consumeAttrValue();
+ consumeAttrValue();
}
}
}
Modified: myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java (original)
+++ myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java Tue Aug 15 18:14:42 2006
@@ -16,16 +16,10 @@
package org.apache.myfaces.custom.tree2;
-import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
-import org.apache.shale.test.mock.MockResponseWriter;
-
-import com.meterware.httpunit.WebResponse;
import junit.framework.Test;
import junit.framework.TestSuite;
import java.util.Stack;
-import java.io.BufferedWriter;
-import java.io.CharArrayWriter;
/**
* - .. Root (0)
Modified: myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeTest.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeTest.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeTest.java (original)
+++ myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeTest.java Tue Aug 15 18:14:42 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.custom.tree2;
-import org.apache.shale.test.base.AbstractJsfTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java (original)
+++ myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java Tue Aug 15 18:14:42 2006
@@ -17,8 +17,6 @@
package org.apache.myfaces.custom.tree2;
-import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
-
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java (original)
+++ myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java Tue Aug 15 18:14:42 2006
@@ -53,7 +53,7 @@
assertNotSame(instance1, instance2);
*/
- AddResource instance1a = AddResourceFactory.getInstance(cacheMap, "/test1", null);
+ AddResourceFactory.getInstance(cacheMap, "/test1", null);
}
public void setUp()
Modified: myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java?rev=431755&r1=431754&r2=431755&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java (original)
+++ myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java Tue Aug 15 18:14:42 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){