You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/10/13 22:13:19 UTC
svn commit: r463851 - in
/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main:
java/org/apache/myfaces/trinidadinternal/renderkit/uix/
java/org/apache/myfaces/trinidadinternal/ui/
java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ java/...
Author: awiner
Date: Fri Oct 13 15:13:18 2006
New Revision: 463851
URL: http://svn.apache.org/viewvc?view=rev&rev=463851
Log:
My favorite thing in programming: deleting obsolete code. Getting rid of all the bits that were only referenced from the old SelectManyShuttleRenderer
Removed:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentContainerRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TextInputRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/TextInputRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java?view=diff&rev=463851&r1=463850&r2=463851
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java Fri Oct 13 15:13:18 2006
@@ -399,7 +399,6 @@
public static final String COLUMN_GROUP_NAME = "columnGroup";
public static final String COMMAND_ITEM_NAME = "commandItem";
public static final String COMMAND_NAVIGATION_ITEM_NAME = "commandNavigationItem";
- public static final String CONTENT_CONTAINER_NAME = "contentContainer";
public static final String CONTENT_FOOTER_NAME = "contentFooter";
public static final String CONTEXT_POPPING_NAME = "contextPopping";
public static final String DATE_BUTTON_NAME = "dateButton";
@@ -425,7 +424,6 @@
public static final String INSERTED_NODE_LIST_NAME = "insertedNodeList";
public static final String INLINE_DATE_PICKER_NAME = "inlineDatePicker";
public static final String LINK_NAME = "link";
- public static final String LIST_NAME = "list";
public static final String MENU_LIST_NAME = "menuList";
public static final String NAVIGATION_PATH_NAME = "navigationPath";
public static final String NAVIGATION_TREE_NAME = "navigationTree";
@@ -470,16 +468,10 @@
public static final String TABLE_FOOTER_NAME = "tableFooter";
public static final String TABLE_NAME = "table";
public static final String TABLE_LAYOUT_NAME = "tableLayout";
- public static final String TEXT_INPUT_NAME = "textInput";
public static final String TEXT_NAME = "text";
public static final String TIP_NAME = "tip";
public static final String TREE_NAME = "tree";
- //
- // Pseudo-element names: these are used as aliases that map to one
- // or more actual local names.
- //
- public static final String SELECT_MANY_SHUTTLE_NAME = "selectManyShuttle";
//
//
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java?view=diff&rev=463851&r1=463850&r2=463851
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java Fri Oct 13 15:13:18 2006
@@ -236,7 +236,6 @@
COLOR_SWATCH_NAME,
COLUMN_NAME,
COLUMN_GROUP_NAME,
- CONTENT_CONTAINER_NAME,
CONTENT_FOOTER_NAME,
DATE_BUTTON_NAME,
DATE_FIELD_NAME,
@@ -270,11 +269,8 @@
TAB_BAR_NAME,
TABLE_FOOTER_NAME,
TABLE_NAME,
- TEXT_INPUT_NAME,
TIP_NAME,
- TREE_NAME,
-
- SELECT_MANY_SHUTTLE_NAME,
+ TREE_NAME
};
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java?view=diff&rev=463851&r1=463850&r2=463851
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java Fri Oct 13 15:13:18 2006
@@ -99,7 +99,6 @@
SUBMIT_BUTTON_NAME,
SUB_TAB_BAR_NAME, //support ?
TAB_BAR_NAME,
- TEXT_INPUT_NAME,
TIP_NAME, // Support
TREE_NAME,
@@ -122,7 +121,6 @@
private static final String[] _NULL_NAMES =
{
- CONTENT_CONTAINER_NAME,
FOOTER_NAME,
INLINE_DATE_PICKER_NAME,
//STYLE_SHEET_NAME,
@@ -149,8 +147,6 @@
SIDE_NAV_NAME,
//SUB_TAB_BAR_NAME,
//TREE_NAME, // Support?
-
- SELECT_MANY_SHUTTLE_NAME,
};
private static final RendererFactory _FACTORY = createDefaultFactory();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java?view=diff&rev=463851&r1=463850&r2=463851
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java Fri Oct 13 15:13:18 2006
@@ -385,11 +385,6 @@
if (parentContext != null)
{
UINode parentNode = parentContext.getAncestorNode(0);
- // Don't pay attention to lists inside shuttles; they
- // already handle the "select item" stuff.
- if (isEqualMarlinName(parentNode, SELECT_MANY_SHUTTLE_NAME))
- return null;
-
component = NodeUtils.getUIComponent(parentContext, parentNode);
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java?view=diff&rev=463851&r1=463850&r2=463851
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java Fri Oct 13 15:13:18 2006
@@ -105,7 +105,6 @@
IMAGE_NAME,
IMPORT_SCRIPT_NAME,
LINK_NAME,
- LIST_NAME,
NAVIGATION_PATH_NAME,
OPTION_NAME,
PAGE_NAME,
@@ -122,7 +121,6 @@
STYLED_TEXT_NAME,
SUBMIT_BUTTON_NAME,
TABLE_LAYOUT_NAME,
- TEXT_INPUT_NAME,
// Alias elements
COMMAND_NAVIGATION_ITEM_NAME,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java?view=diff&rev=463851&r1=463850&r2=463851
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java Fri Oct 13 15:13:18 2006
@@ -89,7 +89,6 @@
LookAndFeelExtension laf
)
{
- _registerRenderer(laf, UIConstants.CONTENT_CONTAINER_NAME);
_registerRenderer(laf, UIConstants.GLOBAL_BUTTON_BAR_NAME);
_registerRenderer(laf, UIConstants.GLOBAL_HEADER_NAME);
_registerRenderer(laf, UIConstants.MESSAGE_BOX_NAME);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties?view=diff&rev=463851&r1=463850&r2=463851
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties Fri Oct 13 15:13:18 2006
@@ -37,8 +37,6 @@
org.apache.myfaces.trinidad.component.core.layout.CorePanelSideBar=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.layout.CorePanelTip=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.nav.CorePage=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
-org.apache.myfaces.trinidad.component.UIXSelectMany|org.apache.myfaces.trinidad.Shuttle=org.apache.myfaces.trinidadinternal.uinode.EditableFacesBean
-org.apache.myfaces.trinidad.component.UIXSelectOrder|org.apache.myfaces.trinidad.Shuttle=org.apache.myfaces.trinidadinternal.uinode.EditableFacesBean
org.apache.myfaces.trinidad.component.UIXShowOne|org.apache.myfaces.trinidad.Tab=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.UIXMessages=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.UIXProgress|org.apache.myfaces.trinidad.Indicator=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean