From adffaces-commits-return-618-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Fri Aug 11 16:27:25 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 6091 invoked from network); 11 Aug 2006 16:27:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Aug 2006 16:27:25 -0000 Received: (qmail 52714 invoked by uid 500); 11 Aug 2006 16:27:24 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 52692 invoked by uid 500); 11 Aug 2006 16:27:24 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 52576 invoked by uid 99); 11 Aug 2006 16:27:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Aug 2006 09:27:24 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Aug 2006 09:27:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8A7701A9826; Fri, 11 Aug 2006 09:26:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r430818 [7/9] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ trinidad-api/src/test/java/org/apache/myfaces/trinida... Date: Fri, 11 Aug 2006 16:25:11 -0000 To: adffaces-commits@incubator.apache.org From: awiner@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060811162632.8A7701A9826@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java Fri Aug 11 09:24:50 2006 @@ -37,6 +37,7 @@ /** * Tests whether the button should be rendered as an image. */ + @Override protected boolean doRenderImageContent( UIXRenderingContext context, UINode node @@ -55,6 +56,7 @@ * Creates the ImageProviderRequest to use when looking up the * button image. */ + @Override protected ImageProviderRequest createImageProviderRequest( UIXRenderingContext context, Object name, @@ -91,6 +93,7 @@ * Returns the name of the server-side style for styling * button text. */ + @Override protected String getServerStyleName( UIXRenderingContext context, UINode node, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java Fri Aug 11 09:24:50 2006 @@ -52,6 +52,7 @@ * Override of the Base Desktop ContentContainerRenderer's * renderContent(). */ + @Override protected void renderContent( UIXRenderingContext context, UINode node @@ -84,6 +85,7 @@ * getBackground() which uses a local property to store the background * value. */ + @Override protected Object getBackground( UIXRenderingContext context, UINode node @@ -568,7 +570,7 @@ } // Gets the Map for stetched icons, and sets alt attribute to "". - private static Map _getStretchedIconAttrs( + private static Map _getStretchedIconAttrs( UIXRenderingContext context ) { @@ -578,7 +580,7 @@ // If the Agent supports image stretching, return the // Map with height=100%. Otherwise we don't // have any attrs. - Map attrs = new ArrayMap(2); + Map attrs = new ArrayMap(2); if (Boolean.TRUE.equals(capImageStretch)) { attrs.put(Icon.HEIGHT_KEY, "100%"); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java Fri Aug 11 09:24:50 2006 @@ -52,6 +52,7 @@ * Override of renderBetweenIndexedChildren() which * renders the separator Icon. */ + @Override protected void renderBetweenNodes( UIXRenderingContext context, UINode node Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java Fri Aug 11 09:24:50 2006 @@ -55,6 +55,7 @@ */ public class GlobalHeaderRenderer extends SimpleDesktopRenderer { + @Override protected String getElementName( UIXRenderingContext context, UINode node @@ -63,6 +64,7 @@ return TABLE_ELEMENT; } + @Override protected void renderAttributes( UIXRenderingContext context, UINode node @@ -75,6 +77,7 @@ writer.writeAttribute("width", "100%", null); } + @Override protected void prerender( UIXRenderingContext context, UINode node @@ -125,6 +128,7 @@ } + @Override protected void renderContent( UIXRenderingContext context, UINode node @@ -145,6 +149,7 @@ } } + @Override protected void postrender( UIXRenderingContext context, UINode node @@ -169,6 +174,7 @@ super.postrender(context, node); } + @Override protected void renderIndexedChild( UIXRenderingContext context, UINode node, @@ -218,6 +224,7 @@ * Override of renderBetweenIndexedChildren() which * renders the separator Icon. */ + @Override protected void renderBetweenIndexedChildren( UIXRenderingContext context, UINode node @@ -245,6 +252,7 @@ * Override of getStyleClass() which forces style class * to OraGlobalHeader. */ + @Override protected Object getStyleClass( UIXRenderingContext context, UINode node Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java Fri Aug 11 09:24:50 2006 @@ -51,6 +51,7 @@ /** * Implementation of ElementRenderer.getName(); */ + @Override protected String getElementName( UIXRenderingContext context, UINode node @@ -62,6 +63,7 @@ /** * Override of BaseRenderer.renderAttributes(). */ + @Override protected void renderAttributes( UIXRenderingContext context, UINode node @@ -75,6 +77,7 @@ /** * Override of BaseRenderer.prerender() */ + @Override protected void prerender( UIXRenderingContext context, UINode node @@ -100,6 +103,7 @@ /** * Override of BaseRenderer.postrender() */ + @Override protected void postrender( UIXRenderingContext context, UINode node Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java Fri Aug 11 09:24:50 2006 @@ -30,8 +30,7 @@ */ public class PageMenuBarRenderer extends GlobalHeaderRenderer { - - + @Override protected UIXHierarchy getHierarchyBase( UIXRenderingContext context, UINode node @@ -41,7 +40,7 @@ return (UIXPage) pageNode.getUIComponent(); } - + @Override protected UINode getStamp( UIXRenderingContext context, UINode node @@ -51,7 +50,7 @@ return getNamedChild(context, pageNode, NODE_STAMP_CHILD); } - + @Override protected boolean setNewPath( UIXRenderingContext context, UINode node, @@ -59,7 +58,7 @@ ) { int startDepth = getIntAttributeValue(context, node, LEVEL_ATTR, 0); - return PageRendererUtils.setNewPath(context, ((UIXPage)component), startDepth); + return PageRendererUtils.setNewPath(context, component, startDepth); } @@ -67,6 +66,7 @@ * Checks to see whether the globalHeader is empty (contains no * indexed children). */ + @Override protected boolean isEmpty( UIXRenderingContext context, UINode node Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java Fri Aug 11 09:24:50 2006 @@ -18,7 +18,6 @@ import org.apache.myfaces.trinidad.component.UIXHierarchy; import org.apache.myfaces.trinidad.component.UIXPage; -import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.PageRendererUtils; @@ -29,6 +28,7 @@ */ public class PageMenuButtonsRenderer extends GlobalButtonBarRenderer { + @Override protected UIXHierarchy getHierarchyBase( UIXRenderingContext context, UINode node @@ -38,6 +38,7 @@ return (UIXPage) pageNode.getUIComponent(); } + @Override protected UINode getStamp( UIXRenderingContext context, UINode node @@ -47,6 +48,7 @@ return getNamedChild(context, pageNode, NODE_STAMP_CHILD); } + @Override protected boolean setNewPath( UIXRenderingContext context, UINode node, @@ -54,6 +56,6 @@ ) { int startDepth = getIntAttributeValue(context, node, LEVEL_ATTR, 0); - return PageRendererUtils.setNewPath(context, ((UIXPage)component), startDepth); + return PageRendererUtils.setNewPath(context, component, startDepth); } } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java Fri Aug 11 09:24:50 2006 @@ -43,6 +43,7 @@ /** * Tests whether the button should be rendered as an image. */ + @Override protected boolean doRenderImageContent( UIXRenderingContext context, UINode node @@ -61,6 +62,7 @@ * Creates the ImageProviderRequest to use when looking up the * button image. */ + @Override protected ImageProviderRequest createImageProviderRequest( UIXRenderingContext context, Object name, @@ -97,6 +99,7 @@ * Returns the name of the server-side style for styling * button text. */ + @Override protected String getServerStyleName( UIXRenderingContext context, UINode node, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java Fri Aug 11 09:24:50 2006 @@ -42,6 +42,7 @@ /** * Implementation of ElementRenderer.getName(); */ + @Override protected String getElementName( UIXRenderingContext context, UINode node @@ -53,6 +54,7 @@ /** * Returns the sideBar's style class: OraSideBar */ + @Override protected Object getStyleClass( UIXRenderingContext context, UINode node @@ -64,6 +66,7 @@ /** * Override of BaseRenderer.renderAttributes(). */ + @Override protected void renderAttributes( UIXRenderingContext context, UINode node @@ -82,6 +85,7 @@ /** * Override of BaseRenderer.prerender() */ + @Override protected void prerender( UIXRenderingContext context, UINode node @@ -111,6 +115,7 @@ /** * Override of BaseRenderer.postrender() */ + @Override protected final void postrender( UIXRenderingContext context, UINode node Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java Fri Aug 11 09:24:50 2006 @@ -228,6 +228,7 @@ // Override of getStartIcon() which retrieves // the InputStreamProvider from the Icon. + @Override protected InputStreamProvider getStartIcon() { return _getIconData(BUTTON_START_ICON_NAME, @@ -236,6 +237,7 @@ // Override of getEndIcon() which retrieves // the InputStreamProvider from the Icon. + @Override protected InputStreamProvider getEndIcon() { return _getIconData(BUTTON_END_ICON_NAME, @@ -244,6 +246,7 @@ // Override of getTopBackgroundIcon() which retrieves // the InputStreamProvider from the Icon. + @Override protected InputStreamProvider getTopBackgroundIcon() { return _getIconData(BUTTON_TOP_BACKGROUND_ICON_NAME, @@ -252,6 +255,7 @@ // Override of getBottomBackgroundIcon() which retrieves // the InputStreamProvider from the Icon. + @Override protected InputStreamProvider getBottomBackgroundIcon() { return _getIconData(BUTTON_BOTTOM_BACKGROUND_ICON_NAME, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java Fri Aug 11 09:24:50 2006 @@ -37,6 +37,7 @@ /** * Tests whether the button should be rendered as an image. */ + @Override protected boolean doRenderImageContent( UIXRenderingContext context, UINode node @@ -55,6 +56,7 @@ * Creates the ImageProviderRequest to use when looking up the * button image. */ + @Override protected ImageProviderRequest createImageProviderRequest( UIXRenderingContext context, Object name, @@ -91,6 +93,7 @@ * Returns the name of the server-side style for styling * button text. */ + @Override protected String getServerStyleName( UIXRenderingContext context, UINode node, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java Fri Aug 11 09:24:50 2006 @@ -50,6 +50,7 @@ implements SimpleDesktopConstants { + @Override protected void renderNode( UIXRenderingContext context, UINode child, @@ -101,6 +102,7 @@ * Override of renderTabStyleAttrs() which adds support * for a background image */ + @Override protected void renderTabStyleAttrs( UIXRenderingContext context, UINode node, @@ -124,6 +126,7 @@ * Override of the base.desktop.TabBarRenderer's * renderBetweenNodes(). */ + @Override protected void renderBetweenNodes( UIXRenderingContext context, UINode node Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaLookAndFeel.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaLookAndFeel.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaLookAndFeel.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaLookAndFeel.java Fri Aug 11 09:24:50 2006 @@ -30,6 +30,7 @@ * Returns the id for the PDA implementation of the Simple * Look And Feel: "simple.pda". */ + @Override public String getId() { return "simple.pda"; @@ -39,6 +40,7 @@ * Returns the family for the Simple * Look And Feel: "simple". */ + @Override public String getFamily() { return "simple"; Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ClassRendererParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ClassRendererParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ClassRendererParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ClassRendererParser.java Fri Aug 11 09:24:50 2006 @@ -40,6 +40,7 @@ * Override of LeafNodeParser.getNodeValue(). * Returns a ComponentNode. */ + @Override protected Object getNodeValue( ParseContext context, String namespaceURI, @@ -54,7 +55,7 @@ try { // Use ClassLoaderUtils to load the Renderer class - Class classInstance = ClassLoaderUtils.loadClass(name); + Class classInstance = ClassLoaderUtils.loadClass(name); // Instantiate a new instance return classInstance.newInstance(); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconNodeParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconNodeParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconNodeParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconNodeParser.java Fri Aug 11 09:24:50 2006 @@ -37,6 +37,7 @@ */ public class IconNodeParser extends BaseNodeParser implements XMLConstants { + @Override public void startElement( ParseContext context, String namespaceURI, @@ -46,6 +47,7 @@ _name = getRequiredAttribute(context, attrs, NAME_ATTR); } + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -63,6 +65,7 @@ return context.getParser(Icon.class, namespaceURI, localName); } + @Override public void addCompletedChild( ParseContext context, String namespaceURI, @@ -73,6 +76,7 @@ _icon = (Icon)child; } + @Override public Object endElement( ParseContext context, String namespaceURI, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconsNodeParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconsNodeParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconsNodeParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconsNodeParser.java Fri Aug 11 09:24:50 2006 @@ -38,6 +38,7 @@ public class IconsNodeParser extends BaseNodeParser implements XMLConstants { + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -48,6 +49,7 @@ return context.getParser(IconNode.class, namespaceURI, localName); } + @Override public void addCompletedChild( ParseContext context, String namespaceURI, @@ -61,9 +63,10 @@ } if (child instanceof IconNode) - _icons.add(child); + _icons.add((IconNode)child); } + @Override public Object endElement( ParseContext context, String namespaceURI, @@ -78,5 +81,5 @@ return _icons.toArray(icons); } - private ArrayList _icons = new ArrayList(); + private ArrayList _icons = new ArrayList(); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java Fri Aug 11 09:24:50 2006 @@ -48,6 +48,7 @@ * Override of LeafNodeParser.getNodeValue(). * Returns a ComponentNode. */ + @Override public void startElement( ParseContext context, String namespaceURI, @@ -70,6 +71,7 @@ /** * Override of BaseNodeParser.endElement(); */ + @Override public Object endElement( ParseContext context, String namespaceURI, @@ -105,6 +107,7 @@ * Override of BaseNodeParser.startChildElement() for * handling child elements. */ + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -121,6 +124,7 @@ * Override of BaseNodeParser.addCompletedChild() for adding * children. */ + @Override public void addCompletedChild( ParseContext context, String namespaceURI, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/InstanceIconParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/InstanceIconParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/InstanceIconParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/InstanceIconParser.java Fri Aug 11 09:24:50 2006 @@ -39,6 +39,7 @@ */ public class InstanceIconParser extends LeafNodeParser implements XMLConstants { + @Override protected Object getNodeValue( ParseContext context, String namespaceURI, @@ -52,7 +53,7 @@ // org.apache.myfaces.trinidadinternal.uix22.servlet.xml.parse.EventHandlerFactory! // This common code should live somewhere in share. - private Class _getClass( + private Class _getClass( ParseContext context, Attributes attrs) { @@ -82,7 +83,7 @@ ParseContext context, Attributes attrs) { - Class handlerClass = _getClass(context, attrs); + Class handlerClass = _getClass(context, attrs); if (handlerClass != null) { String methodName = attrs.getValue("method"); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/NullIconParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/NullIconParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/NullIconParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/NullIconParser.java Fri Aug 11 09:24:50 2006 @@ -29,6 +29,7 @@ */ public class NullIconParser extends LeafNodeParser { + @Override protected Object getNodeValue( ParseContext context, String namespaceURI, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ReferenceIconParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ReferenceIconParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ReferenceIconParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ReferenceIconParser.java Fri Aug 11 09:24:50 2006 @@ -31,6 +31,7 @@ */ public class ReferenceIconParser extends LeafNodeParser implements XMLConstants { + @Override protected Object getNodeValue( ParseContext context, String namespaceURI, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java Fri Aug 11 09:24:50 2006 @@ -40,6 +40,7 @@ */ public class RendererNodeParser extends BaseNodeParser implements XMLConstants { + @Override public void startElement( ParseContext context, String namespaceURI, @@ -59,6 +60,7 @@ } } + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -76,6 +78,7 @@ return context.getParser(Renderer.class, namespaceURI, localName); } + @Override public void addCompletedChild( ParseContext context, String namespaceURI, @@ -86,6 +89,7 @@ _renderer = (Renderer)child; } + @Override public Object endElement( ParseContext context, String namespaceURI, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNode.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNode.java Fri Aug 11 09:24:50 2006 @@ -59,7 +59,8 @@ * Returns an Iterator which iterates over the RendererNode * children of this RenderersNode. */ - public Iterator getRendererNodes() + @SuppressWarnings("unchecked") + public Iterator getRendererNodes() { if (_renderers!=null) { @@ -79,7 +80,7 @@ * is used to signal LookAndFeelExtensionParser that the * Renderers should be registered for all facets. */ - public Iterator getFacets() + public Iterator getFacets() { if (_facets == null) return null; Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNodeParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNodeParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNodeParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNodeParser.java Fri Aug 11 09:24:50 2006 @@ -39,6 +39,7 @@ public class RenderersNodeParser extends BaseNodeParser implements XMLConstants { + @Override public void startElement( ParseContext context, String namespaceURI, @@ -52,6 +53,7 @@ _facets = XMLUtils.parseNameTokens(facets); } + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -62,6 +64,7 @@ return context.getParser(RendererNode.class, namespaceURI, localName); } + @Override public void addCompletedChild( ParseContext context, String namespaceURI, @@ -75,9 +78,10 @@ } if (child instanceof RendererNode) - _renderers.add(child); + _renderers.add((RendererNode)child); } + @Override public Object endElement( ParseContext context, String namespaceURI, @@ -88,11 +92,11 @@ return null; RendererNode[] renderers = new RendererNode[_renderers.size()]; - renderers = (RendererNode[])_renderers.toArray(renderers); + renderers = _renderers.toArray(renderers); return new RenderersNode(renderers, _facets); } - private ArrayList _renderers = new ArrayList(); + private ArrayList _renderers = new ArrayList(); private String[] _facets; } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinExtensionParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinExtensionParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinExtensionParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinExtensionParser.java Fri Aug 11 09:24:50 2006 @@ -44,6 +44,7 @@ public class SkinExtensionParser extends BaseNodeParser implements XMLConstants { + @Override public void startElement( ParseContext context, String namespaceURI, @@ -54,6 +55,7 @@ _namespace = namespaceURI; } + @Override public Object endElement( ParseContext context, String namespaceURI, @@ -123,6 +125,7 @@ return skin; } + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -133,7 +136,7 @@ if (!namespaceURI.equals(_namespace)) return null; - Class expectedType = null; + Class expectedType = null; if (ICONS_NAME.equals(localName)) expectedType = IconNode[].class; @@ -157,6 +160,7 @@ return null; } + @Override public void addCompletedChild( ParseContext context, String namespaceURI, @@ -185,7 +189,7 @@ // Adds the objects in the array to the ArrayList private static void _addToArrayList( - ArrayList list, + ArrayList list, Object[] array ) { @@ -226,10 +230,10 @@ // ArrayList of IconNodes - private ArrayList _icons = new ArrayList(); + private ArrayList _icons = new ArrayList(); // ArrayList of PropertyNodes - private ArrayList _properties = new ArrayList(); + private ArrayList _properties = new ArrayList(); // Error messages private static final String _UNKNOWN_BASE_SKIN_ERROR = Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertiesNodeParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertiesNodeParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertiesNodeParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertiesNodeParser.java Fri Aug 11 09:24:50 2006 @@ -38,6 +38,7 @@ public class SkinPropertiesNodeParser extends BaseNodeParser implements XMLConstants { + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -48,6 +49,7 @@ return context.getParser(SkinPropertyNode.class, namespaceURI, localName); } + @Override public void addCompletedChild( ParseContext context, String namespaceURI, @@ -62,9 +64,10 @@ } if (child instanceof SkinPropertyNode) - _properties.add(child); + _properties.add((SkinPropertyNode)child); } + @Override public Object endElement( ParseContext context, String namespaceURI, @@ -79,5 +82,5 @@ return _properties.toArray(properties); } - private ArrayList _properties = new ArrayList(); + private ArrayList _properties = new ArrayList(); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java Fri Aug 11 09:24:50 2006 @@ -39,6 +39,7 @@ /** * */ + @Override public void startElement( ParseContext context, String namespaceURI, @@ -54,6 +55,7 @@ * Implementation of NodeParser.endElement() * Returns a SkinPropertyNode */ + @Override public Object endElement( ParseContext context, String namespaceURI, @@ -66,6 +68,7 @@ return new SkinPropertyNode(_selector, _name, _value); } + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -80,6 +83,7 @@ return BaseNodeParser.getIgnoreParser(); } + @Override public void addCompletedChild( ParseContext context, String namespaceURI, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinsNodeParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinsNodeParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinsNodeParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinsNodeParser.java Fri Aug 11 09:24:50 2006 @@ -40,6 +40,7 @@ public class SkinsNodeParser extends BaseNodeParser implements XMLConstants { + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -50,6 +51,7 @@ return context.getParser(SkinExtension.class, namespaceURI, localName); } + @Override public void addCompletedChild( ParseContext context, String namespaceURI, @@ -69,9 +71,10 @@ // add to list if (child instanceof SkinExtension) - _skins.add(child); + _skins.add((SkinExtension)child); } + @Override public Object endElement( ParseContext context, String namespaceURI, @@ -86,5 +89,5 @@ return _skins.toArray(skinExtension); } - private ArrayList _skins = new ArrayList(); + private ArrayList _skins = new ArrayList(); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/TextIconParser.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/TextIconParser.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/TextIconParser.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/TextIconParser.java Fri Aug 11 09:24:50 2006 @@ -41,6 +41,7 @@ /** * Override of BaseNodeParser.startElement(). */ + @Override public void startElement( ParseContext context, String namespaceURI, @@ -59,6 +60,7 @@ /** * Override of BaseNodeParser.endElement(); */ + @Override public Object endElement( ParseContext context, String namespaceURI, @@ -74,6 +76,7 @@ * Override of BaseNodeParser.startChildElement() for * handling child elements. */ + @Override public NodeParser startChildElement( ParseContext context, String namespaceURI, @@ -90,6 +93,7 @@ * Override of BaseNodeParser.addCompletedChild() for adding * children. */ + @Override public void addCompletedChild( ParseContext context, String namespaceURI, Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java Fri Aug 11 09:24:50 2006 @@ -219,12 +219,13 @@ /** * Clones the path. */ + @Override public Object clone() { try { PathImpl pi = (PathImpl) super.clone(); - pi._elements = (Object[]) pi._elements.clone(); + pi._elements = pi._elements.clone(); return pi; } catch (CloneNotSupportedException cnse) @@ -238,6 +239,7 @@ /** * Returns a string representation of the path. */ + @Override public String toString() { StringBuffer buffer = new StringBuffer("Path["); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java Fri Aug 11 09:24:50 2006 @@ -35,6 +35,7 @@ */ public class DecodingUINodeRenderer extends UINodeRendererBase { + @Override public void decode(FacesContext context, UIComponent component) { if (skipDecode(context)) @@ -72,6 +73,7 @@ * @param component the component * @param newValue the unconverted string value */ + @Override public Object getConvertedValue( FacesContext context, UIComponent component, @@ -115,7 +117,7 @@ ValueBinding binding = ((UIComponent) component).getValueBinding("value"); if (binding != null) { - Class modelClass = binding.getType(context); + Class modelClass = binding.getType(context); return ConverterUtils.createConverter(context, modelClass); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/EditableFacesBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/EditableFacesBean.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/EditableFacesBean.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/EditableFacesBean.java Fri Aug 11 09:24:50 2006 @@ -31,7 +31,8 @@ /** * @todo what about UIXEditableValue.VALIDATOR_KEY? */ - protected AttributeMap createAttributeMap(String componentFamily) + @Override + protected AttributeMap createAttributeMap(String componentFamily) { AttributeMap attrMap = super.createAttributeMap(componentFamily); attrMap.setAttribute(UIConstants.CONVERTER_ATTR, @@ -48,6 +49,7 @@ return attrMap; } + @Override public void setProperty(PropertyKey key, Object value) { super.setProperty(key, value); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java Fri Aug 11 09:24:50 2006 @@ -96,8 +96,7 @@ */ static public PartialPageContext getPartialPageContext(FacesContext fContext) { - return (PartialPageContext) - RenderingContext.getCurrentInstance().getPartialPageContext(); + return RenderingContext.getCurrentInstance().getPartialPageContext(); } /** @@ -127,6 +126,7 @@ return _adfRenderingContext.getPartialPageContext(); } + @Override public LocaleContext getLocaleContext() { return _adfRenderingContext.getLocaleContext(); @@ -154,11 +154,13 @@ return _adfRenderingContext.getAgent(); } + @Override protected Object getRenderingProperty(Object key) { return _adfRenderingContext.getProperties().get(key); } + @Override protected void setRenderingProperty(Object key, Object value) { _adfRenderingContext.getProperties().put(key, value); @@ -171,7 +173,7 @@ * the correct translated value key. * @param mapping */ - public void setSkinResourceKeyMap(Map mapping) + public void setSkinResourceKeyMap(Map mapping) { _adfRenderingContext.setSkinResourceKeyMap(mapping); } @@ -181,7 +183,7 @@ * Get the _skinResourceKeyMap Map. * @param mapping */ - public Map getSkinResourceKeyMap() + public Map getSkinResourceKeyMap() { return _adfRenderingContext.getSkinResourceKeyMap(); } @@ -196,6 +198,7 @@ // // Initialize PPR, if needed // + @SuppressWarnings("unchecked") private void _initializePPR( FacesContext fContext) { @@ -205,10 +208,9 @@ { // For compatibility with our current renderers, look for // the PARTIAL_TARGETS parameter, and add any that are found - Map parameters = fContext.getExternalContext(). - getRequestParameterMap(); - String param = (String) parameters.get( - UIConstants.PARTIAL_TARGETS_PARAM); + Map parameters = + fContext.getExternalContext().getRequestParameterMap(); + String param = parameters.get(UIConstants.PARTIAL_TARGETS_PARAM); if ((null != param) && !"".equals(param)) { _LOG.finer("Adding partial targets from parameter: {0}", param); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FireActionBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FireActionBoundValue.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FireActionBoundValue.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FireActionBoundValue.java Fri Aug 11 09:24:50 2006 @@ -17,6 +17,8 @@ import java.util.ArrayList; import java.util.List; + +import javax.faces.component.UIComponent; import javax.faces.component.UIParameter; import javax.faces.context.FacesContext; @@ -64,6 +66,7 @@ _part = part; } + @SuppressWarnings("unchecked") public Object getValue(UIXRenderingContext context) { FacesContext fContext = (context == null) ? @@ -89,8 +92,8 @@ if (_component.getChildCount() > 0 || (_part != null)) { // Get an array of parameters to pass to the fireAction object - List kids = _component.getChildren(); - ArrayList params = new ArrayList(kids.size()); + List kids = _component.getChildren(); + ArrayList params = new ArrayList(kids.size()); for ( int i = 0; i < kids.size(); i++ ) { @@ -117,7 +120,7 @@ params.add(p); } - Parameter [] paramArray = (Parameter [])params.toArray(_sPARAMS_ARRAY); + Parameter [] paramArray = params.toArray(_sPARAMS_ARRAY); _fireAction.setParameters(paramArray); } } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINode.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINode.java Fri Aug 11 09:24:50 2006 @@ -108,7 +108,7 @@ */ public UINode getNamedChild(UIXRenderingContext context, String childName) { - UIComponent child = (UIComponent) _component.getFacet(childName); + UIComponent child = _component.getFacet(childName); if (child == null) return null; @@ -116,7 +116,8 @@ } - public Iterator getChildNames(UIXRenderingContext context) + @SuppressWarnings("unchecked") + public Iterator getChildNames(UIXRenderingContext context) { if (_component instanceof UIXComponentBase) return ((UIXComponentBase) _component).getFacetNames(); @@ -127,7 +128,7 @@ /** * @todo implement this (if necessary) */ - public Iterator getAttributeNames(UIXRenderingContext context) + public Iterator getAttributeNames(UIXRenderingContext context) { throw new UnsupportedOperationException(); } @@ -274,6 +275,7 @@ UINodeRendererBase.__restoreRenderingContext(fContext, oldContext); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(40); @@ -300,6 +302,7 @@ + @SuppressWarnings("unchecked") private void _renderComponent(FacesContext context, UIComponent component) throws IOException { @@ -313,10 +316,10 @@ int count = component.getChildCount(); if (count > 0) { - List children = component.getChildren(); + List children = component.getChildren(); for (int i = 0; i < count; i++) { - UIComponent child = (UIComponent) children.get(i); + UIComponent child = children.get(i); if (child.isRendered()) _renderComponent(context, child); } @@ -346,7 +349,7 @@ public UINode getIndexedChild(int i) { throw new UnsupportedOperationException(); } - public Iterator getChildNames() { throw new UnsupportedOperationException(); } + public Iterator getChildNames() { throw new UnsupportedOperationException(); } public UINode getNamedChild(String name) { throw new UnsupportedOperationException(); } @@ -359,10 +362,10 @@ static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(UIComponentUINode.class); - static private Map _UIX2_LOCALNAMES; + static private Map> _UIX2_LOCALNAMES; static { - _UIX2_LOCALNAMES = new HashMap(137); + _UIX2_LOCALNAMES = new HashMap>(137); _loadRenderertypeToLocalnameMap(); } @@ -381,10 +384,11 @@ properties.load(propertyStream); propertyStream.close(); - Iterator keys = properties.entrySet().iterator(); + Iterator> keys = + properties.entrySet().iterator(); while (keys.hasNext()) { - Map.Entry entry = (Map.Entry) keys.next(); + Map.Entry entry = keys.next(); String key = (String) entry.getKey(); String localName = (String) entry.getValue(); int indexOfBar = key.indexOf('|'); @@ -413,10 +417,10 @@ String rendererType, String localName) { - Map subMap = (Map) _UIX2_LOCALNAMES.get(family); + Map subMap = _UIX2_LOCALNAMES.get(family); if (subMap == null) { - subMap = new ArrayMap(7); + subMap = new ArrayMap(7); _UIX2_LOCALNAMES.put(family, subMap); } @@ -434,11 +438,11 @@ String family, String rendererType) { - Map subMap = (Map) _UIX2_LOCALNAMES.get(family); + Map subMap = _UIX2_LOCALNAMES.get(family); if (subMap == null) return null; - return (String)subMap.get(rendererType); + return subMap.get(rendererType); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINodeList.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINodeList.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINodeList.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINodeList.java Fri Aug 11 09:24:50 2006 @@ -47,11 +47,12 @@ return _component.getChildCount(); } + @SuppressWarnings("unchecked") public UINode getUINode(UIXRenderingContext context, int index) { - List children = _component.getChildren(); + List children = _component.getChildren(); - return UIComponentUINode.__getUINode((UIComponent)children.get(index)); + return UIComponentUINode.__getUINode(children.get(index)); } public UINode setUINode(int index, UINode node) @@ -79,6 +80,7 @@ throw new UnsupportedOperationException(); } + @Override public Object clone() { throw new UnsupportedOperationException(); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java Fri Aug 11 09:24:50 2006 @@ -71,13 +71,13 @@ super(null); } - + @Override protected PropertyKey createPropertyKey( - String name, - Class type, - Object defaultValue, - int capabilities, - int index) + String name, + Class type, + Object defaultValue, + int capabilities, + int index) { return new UINodePropertyKey(name, type, defaultValue, capabilities, index); @@ -108,6 +108,7 @@ } + @Override public FacesBean.Type getType() { return _type; @@ -134,10 +135,12 @@ return UIConstants.MARLIN_NAMESPACE; } + @Override protected PropertyMap createPropertyMap() { return new FlaggedPropertyMap() { + @Override public Object put(PropertyKey key, Object value) { if (value == null) @@ -182,10 +185,12 @@ }; } + @Override protected PropertyMap createBindingsMap() { FlaggedPropertyMap bindings = new FlaggedPropertyMap() { + @Override public Object put(PropertyKey key, Object value) { if (value == null) @@ -301,9 +306,9 @@ // If any of these "Sets" are small, eliminate and move to // custom subclass - static private Set _HAS_ICON_URL = new HashSet(); + static private Set _HAS_ICON_URL = new HashSet(); // Move this to a protected boolean hook? - static private Set _ALWAYS_RENDER_ID = new HashSet(); + static private Set _ALWAYS_RENDER_ID = new HashSet(); static { Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodePropertyKey.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodePropertyKey.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodePropertyKey.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodePropertyKey.java Fri Aug 11 09:24:50 2006 @@ -41,14 +41,14 @@ } UINodePropertyKey( - String name, - Class type, - Object defaultValue, - int capabilities, - int index) + String name, + Class type, + Object defaultValue, + int capabilities, + int index) { super(name, type, defaultValue, capabilities, index); - _attributeKey = (AttributeKey) _UICONSTANTS_KEYS.get(name); + _attributeKey = _UICONSTANTS_KEYS.get(name); } private final AttributeKey _attributeKey; @@ -59,7 +59,7 @@ // old UIX 2 meaning differs from the new UIX 3 meaning. // Such keys must be explicitly mapped in subclasses of // UINodeFacesBean - static private final Set _EXCLUDED_KEYS = new HashSet(); + static private final Set _EXCLUDED_KEYS = new HashSet(); static { _EXCLUDED_KEYS.add("required"); @@ -77,9 +77,10 @@ // Map of String names to AttributeKey objects for all // keys defined in - static private final Map _UICONSTANTS_KEYS = new HashMap(); + static private final Map _UICONSTANTS_KEYS; static { + _UICONSTANTS_KEYS = new HashMap(); try { _findKeys(); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java Fri Aug 11 09:24:50 2006 @@ -32,6 +32,7 @@ */ public class UINodeRendererBase extends Renderer { + @Override public void encodeBegin(FacesContext context, UIComponent component) throws IOException @@ -44,6 +45,7 @@ } } + @Override public void encodeChildren(FacesContext context, UIComponent component) throws IOException @@ -51,6 +53,7 @@ // Children-encoding is always handled in encodeEnd() } + @Override public void encodeEnd(FacesContext context, UIComponent component) throws IOException @@ -68,7 +71,7 @@ } } - + @Override public boolean getRendersChildren() { return true; @@ -105,6 +108,7 @@ } + @SuppressWarnings("unchecked") static UIXRenderingContext __setRenderingContext( FacesContext fContext, UIXRenderingContext rContext) @@ -139,6 +143,7 @@ return TrinidadFilterImpl.isExecutingDialogReturn(context); } + @SuppressWarnings("unchecked") static void __restoreRenderingContext( FacesContext fContext, UIXRenderingContext rContext) Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIXComponentUINode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIXComponentUINode.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIXComponentUINode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIXComponentUINode.java Fri Aug 11 09:24:50 2006 @@ -62,6 +62,7 @@ /** * Returns the role that this node occupies. */ + @Override public NodeRole getNodeRole(UIXRenderingContext context) { if (context != null) @@ -82,7 +83,8 @@ return UIConstants.UNKNOWN_ROLE; } - public Iterator getAttributeNames(UIXRenderingContext context) + @Override + public Iterator getAttributeNames(UIXRenderingContext context) { AttributeMap attributes = getAttributeMap(false); @@ -96,9 +98,7 @@ } } - - - + @Override public void setAttributeValue( AttributeKey attrKey, Object value @@ -132,6 +132,7 @@ *

* @see #getAttributeNames */ + @Override public Object getAttributeValue(UIXRenderingContext context, AttributeKey attrKey) { return getAttributeValueImpl(context, attrKey, true); @@ -145,6 +146,7 @@ *

* @see org.apache.myfaces.trinidadinternal.ui.data.BoundValue */ + @Override public Object getRawAttributeValue(UIXRenderingContext context, AttributeKey attrKey) { return getAttributeValueImpl(context, attrKey, false); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java Fri Aug 11 09:24:50 2006 @@ -60,7 +60,7 @@ { FacesContext fContext = (context == null) ? FacesContext.getCurrentInstance() : context.getFacesContext(); - Class type = binding.getType(fContext); + Class type = binding.getType(fContext); converter = ConverterUtils.createConverter(fContext, type); } } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandButtonFacesBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandButtonFacesBean.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandButtonFacesBean.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandButtonFacesBean.java Fri Aug 11 09:24:50 2006 @@ -28,6 +28,7 @@ public class CommandButtonFacesBean extends UINodeFacesBean { + @Override protected AttributeMap createAttributeMap(String componentFamily) { AttributeMap attrMap = super.createAttributeMap(componentFamily); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandLinkFacesBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandLinkFacesBean.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandLinkFacesBean.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandLinkFacesBean.java Fri Aug 11 09:24:50 2006 @@ -28,6 +28,7 @@ public class CommandLinkFacesBean extends UINodeFacesBean { + @Override protected AttributeMap createAttributeMap(String componentFamily) { AttributeMap attrMap = super.createAttributeMap(componentFamily); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandNavigationItemFacesBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandNavigationItemFacesBean.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandNavigationItemFacesBean.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandNavigationItemFacesBean.java Fri Aug 11 09:24:50 2006 @@ -14,18 +14,15 @@ * limitations under the License. */ package org.apache.myfaces.trinidadinternal.uinode.nav; -import org.apache.myfaces.trinidad.bean.PropertyKey; -import org.apache.myfaces.trinidad.component.UIXComponent; -import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIConstants; import org.apache.myfaces.trinidadinternal.ui.collection.AttributeMap; -import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; import org.apache.myfaces.trinidadinternal.uinode.bind.ClientIdBoundValue; public class CommandNavigationItemFacesBean extends CommandLinkFacesBean { + @Override protected AttributeMap createAttributeMap(String componentFamily) { AttributeMap attrMap = super.createAttributeMap(componentFamily); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/ProcessChoiceBarFacesBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/ProcessChoiceBarFacesBean.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/ProcessChoiceBarFacesBean.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/ProcessChoiceBarFacesBean.java Fri Aug 11 09:24:50 2006 @@ -28,6 +28,7 @@ public class ProcessChoiceBarFacesBean extends UINodeFacesBean { + @Override protected AttributeMap createAttributeMap(String componentFamily) { AttributeMap attrMap = super.createAttributeMap(componentFamily); @@ -50,7 +51,7 @@ super(component); } - + @Override protected UIComponent getStamp( UIXNavigationHierarchy menuComponent ) @@ -58,7 +59,7 @@ return ((UIXProcess)menuComponent).getNodeStamp(); } - + @Override protected boolean setNewPath( UIXNavigationHierarchy menuComponent ) Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/SingleStepFacesBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/SingleStepFacesBean.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/SingleStepFacesBean.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/SingleStepFacesBean.java Fri Aug 11 09:24:50 2006 @@ -25,6 +25,7 @@ public class SingleStepFacesBean extends UINodeFacesBean { + @Override protected AttributeMap createAttributeMap(String componentFamily) { AttributeMap attrMap = super.createAttributeMap(componentFamily); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/SubKeyMap.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/SubKeyMap.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/SubKeyMap.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/SubKeyMap.java Fri Aug 11 09:24:50 2006 @@ -21,7 +21,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; import java.util.Set; import org.apache.myfaces.trinidad.logging.TrinidadLogger; @@ -39,9 +38,9 @@ * "flaw" is actually relied on by PageFlowScopeMap (since it provides * a handy way to clear out all descendents), so don't "fix" it! */ -final public class SubKeyMap extends AbstractMap +final public class SubKeyMap extends AbstractMap { - public SubKeyMap(Map base, String prefix) + public SubKeyMap(Map base, String prefix) { if (base == null) throw new NullPointerException(); @@ -61,24 +60,27 @@ } } + @Override public boolean isEmpty() { return entrySet().isEmpty(); } + @Override public Object get(Object key) { key = _getBaseKey(key); return _base.get(key); } - public Object put(Object key, Object value) + @Override + public Object put(String key, Object value) { key = _getBaseKey(key); return _base.put(key, value); } - + @Override public Object remove(Object key) { key = _getBaseKey(key); @@ -86,6 +88,7 @@ return _base.remove(key); } + @Override public boolean containsKey(Object key) { if (!(key instanceof String)) @@ -94,10 +97,11 @@ return _base.containsKey(_getBaseKey(key)); } - public Set entrySet() + @Override + public Set> entrySet() { if (_entrySet == null) - _entrySet = new Entries(_base.entrySet()); + _entrySet = new Entries(); return _entrySet; } @@ -109,30 +113,12 @@ return _prefix + ((String) key); } - private String _getSubKey(Object key) + private List _gatherKeys() { - if (key == null) - return null; - - if (!(key instanceof String)) - return null; - - String keyStr = (String) key; - if (!keyStr.startsWith(_prefix)) - return null; - - return keyStr.substring(_prefix.length()); - } - - - private List _gatherKeys() - { - List list = new ArrayList(); - Iterator keys = _base.keySet().iterator(); - while (keys.hasNext()) + List list = new ArrayList(); + for(String key : _base.keySet()) { - Object key = keys.next(); - if ((key instanceof String) && ((String) key).startsWith(_prefix)) + if (key != null && key.startsWith(_prefix)) list.add(key); } @@ -142,73 +128,71 @@ // // Set implementation for SubkeyMap.entrySet() // - private class Entries extends AbstractSet + private class Entries extends AbstractSet> { - public Entries(Set baseSet) + public Entries() { - _baseSet = baseSet; } - public Iterator iterator() + @Override + public Iterator> iterator() { // Sadly, if you just try to use a filtering approach // on the iterator, you'll get concurrent modification // exceptions. Consequently, gather the keys in a list // and iterator over that. - List keyList = _gatherKeys(); + List keyList = _gatherKeys(); return new EntryIterator(keyList.iterator()); } + @Override public int size() { int size = 0; - Iterator keys = _base.keySet().iterator(); - while (keys.hasNext()) + for(String key : _base.keySet()) { - - Object key = keys.next(); - if ((key instanceof String) && ((String) key).startsWith(_prefix)) + if (key != null && key.startsWith(_prefix)) size++; } return size; } + @Override public boolean isEmpty() { - Iterator keys = _base.keySet().iterator(); + Iterator keys = _base.keySet().iterator(); while (keys.hasNext()) { - Object key = keys.next(); + String key = keys.next(); // Short-circuit: the default implementation would always // need to iterate to find the total size. - if ((key instanceof String) && ((String) key).startsWith(_prefix)) + if (key != null && key.startsWith(_prefix)) return false; } return true; } + @Override public void clear() { - Iterator keys = _base.keySet().iterator(); + Iterator keys = _base.keySet().iterator(); while (keys.hasNext()) { - Object key = keys.next(); - if ((key instanceof String) && ((String) key).startsWith(_prefix)) + String key = keys.next(); + if (key != null && key.startsWith(_prefix)) { _LOG.finest("Clearing out {0}", key); keys.remove(); } } } - - private Set _baseSet; } - private class EntryIterator implements Iterator + private class EntryIterator implements Iterator> { - public EntryIterator(Iterator iterator) + public EntryIterator(Iterator iterator) { _iterator = iterator; } @@ -218,9 +202,9 @@ return _iterator.hasNext(); } - public Object next() + public Map.Entry next() { - String baseKey = (String) _iterator.next(); + String baseKey = _iterator.next(); _currentKey = baseKey; return new Entry(baseKey); } @@ -235,18 +219,18 @@ _currentKey = null; } - private Iterator _iterator; + private Iterator _iterator; private String _currentKey; } - private class Entry implements Map.Entry + private class Entry implements Map.Entry { public Entry(String baseKey) { _baseKey = baseKey; } - public Object getKey() + public String getKey() { if (_key == null) _key = _baseKey.substring(_prefix.length()); @@ -263,15 +247,18 @@ return _base.put(_baseKey, value); } + @SuppressWarnings("unchecked") + @Override public boolean equals(Object o) { if (!(o instanceof Map.Entry)) return false; - Map.Entry e = (Map.Entry)o; + Map.Entry e = (Map.Entry)o; return _equals(getKey(), e.getKey()) && _equals(getValue(), e.getValue()); } + @Override public int hashCode() { Object key = getKey(); @@ -280,8 +267,8 @@ ((value == null) ? 0 : value.hashCode()); } - private String _baseKey; - private Object _key; + private String _baseKey; + private String _key; } static private boolean _equals(Object a, Object b) @@ -291,9 +278,9 @@ return a.equals(b); } - private final Map _base; + private final Map _base; private final String _prefix; - private Set _entrySet; + private Set> _entrySet; static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(SubKeyMap.class); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidad/resource/MessageBundleTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidad/resource/MessageBundleTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidad/resource/MessageBundleTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidad/resource/MessageBundleTest.java Fri Aug 11 09:24:50 2006 @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Enumeration; import java.util.ListResourceBundle; import java.util.Locale; @@ -70,10 +69,10 @@ { ResourceBundle bundle = context.getLoadedBundle(); _LOG.fine("Testing default bundle:{0}",context.getLoadedBundleName()); - Enumeration en = bundle.getKeys(); + Enumeration en = bundle.getKeys(); while (en.hasMoreElements()) { - String key = (String) en.nextElement(); + String key = en.nextElement(); Object value = bundle.getObject(key); assertNotNull(value); @@ -125,15 +124,15 @@ if (isRequiredBundleLoaded) { - Set thisBundleKeys = new HashSet(); - Enumeration en = bundle.getKeys(); + Set thisBundleKeys = new HashSet(); + Enumeration en = bundle.getKeys(); while (en.hasMoreElements()) { - String key = (String) en.nextElement(); + String key = en.nextElement(); thisBundleKeys.add(key); String value = bundle.getObject(key).toString(); - Set params = _getPlaceHolders(value); + Set params = _getPlaceHolders(value); if (_validateKey(context, key)) { @@ -194,7 +193,7 @@ // just warns about missing keys in bundle and does not cause any failure. private static void _warnAbsenceOfBundleKeys( BundleContext context, - Set bundleKeys) + Set bundleKeys) { if (!_isEqualsSets(bundleKeys, _DEF_BUNDLE_KEYS )) { @@ -202,7 +201,7 @@ // keys of parent. So it is perfectly valid to have less keys than that // are already present in the parent. This check is just to warn in case // we would like to make sure we have all keys in the bundle. - Set temp = new HashSet(_DEF_BUNDLE_KEYS); + Set temp = new HashSet(_DEF_BUNDLE_KEYS); temp.removeAll(bundleKeys); _LOG.warning("Keys missing in bundle:{0} are \n{1}", @@ -219,10 +218,10 @@ */ private static void _validateBundleParams( BundleContext context, - Set currentLocaleParams, + Set currentLocaleParams, String key) { - Set defaultParams = (Set) _DEF_BUNDLE_PARAMS.get(key); + Set defaultParams = _DEF_BUNDLE_PARAMS.get(key); if (_isEqualsSets(defaultParams, currentLocaleParams)) return; else @@ -260,9 +259,9 @@ } } - private static Set _getCurrentBundleKeys( + private static Set _getCurrentBundleKeys( ResourceBundle bundle, - Set currentBundleDefaultKeys + Set currentBundleDefaultKeys ) { if (bundle instanceof ListResourceBundle) @@ -271,10 +270,10 @@ { Method method = bundle.getClass().getMethod("getContents"); Object[][] keyValues = (Object[][])method.invoke(bundle); - Set currentBundleKeys = new HashSet(); + Set currentBundleKeys = new HashSet(); for (int i = 0; i < keyValues.length; i++) { - currentBundleKeys.add(keyValues[i][0]); + currentBundleKeys.add((String)keyValues[i][0]); } return currentBundleKeys; } @@ -297,16 +296,16 @@ return currentBundleDefaultKeys; } - private static boolean _isEqualsSets(Set thisSet, Set otherSet) + private static boolean _isEqualsSets(Set thisSet, Set otherSet) { return thisSet.containsAll(otherSet); } // pick up place holder like {0}, {1} present in the value // part and add it to the set. - private static Set _getPlaceHolders(String value) + private static Set _getPlaceHolders(String value) { - Set params = new HashSet(5); + Set params = new HashSet(5); Matcher match = BundleContext.getPattern().matcher(value); while (match.find()) @@ -333,22 +332,25 @@ } private static String _getKeys( - Set keys, + Set keys, char appendChar) { - StringBuffer buff = new StringBuffer(64); - - for ( Iterator itr = keys.iterator(); itr.hasNext(); - buff.append((String)itr.next() + appendChar)); + StringBuilder buff = new StringBuilder(64); + for(String key : keys) + { + buff.append(key).append(appendChar); + } + return buff.toString(); } // Holds the place holder set for the each key of the default bundle // so for each bundle we pick the value and check if the place holders // are same as in the default bundle. Any mismatch result in failure. - private static final HashMap _DEF_BUNDLE_PARAMS = new HashMap(); + private static final HashMap> _DEF_BUNDLE_PARAMS = + new HashMap>(); - private static final Set _DEF_BUNDLE_KEYS = new HashSet(); + private static final Set _DEF_BUNDLE_KEYS = new HashSet(); private static final Locale[] locales = { Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java Fri Aug 11 09:24:50 2006 @@ -15,8 +15,6 @@ */ package org.apache.myfaces.trinidadinternal; -import java.net.URL; - public class FacesConfigTest extends XMLValidityTestCase { public FacesConfigTest( Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/XMLValidityTestCase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/XMLValidityTestCase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/XMLValidityTestCase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/XMLValidityTestCase.java Fri Aug 11 09:24:50 2006 @@ -20,20 +20,15 @@ import java.util.HashMap; import java.util.Map; -import org.w3c.dom.Document; import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import org.xml.sax.XMLReader; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; import junit.framework.TestCase; @@ -78,8 +73,8 @@ { public ER() { - _publicIDs = new HashMap(); - _systemIDs = new HashMap(); + _publicIDs = new HashMap(); + _systemIDs = new HashMap(); } public void registerPublicId(String publicId, URL url) @@ -97,7 +92,7 @@ { URL url = (publicId == null) ? null : (URL) _publicIDs.get(publicId); if (url == null) - url = (URL) _systemIDs.get(systemId); + url = _systemIDs.get(systemId); if (url == null) return null; @@ -105,8 +100,8 @@ return new InputSource(url.openStream()); } - private Map _publicIDs; - private Map _systemIDs; + private Map _publicIDs; + private Map _systemIDs; } static public class Errors implements ErrorHandler