You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2005/07/12 17:56:13 UTC
svn commit: r215977 - in
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces: application/jsp/
component/html/ext/ component/html/util/ custom/buffer/
custom/collapsiblepanel/ custom/datascroller/ custom/inputTextHelp/
custom/jslistener/ custom/newspap...
Author: grantsmith
Date: Tue Jul 12 08:56:11 2005
New Revision: 215977
URL: http://svn.apache.org/viewcvs?rev=215977&view=rev
Log:
MYFACES-322: Removed:
- all unused imports
- unused local variables
- unnecessary object creation
- unused methods (not removed, just commented out)
(Patches by James L. Mitchell)
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/application/jsp/JspTilesViewHandlerImpl.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/buffer/BufferRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/application/jsp/JspTilesViewHandlerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/application/jsp/JspTilesViewHandlerImpl.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/application/jsp/JspTilesViewHandlerImpl.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/application/jsp/JspTilesViewHandlerImpl.java Tue Jul 12 08:56:11 2005
@@ -15,11 +15,9 @@
*/
package org.apache.myfaces.application.jsp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.*;
-import org.apache.myfaces.webapp.webxml.WebXml;
-import org.apache.myfaces.webapp.webxml.ServletMapping;
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
import javax.faces.FacesException;
import javax.faces.application.ViewHandler;
@@ -32,9 +30,18 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.webapp.webxml.ServletMapping;
+import org.apache.myfaces.webapp.webxml.WebXml;
+import org.apache.struts.tiles.ComponentContext;
+import org.apache.struts.tiles.ComponentDefinition;
+import org.apache.struts.tiles.Controller;
+import org.apache.struts.tiles.DefinitionsFactory;
+import org.apache.struts.tiles.DefinitionsFactoryConfig;
+import org.apache.struts.tiles.DefinitionsFactoryException;
+import org.apache.struts.tiles.TilesUtil;
/**
* @author Thomas Spiegl
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java Tue Jul 12 08:56:11 2005
@@ -21,7 +21,6 @@
import java.util.List;
import java.util.Map;
-import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
@@ -338,59 +337,62 @@
_isDataModelRestored = false;
}
- /**
- * TODO: We could perhaps optimize this if we know we are derived from MyFaces UIData implementation
- */
- private boolean isAllChildrenAndFacetsValid()
- {
- int first = getFirst();
- int rows = getRows();
- int last;
- if (rows == 0)
- {
- last = getRowCount();
- }
- else
- {
- last = first + rows;
- }
- try
- {
- for (int rowIndex = first; rowIndex < last; rowIndex++)
- {
- setRowIndex(rowIndex);
- if (isRowAvailable())
- {
- if (!isAllEditableValueHoldersValidRecursive(getFacetsAndChildren()))
- {
- return false;
- }
- }
- }
- }
- finally
- {
- setRowIndex(-1);
- }
- return true;
- }
-
- private boolean isAllEditableValueHoldersValidRecursive(Iterator facetsAndChildrenIterator)
- {
- while (facetsAndChildrenIterator.hasNext())
- {
- UIComponent c = (UIComponent) facetsAndChildrenIterator.next();
- if (c instanceof EditableValueHolder && !((EditableValueHolder) c).isValid())
- {
- return false;
- }
- if (!isAllEditableValueHoldersValidRecursive(c.getFacetsAndChildren()))
- {
- return false;
- }
- }
- return true;
- }
+// (this is not called from anywhere)
+// /**
+// * TODO: We could perhaps optimize this if we know we are derived from MyFaces UIData implementation
+// */
+// private boolean isAllChildrenAndFacetsValid()
+// {
+// int first = getFirst();
+// int rows = getRows();
+// int last;
+// if (rows == 0)
+// {
+// last = getRowCount();
+// }
+// else
+// {
+// last = first + rows;
+// }
+// try
+// {
+// for (int rowIndex = first; rowIndex < last; rowIndex++)
+// {
+// setRowIndex(rowIndex);
+// if (isRowAvailable())
+// {
+// if (!isAllEditableValueHoldersValidRecursive(getFacetsAndChildren()))
+// {
+// return false;
+// }
+// }
+// }
+// }
+// finally
+// {
+// setRowIndex(-1);
+// }
+// return true;
+// }
+//
+
+// (this is not called from anywhere)
+// private boolean isAllEditableValueHoldersValidRecursive(Iterator facetsAndChildrenIterator)
+// {
+// while (facetsAndChildrenIterator.hasNext())
+// {
+// UIComponent c = (UIComponent) facetsAndChildrenIterator.next();
+// if (c instanceof EditableValueHolder && !((EditableValueHolder) c).isValid())
+// {
+// return false;
+// }
+// if (!isAllEditableValueHoldersValidRecursive(c.getFacetsAndChildren()))
+// {
+// return false;
+// }
+// }
+// return true;
+// }
public void encodeBegin(FacesContext context) throws IOException
{
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java Tue Jul 12 08:56:11 2005
@@ -42,8 +42,6 @@
private static final Class OBJECT_ARRAY_CLASS = (new Object[0]).getClass();
- private static final Integer INTEGER_MINUS1 = new Integer(-1);
-
private int _rowIndex = -1;
// will be set to false if the _rowstate and _datamodel should not be saved
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java Tue Jul 12 08:56:11 2005
@@ -32,8 +32,6 @@
*/
public class HtmlComponentUtils
{
- private static final String TRUE = "true";
- private static final String KEY_COMPONENT_ID_MAP = "KEY_COMPONENT_ID_MAP";
/**
* Constructor (Private)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/buffer/BufferRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/buffer/BufferRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/buffer/BufferRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/buffer/BufferRenderer.java Tue Jul 12 08:56:11 2005
@@ -15,11 +15,7 @@
*/
package org.apache.myfaces.custom.buffer;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Method;
import java.util.Iterator;
import javax.faces.component.UIComponent;
@@ -30,7 +26,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.renderkit.html.util.DummyFormResponseWriter;
import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java Tue Jul 12 08:56:11 2005
@@ -78,12 +78,11 @@
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.startElement(HTML.DIV_ELEM, null);
- HtmlCollapsiblePanel collapsiblePanel = (HtmlCollapsiblePanel)uiComponent;
ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
String viewId = facesContext.getViewRoot().getViewId();
- String actionURL = viewHandler.getActionURL(facesContext, viewId);
+ viewHandler.getActionURL(facesContext, viewId);
- Application application = facesContext.getApplication();
+ facesContext.getApplication();
}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java Tue Jul 12 08:56:11 2005
@@ -21,7 +21,6 @@
import javax.faces.application.Application;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
import javax.faces.component.UIParameter;
import javax.faces.component.html.HtmlCommandLink;
import javax.faces.component.html.HtmlOutputText;
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java Tue Jul 12 08:56:11 2005
@@ -1,19 +1,19 @@
package org.apache.myfaces.custom.inputTextHelp;
-import org.apache.myfaces.component.html.util.AddResource;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.ext.HtmlTextRenderer;
-import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
+import java.io.IOException;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.ConverterException;
-import java.io.IOException;
-import java.util.Map;
+
+import org.apache.myfaces.component.html.util.AddResource;
+import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.renderkit.html.ext.HtmlTextRenderer;
+import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
/**
* @author Thomas Obereder
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java Tue Jul 12 08:56:11 2005
@@ -3,23 +3,18 @@
*/
package org.apache.myfaces.custom.jslistener;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.custom.jsvalueset.HtmlJsValueSet;
-import org.apache.myfaces.component.html.util.AddResource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
import javax.faces.application.Application;
import javax.faces.component.UIComponent;
import javax.faces.component.UINamingContainer;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.component.html.util.AddResource;
+import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.renderkit.html.HtmlRenderer;
/**
* @author Martin Marinschek (latest modification by $Author$)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java Tue Jul 12 08:56:11 2005
@@ -3,21 +3,9 @@
*/
package org.apache.myfaces.custom.jslistener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.component.html.util.AddResource;
-import org.apache.myfaces.custom.jsvalueset.HtmlJsValueSet;
-import org.apache.myfaces.taglib.UIComponentTagBase;
-
-import javax.faces.application.Application;
import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-import javax.faces.webapp.UIComponentTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.myfaces.taglib.UIComponentTagBase;
/**
* @author Martin Marinschek (latest modification by $Author$)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java Tue Jul 12 08:56:11 2005
@@ -120,7 +120,6 @@
// skip this child if its not a rendered column
UIComponent child = (UIComponent)children.get(j);
if(!(child instanceof UIColumn)) continue;
- UIColumn column = (UIColumn)child;
if(!child.isRendered()) continue;
// draw the element's cell
writer.startElement(HTML.TD_ELEM, newspaperTable);
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java Tue Jul 12 08:56:11 2005
@@ -18,7 +18,6 @@
import org.apache.myfaces.taglib.UIComponentTagBase;
import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
import javax.servlet.jsp.JspException;
@@ -75,8 +74,6 @@
protected void setProperties(UIComponent component)
{
super.setProperties(component);
- FacesContext context = FacesContext.getCurrentInstance();
-
setStringProperty(component, "selectedPanel", selectedPanel);
}
}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java Tue Jul 12 08:56:11 2005
@@ -133,18 +133,20 @@
return popupId;
}
- private void writeMouseOverAndOutAttribs(String popupId, List children)
- {
- for (int i = 0; i < children.size(); i++)
- {
- UIComponent uiComponent = (UIComponent) children.get(i);
-
- callMethod(uiComponent,"onmouseover",new String(popupId+".redisplay();"));
- callMethod(uiComponent,"onmouseout",new String(popupId+".hide();"));
-
- writeMouseOverAndOutAttribs(popupId, uiComponent.getChildren());
- }
- }
+// (this is not called from anywhere)
+//
+// private void writeMouseOverAndOutAttribs(String popupId, List children)
+// {
+// for (int i = 0; i < children.size(); i++)
+// {
+// UIComponent uiComponent = (UIComponent) children.get(i);
+//
+// callMethod(uiComponent,"onmouseover",new String(popupId+".redisplay();"));
+// callMethod(uiComponent,"onmouseout",new String(popupId+".hide();"));
+//
+// writeMouseOverAndOutAttribs(popupId, uiComponent.getChildren());
+// }
+// }
private void callMethod(UIComponent uiComponent, String propName, String value)
{
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java Tue Jul 12 08:56:11 2005
@@ -15,21 +15,19 @@
*/
package org.apache.myfaces.custom.tabbedpane;
-import org.apache.myfaces.renderkit.RendererUtils;
+import java.util.Iterator;
+import java.util.List;
-import javax.faces.component.html.HtmlPanelGroup;
import javax.faces.component.UIComponent;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.UIForm;
+import javax.faces.component.UINamingContainer;
+import javax.faces.component.html.HtmlPanelGroup;
import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
-import java.util.Iterator;
-import java.util.List;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -54,8 +52,9 @@
if (context == null) throw new NullPointerException("context");
decode(context);
- int tabIdx = 0;
- int selectedIndex = getSelectedIndex();
+// int tabIdx = 0;
+// int selectedIndex = getSelectedIndex();
+ getSelectedIndex();
Iterator it = getFacetsAndChildren();
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Tue Jul 12 08:56:11 2005
@@ -15,22 +15,22 @@
*/
package org.apache.myfaces.custom.tabbedpane;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.component.UserRoleUtils;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
import javax.faces.application.ViewHandler;
-import javax.faces.component.*;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
+import javax.faces.component.UINamingContainer;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.convert.Converter;
-import javax.faces.FacesException;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Iterator;
+
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/TreeNodeBase.java Tue Jul 12 08:56:11 2005
@@ -26,7 +26,6 @@
private String description;
private boolean leaf;
private String identifier;
- private boolean expanded;
public TreeNodeBase()
{}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java Tue Jul 12 08:56:11 2005
@@ -15,31 +15,26 @@
*/
package org.apache.myfaces.custom.tree2;
-import org.apache.myfaces.util.MessageUtils;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
-import javax.faces.component.UIComponentBase;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.EditableValueHolder;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
-import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
-import javax.faces.event.PhaseId;
import javax.faces.event.FacesListener;
-import javax.faces.el.ValueBinding;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.*;
+import javax.faces.event.PhaseId;
-import java.text.MessageFormat;
-import java.io.Serializable;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Locale;
-import java.util.*;
+import org.apache.myfaces.util.MessageUtils;
/**
* TreeData is a {@link UIComponent} that supports binding data stored in a tree represented
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java Tue Jul 12 08:56:11 2005
@@ -15,14 +15,14 @@
*/
package org.apache.myfaces.renderkit.html.ext;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlListboxRendererBase;
+import java.io.IOException;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import java.io.IOException;
+
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.renderkit.html.HtmlListboxRendererBase;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
/**
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java Tue Jul 12 08:56:11 2005
@@ -15,14 +15,14 @@
*/
package org.apache.myfaces.renderkit.html.ext;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.renderkit.html.HtmlMenuRendererBase;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import java.io.IOException;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import java.io.IOException;
+
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.renderkit.html.HtmlMenuRendererBase;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
/**
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java Tue Jul 12 08:56:11 2005
@@ -15,13 +15,8 @@
*/
package org.apache.myfaces.renderkit.html.ext;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.custom.radio.HtmlRadio;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRadioRendererBase;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import java.io.IOException;
+import java.util.List;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
@@ -30,8 +25,13 @@
import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
import javax.faces.model.SelectItem;
-import java.io.IOException;
-import java.util.List;
+
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.custom.radio.HtmlRadio;
+import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.renderkit.html.HtmlRadioRendererBase;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
/**
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java Tue Jul 12 08:56:11 2005
@@ -17,17 +17,16 @@
import java.io.IOException;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.ext.HtmlInputText;
import org.apache.myfaces.renderkit.JSFAttr;
import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
import org.apache.myfaces.renderkit.html.HtmlSecretRendererBase;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
/**
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java Tue Jul 12 08:56:11 2005
@@ -15,20 +15,15 @@
*/
package org.apache.myfaces.renderkit.html.ext;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.component.html.ext.HtmlInputText;
-import org.apache.myfaces.renderkit.html.HtmlTextRendererBase;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.JSFAttr;
+import java.io.IOException;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
+
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.renderkit.html.HtmlTextRendererBase;
/**
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java?rev=215977&r1=215976&r2=215977&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java Tue Jul 12 08:56:11 2005
@@ -15,19 +15,16 @@
*/
package org.apache.myfaces.renderkit.html.ext;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.ext.HtmlInputTextarea;
-import org.apache.myfaces.renderkit.html.HtmlTextareaRendererBase;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.JSFAttr;
+import java.io.IOException;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
+
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.renderkit.html.HtmlTextareaRendererBase;
/**