You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2005/05/11 18:14:27 UTC
svn commit: r169651 [1/3] - in /myfaces/trunk:
src/components/org/apache/myfaces/custom/navmenu/
src/components/org/apache/myfaces/custom/navmenu/jscookmenu/
src/components/org/apache/myfaces/custom/panelstack/
src/components/org/apache/myfaces/custom/popup/
src/components/org/apache/myfaces/custom/radio/
src/components/org/apache/myfaces/custom/regexprvalidator/
src/components/org/apache/myfaces/custom/rssticker/
src/components/org/apache/myfaces/custom/savestate/
src/components/org/apache/myfaces/custom/selectOneCountry/
src/components/org/apache/myfaces/custom/sortheader/
src/components/org/apache/myfaces/custom/stylesheet/
src/components/org/apache/myfaces/custom/swapimage/
src/components/org/apache/myfaces/custom/tabbedpane/
src/components/org/apache/myfaces/custom/tree/
src/components/org/apache/myfaces/custom/tree/event/
src/components/org/apache/myfaces/custom/tree/model/
src/components/org/apache/myfaces/custom/tree/renderkit/html/
src/components/org/apache/myfaces/custom/tree/taglib/
src/components/org/apache/myfaces/custom/updateactionlistener/
src/junit/org/apache/myfaces/el/ src/myfaces/org/apache/myfaces/el/
src/xdoclet/org/apache/myfaces/xdoclet/
webapps/src/example/org/apache/myfaces/examples/crosstable/
Author: grantsmith
Date: Wed May 11 09:14:23 2005
New Revision: 169651
URL: http://svn.apache.org/viewcvs?rev=169651&view=rev
Log:
Removing some $Log$ headers - not supported by SVN, clutter up sources. Batch #3.
Modified:
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuItem.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuUtils.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java
myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/PanelStackTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadio.java
myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadioTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java
myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/ValidateRegExprTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTicker.java
myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTickerTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/savestate/SaveStateTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java
myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/sortheader/HtmlCommandSortHeaderTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/Stylesheet.java
myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java
myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeEvent.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/DefaultMutableTreeNode.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTree.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeNode.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/IconProvider.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/MutableTreeNode.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/TreeNode.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/event/TreeSelectionEvent.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/event/TreeSelectionListener.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/model/DefaultTreeModel.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/model/TreeModel.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/model/TreeModelEvent.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/model/TreeModelListener.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/model/TreePath.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeNodeRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/taglib/IconProviderTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/taglib/TreeSelectionListenerTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/tree/taglib/TreeTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/updateactionlistener/UpdateActionListener.java
myfaces/trunk/src/components/org/apache/myfaces/custom/updateactionlistener/UpdateActionListenerTag.java
myfaces/trunk/src/junit/org/apache/myfaces/el/ValueBindingTest.java
myfaces/trunk/src/myfaces/org/apache/myfaces/el/ELParserHelper.java
myfaces/trunk/src/myfaces/org/apache/myfaces/el/MethodBindingImpl.java
myfaces/trunk/src/myfaces/org/apache/myfaces/el/PropertyResolverImpl.java
myfaces/trunk/src/myfaces/org/apache/myfaces/el/ValueBindingImpl.java
myfaces/trunk/src/myfaces/org/apache/myfaces/el/VariableResolverImpl.java
myfaces/trunk/src/xdoclet/org/apache/myfaces/xdoclet/ComponentSubTask.java
myfaces/trunk/src/xdoclet/org/apache/myfaces/xdoclet/TagLibSubTask.java
myfaces/trunk/src/xdoclet/org/apache/myfaces/xdoclet/TagSubTask.java
myfaces/trunk/src/xdoclet/org/apache/myfaces/xdoclet/WapFacesTagHandler.java
myfaces/trunk/webapps/src/example/org/apache/myfaces/examples/crosstable/DataBean.java
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,22 +23,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2005/02/18 17:19:31 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/05 08:28:24 royalts
- * added example for <x:navigationMenuItems>
- *
- * Revision 1.2 2004/07/01 21:53:07 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/06/23 13:44:31 royalts
- * no message
- *
*/
public class HtmlNavigationMenuItemTag
extends SelectItemTagBase
@@ -55,7 +39,7 @@
// User Role support
private String _enabledOnUserRole;
private String _visibleOnUserRole;
-
+
public void release() {
super.release();
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java Wed May 11 09:14:23 2005
@@ -20,13 +20,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/09/14 13:38:01 royalts
- * removed check on urlPattern
- *
*/
public class HtmlNavigationMenuItemsTag
extends UIComponentTagBase
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuItem.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuItem.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuItem.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuItem.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,25 +20,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2004/12/13 23:14:38 oros
- * fix #1044663: handle enabledOnUserRole/visibleOnUserRole, disabled menu items are rendered with null actions
- *
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/07/05 08:32:41 royalts
- * changed constructor signature
- *
- * Revision 1.3 2004/07/05 08:28:25 royalts
- * added example for <x:navigationMenuItems>
- *
- * Revision 1.2 2004/07/01 21:53:07 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/06/23 13:44:31 royalts
- * no message
- *
*/
public class NavigationMenuItem
extends SelectItem
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuUtils.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuUtils.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/NavigationMenuUtils.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,22 +27,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2004/12/13 23:14:38 oros
- * fix #1044663: handle enabledOnUserRole/visibleOnUserRole, disabled menu items are rendered with null actions
- *
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/05 08:28:25 royalts
- * added example for <x:navigationMenuItems>
- *
- * Revision 1.2 2004/07/01 21:53:07 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/06/23 13:44:31 royalts
- * no message
- *
*/
public class NavigationMenuUtils
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,16 +25,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 21:53:07 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/06/23 13:44:31 royalts
- * no message
- *
*/
public class UINavigationMenuItem
extends UISelectItem
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,22 +25,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/07/01 21:53:09 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/06/24 08:02:10 royalts
- * no message
- *
- * Revision 1.2 2004/06/23 14:35:18 royalts
- * no message
- *
- * Revision 1.1 2004/06/23 13:44:31 royalts
- * no message
- *
*/
public class HtmlCommandJSCookMenu
extends UICommand
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,55 +41,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.16 2005/04/29 15:20:25 schof
- * Fixes MYFACE-196. Patch by Martin Bosak
- *
- * Revision 1.15 2005/04/13 13:52:01 schof
- * Fixes MYFACES-185 (patch submitted by Martin Bosak)
- *
- * Revision 1.14 2005/04/12 17:47:51 schof
- * Fixes MYFACES-182 (Thanks to David Heffelfinger for reporting and fixing.)
- *
- * Revision 1.13 2005/04/08 13:05:59 schof
- * Fixes MyFaces-20 (Patch by Martin Bosak)
- *
- * Revision 1.12 2004/12/27 04:11:11 mmarinschek
- * Data Table stores the state of facets of children; script tag is rendered with type attribute instead of language attribute, popup works better as a column in a data table
- *
- * Revision 1.11 2004/12/24 14:49:29 svieujot
- * Upgrade the navmenu component to use the Extensions filter.
- *
- * Revision 1.10 2004/12/13 23:14:37 oros
- * fix #1044663: handle enabledOnUserRole/visibleOnUserRole, disabled menu items are rendered with null actions
- *
- * Revision 1.9 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.8 2004/10/05 15:11:43 manolito
- * #1020264 x:navigationMenuItem icon problem
- *
- * Revision 1.7 2004/07/16 13:06:30 manolito
- * encode javascript strings for jscook menu labels
- *
- * Revision 1.6 2004/07/05 08:28:24 royalts
- * added example for <x:navigationMenuItems>
- *
- * Revision 1.5 2004/07/01 21:53:09 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/06/25 10:58:43 royalts
- * fixed bug 979038
- *
- * Revision 1.3 2004/06/23 14:17:31 royalts
- * no message
- *
- * Revision 1.2 2004/06/23 13:50:18 royalts
- * no message
- *
- * Revision 1.1 2004/06/23 13:44:31 royalts
- * no message
- *
*/
public class HtmlJSCookMenuRenderer
extends HtmlRenderer
@@ -104,7 +55,7 @@
Map parameter = context.getExternalContext().getRequestParameterMap();
String actionParam = (String)parameter.get(JSCOOK_ACTION_PARAM);
- if (actionParam != null && !actionParam.trim().equals("") &&
+ if (actionParam != null && !actionParam.trim().equals("") &&
!actionParam.trim().equals("null"))
{
String compId = component.getId();
@@ -133,30 +84,30 @@
}
}
- private String decodeValueBinding(String actionParam, FacesContext context)
+ private String decodeValueBinding(String actionParam, FacesContext context)
{
- int idx = actionParam.indexOf(";#{");
+ int idx = actionParam.indexOf(";#{");
if (idx == -1) {
return actionParam;
}
-
+
String newActionParam = actionParam.substring(0, idx);
String vbParam = actionParam.substring(idx + 1);
-
+
idx = vbParam.indexOf('=');
if (idx == -1) {
return newActionParam;
}
String vbExpressionString = vbParam.substring(0, idx);
String vbValue = vbParam.substring(idx + 1);
-
- ValueBinding vb =
- context.getApplication().createValueBinding(vbExpressionString);
+
+ ValueBinding vb =
+ context.getApplication().createValueBinding(vbExpressionString);
vb.setValue(context, vbValue);
-
+
return newActionParam;
}
-
+
public boolean getRendersChildren()
{
return true;
@@ -175,7 +126,7 @@
dummyFormResponseWriter.setWriteDummyForm(true);
String myId = component.getId();
-
+
ResponseWriter writer = context.getResponseWriter();
writer.write("\n<script type=\"text/javascript\"><!--\n" +
@@ -265,10 +216,10 @@
writer.write(",");
if (uiNavMenuItem != null)
{
- encodeNavigationMenuItems(context, writer, menuItems,
+ encodeNavigationMenuItems(context, writer, menuItems,
uiNavMenuItem.getChildren(), menuId);
} else {
- encodeNavigationMenuItems(context, writer, menuItems,
+ encodeNavigationMenuItems(context, writer, menuItems,
new ArrayList(1), menuId);
}
}
@@ -277,8 +228,8 @@
}
}
- private void encodeValueBinding(ResponseWriter writer, UINavigationMenuItem uiNavMenuItem,
- NavigationMenuItem item) throws IOException
+ private void encodeValueBinding(ResponseWriter writer, UINavigationMenuItem uiNavMenuItem,
+ NavigationMenuItem item) throws IOException
{
ValueBinding vb = uiNavMenuItem.getValueBinding("NavMenuItemValue");
if (vb == null) {
@@ -292,18 +243,18 @@
if (tempObj == null) {
return;
}
-
+
writer.write(";");
writer.write(vbExpression);
writer.write("=");
writer.write(tempObj.toString());
}
-
+
public void encodeEnd(FacesContext context, UIComponent component) throws IOException
{
RendererUtils.checkParamValidity(context, component, HtmlCommandJSCookMenu.class);
HtmlCommandJSCookMenu menu = (HtmlCommandJSCookMenu)component;
-
+
AddResource.addJavaScriptToHeader(NavigationMenuItem.class, "jscookmenu/JSCookMenu.js", context);
AddResource.addJavaScriptToHeader(NavigationMenuItem.class, "jscookmenu/ThemeOffice/theme.js", context);
@@ -317,7 +268,7 @@
AddResource.addJavaScriptToHeader(NavigationMenuItem.class, "jscookmenu/ThemePanel/theme.js", context);
AddResource.addStyleSheet(NavigationMenuItem.class, "jscookmenu/ThemePanel/theme.css", context);
-
+
ResponseWriter writer = context.getResponseWriter();
String menuId = component.getClientId(context).replaceAll(":","_") + "_menu";
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,17 +28,6 @@
*
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/09/01 18:32:55 mwessendorf
- * Organize Imports
- *
- * Revision 1.1 2004/08/15 22:42:11 o_rossmueller
- * new custom component: HtmlPanelStack
- *
- *
*/
public class HtmlPanelStack extends HtmlPanelGroup
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,22 +26,6 @@
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/09/01 18:32:55 mwessendorf
- * Organize Imports
- *
- * Revision 1.3 2004/08/15 23:16:36 o_rossmueller
- * do not overwrite decode
- *
- * Revision 1.2 2004/08/15 23:12:54 o_rossmueller
- * processDecodes on selected child
- *
- * Revision 1.1 2004/08/15 22:42:11 o_rossmueller
- * new custom component: HtmlPanelStack
- *
*/
public class HtmlPanelStackRenderer extends HtmlRenderer
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/PanelStackTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/PanelStackTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/PanelStackTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/panelstack/PanelStackTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,40 +24,9 @@
/**
* PanelStack tag.
- *
+ *
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/09/01 18:32:55 mwessendorf
- * Organize Imports
- *
- * Revision 1.1 2004/08/15 22:42:12 o_rossmueller
- * new custom component: HtmlPanelStack
- *
- * Revision 1.6 2004/08/15 15:28:04 o_rossmueller
- * new model listener handling to get modified from events which occur outside the scope of a tree request
- *
- * Revision 1.5 2004/07/01 21:53:06 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/05/10 01:24:51 o_rossmueller
- * added iconClass attribute
- *
- * Revision 1.3 2004/05/05 00:18:57 o_rossmueller
- * various fixes/modifications in model event handling and tree update
- *
- * Revision 1.2 2004/04/22 21:59:17 o_rossmueller
- * added expandRoot attribute
- *
- * Revision 1.1 2004/04/22 10:20:25 manolito
- * tree component
- *
*/
public class PanelStackTag
extends UIComponentTagBase
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java Wed May 11 09:14:23 2005
@@ -29,47 +29,6 @@
/**
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.12 2005/02/11 13:33:58 mmarinschek
- * fix jira 15
- *
- * Revision 1.11 2004/12/27 04:11:11 mmarinschek
- * Data Table stores the state of facets of children; script tag is rendered with type attribute instead of language attribute, popup works better as a column in a data table
- *
- * Revision 1.10 2004/12/20 06:13:01 mmarinschek
- * killed bugs
- *
- * Revision 1.9 2004/12/17 22:06:32 grantsmith
- * Jira MYFACES-57: Changed logging levels to DEBUG from INFO
- *
- * Revision 1.8 2004/12/17 13:19:10 mmarinschek
- * new component jsValueChangeListener
- *
- * Revision 1.7 2004/12/03 20:52:11 svieujot
- * Defer script loading for additional performance.
- *
- * Revision 1.6 2004/12/02 22:26:23 svieujot
- * Simplify the AddResource methods
- *
- * Revision 1.5 2004/12/01 16:32:03 svieujot
- * Convert the Multipart filter in an ExtensionsFilter that provides an additional facility to include resources in a page.
- * Tested only with javascript resources right now, but should work fine with images too.
- * Some work to do to include css resources.
- * The popup component has been converted to use this new Filter.
- *
- * Revision 1.4 2004/11/25 08:41:25 matzew
- * removed unused import-statements
- *
- * Revision 1.3 2004/11/23 23:24:04 mmarinschek
- * Popup tag has now more attributes
- *
- * Revision 1.2 2004/11/17 11:25:42 mmarinschek
- * reviewed version of popup
- *
- * Revision 1.1 2004/11/16 16:25:52 mmarinschek
- * new popup - component; not yet finished
- *
- *
*/
public class HtmlPopupRenderer
extends HtmlRenderer
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/popup/HtmlPopupTag.java Wed May 11 09:14:23 2005
@@ -11,26 +11,6 @@
/**
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2005/03/14 20:34:13 mmarinschek
- * fixed bug myfaces-132, thanks to gerhard hofmann
- *
- * Revision 1.5 2005/03/14 13:43:34 svieujot
- * Close MyFaces-132 thanks to Gerhard Hofmann
- *
- * Revision 1.4 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/11/25 08:41:25 matzew
- * removed unused import-statements
- *
- * Revision 1.2 2004/11/23 23:24:04 mmarinschek
- * Popup tag has now more attributes
- *
- * Revision 1.1 2004/11/16 16:25:52 mmarinschek
- * new popup - component; not yet finished
- *
- *
*/
public class HtmlPopupTag
extends HtmlComponentTagBase
@@ -50,7 +30,7 @@
private String _displayAtDistanceY = null;
private String _closePopupOnExitingElement = null;
private String _closePopupOnExitingPopup = null;
-
+
public void release() {
super.release();
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadio.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadio.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadio.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadio.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,29 +22,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.8 2005/04/13 12:48:46 manolito
- * MYFACES-186 x:radio and x:checkbox cause ClassCastException
- * Since the proposed fix is within generated code block, I had to fix the generator instead!
- *
- * Revision 1.7 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.6 2004/07/01 21:53:08 mwessendorf
- * ASF switch
- *
- * Revision 1.5 2004/04/02 13:57:10 manolito
- * extended HtmlSelectManyCheckbox with layout "spread" and custom Checkbox component
- *
- * Revision 1.4 2004/03/31 15:15:58 royalts
- * no message
- *
- * Revision 1.3 2004/03/31 13:43:30 royalts
- * no message
- *
- * Revision 1.2 2004/03/31 13:26:07 manolito
- * extended radio renderer
- *
*/
public class HtmlRadio
extends UIComponentBase
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadioTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadioTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadioTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/radio/HtmlRadioTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,25 +23,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.8 2005/02/18 17:19:31 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.7 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.6 2004/07/01 21:53:08 mwessendorf
- * ASF switch
- *
- * Revision 1.5 2004/05/18 14:31:38 manolito
- * user role support completely moved to components source tree
- *
- * Revision 1.4 2004/04/05 11:04:54 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.3 2004/04/02 13:57:10 manolito
- * extended HtmlSelectManyCheckbox with layout "spread" and custom Checkbox component
- *
*/
public class HtmlRadioTag
extends UIComponentTagBase
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,20 +29,6 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2004/11/30 09:37:43 matzew
- * changes i18n-messages for validation
- *
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/01 21:53:11 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/06/27 22:06:27 mwessendorf
- * Log
- *
- *
*/
public class RegExprValidator implements Validator, StateHolder {
/**
@@ -54,7 +40,7 @@
* <p>The message identifier of the {@link FacesMessage} to be created if
* the creditcard check fails.</p>
*/
- public static final String REGEXPR_MESSAGE_ID = "org.apache.myfaces.Regexpr.INVALID";
+ public static final String REGEXPR_MESSAGE_ID = "org.apache.myfaces.Regexpr.INVALID";
public RegExprValidator(){
}
@@ -62,7 +48,7 @@
//the pattern on which the validation is based.
private String _pattern= null;
-
+
//JSF-Field for StateHolder-IF
private boolean _transient = false;
@@ -84,7 +70,7 @@
Object[] args = {value.toString()};
if(!GenericValidator.matchRegexp(value.toString(),"^"+_pattern+"$")){
throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,REGEXPR_MESSAGE_ID, args));
-
+
}
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/ValidateRegExprTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/ValidateRegExprTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/ValidateRegExprTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/regexprvalidator/ValidateRegExprTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,26 +25,12 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/09/15 07:58:59 mwessendorf
- * Custom Validators now work in OC4J - thanks to Daniel Kamakura for supporting this
- *
- * Revision 1.3 2004/07/01 21:53:11 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/06/27 22:06:27 mwessendorf
- * Log
- *
- *
*/
public class ValidateRegExprTag extends ValidatorTag {
-
+
//the pattern, needed by Commons-Validator.
private String _pattern = null;
-
+
public ValidateRegExprTag(){
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTicker.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTicker.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTicker.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTicker.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,26 +34,9 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2005/02/22 13:41:10 matzew
- * added RENDER_TYPE constant
- *
- * Revision 1.6 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.5 2004/09/15 07:27:01 mwessendorf
- * RssTicker works now behind a firewall
- *
- * Revision 1.4 2004/07/01 21:53:10 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/06/27 22:06:26 mwessendorf
- * Log
- *
- *
*/
public class HtmlRssTicker extends HtmlOutputText{
-
+
private static final Log log = LogFactory.getLog(HtmlRssTicker.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.RssTicker";
public static final String COMPONENT_FAMILY = "javax.faces.Output";
@@ -62,7 +45,7 @@
//private fields
private String _rssUrl = null;
private RSSDigester _digester = null;
- private Channel _channel;
+ private Channel _channel;
public HtmlRssTicker()
@@ -75,8 +58,8 @@
{
return COMPONENT_FAMILY;
}
-
-
+
+
public Object saveState(FacesContext context)
{
Object values[] = new Object[5];
@@ -84,13 +67,13 @@
values[1] = _rssUrl;
return ((Object) (values));
}
-
+
public void restoreState(FacesContext context, Object state)
{
Object values[] = (Object[])state;
super.restoreState(context, values[0]);
_rssUrl = (String)values[1];
- }
+ }
public String getRssUrl() {
if (_rssUrl != null) return _rssUrl;
@@ -101,36 +84,36 @@
public void setRssUrl(String string) {
_rssUrl = string;
- loadNews(_rssUrl);
+ loadNews(_rssUrl);
}
/**
* @param _rssUrl
*/
private void loadNews(String string) {
- try {
-
- this._channel = (Channel)_digester.parse(string);
- } catch(MalformedURLException mue){
+ try {
+
+ this._channel = (Channel)_digester.parse(string);
+ } catch(MalformedURLException mue){
_channel = null;
log.warn("NO CONNECTION TO THE INTERNET. CAN NOT READ RSS-FEED");
}catch (UnknownHostException uhe){
_channel = null;
log.warn("NO CONNECTION TO THE INTERNET. CAN NOT READ RSS-FEED");
- } catch (IOException e1) {
- e1.printStackTrace();
- } catch (SAXException e) {
- e.printStackTrace();
- }
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ } catch (SAXException e) {
+ e.printStackTrace();
+ }
}
- public Channel getChannel() {
- return _channel;
- }
- public int itemCount(){
+ public Channel getChannel() {
+ return _channel;
+ }
+ public int itemCount(){
return _channel.getItems().length;
- }
- public Item[] items(){
- return _channel.getItems();
- }
+ }
+ public Item[] items(){
+ return _channel.getItems();
+ }
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTickerTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTickerTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTickerTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/rssticker/HtmlRssTickerTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,23 +23,6 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2005/02/22 13:41:10 matzew
- * added RENDER_TYPE constant
- *
- * Revision 1.5 2005/02/18 17:19:31 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/01 21:53:10 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/06/27 22:06:26 mwessendorf
- * Log
- *
- *
*/
public class HtmlRssTickerTag extends HtmlOutputTextTagBase{
@@ -59,7 +42,7 @@
// User Role support
private String _enabledOnUserRole;
private String _visibleOnUserRole;
-
+
public void release() {
super.release();
@@ -68,7 +51,7 @@
_visibleOnUserRole=null;
}
-
+
/**
* overrides setProperties() form UIComponentTag.
*/
@@ -80,10 +63,10 @@
setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
}
-
+
//---------------------------------------------only the Setters
-
+
public void setRssUrl(String string) {
_rssUrl = string;
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/savestate/SaveStateTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/savestate/SaveStateTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/savestate/SaveStateTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/savestate/SaveStateTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,19 +20,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/01 21:53:07 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/04/05 11:04:54 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.1 2004/03/31 12:15:27 manolito
- * custom component refactoring
- *
*/
public class SaveStateTag
extends UIComponentTagBase
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,21 +32,17 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/02/09 13:05:20 svieujot
- * new x:selectOneCountry component
- *
*/
public class SelectOneCountry extends HtmlSelectOneMenu {
public static final String COMPONENT_TYPE = "org.apache.myfaces.SelectOneCountry";
private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.SelectOneCountryRenderer";
-
+
private Integer _maxLength = null;
-
+
public SelectOneCountry() {
setRendererType(DEFAULT_RENDERER_TYPE);
}
-
+
public Integer getMaxLength() {
if (_maxLength != null) return _maxLength;
ValueBinding vb = getValueBinding("length");
@@ -55,7 +51,7 @@
public void setMaxLength(Integer maxLength) {
_maxLength = maxLength;
}
-
+
public Object saveState(FacesContext context) {
Object values[] = new Object[2];
values[0] = super.saveState(context);
@@ -68,22 +64,22 @@
super.restoreState(context, values[0]);
_maxLength = (Integer)values[1];
}
-
+
// -------- Over ridden UIComponent methods -----------
-
+
public void encodeChildren(FacesContext context){
// noop
}
-
+
public int getChildCount(){
return Locale.getISOCountries().length;
}
-
+
public List getChildren(){
String[] availableCountries = Locale.getISOCountries();
-
+
Locale currentLocale;
-
+
FacesContext facesContext = FacesContext.getCurrentInstance();
UIViewRoot viewRoot = facesContext.getViewRoot();
if( viewRoot != null )
@@ -91,22 +87,22 @@
else
currentLocale = facesContext.getApplication().getDefaultLocale();
-
+
TreeMap map = new TreeMap();
// TreeMap is sorted according to the keys' natural order
-
+
for(int i=0; i<availableCountries.length; i++){
String countryCode = availableCountries[i];
Locale tmp = new Locale(countryCode, countryCode);
map.put(tmp.getDisplayCountry(currentLocale), countryCode);
}
-
+
List countriesSelectItems = new ArrayList(availableCountries.length);
-
+
int maxDescriptionLength = _maxLength==null ? Integer.MAX_VALUE : _maxLength.intValue();
if( maxDescriptionLength < 5 )
maxDescriptionLength = 5;
-
+
for(Iterator i = map.keySet().iterator(); i.hasNext(); ){
String countryName = (String) i.next();
String countryCode = (String) map.get( countryName );
@@ -116,13 +112,13 @@
else{
label = countryName.substring(0, maxDescriptionLength-3)+"...";
}
-
+
UISelectItem selectItem = new UISelectItem();
selectItem.setValue( new SelectItem(countryCode, label) );
-
+
countriesSelectItems.add( selectItem );
}
-
+
return countriesSelectItems;
}
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,10 +20,6 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/02/09 13:05:20 svieujot
- * new x:selectOneCountry component
- *
*/
public class SelectOneCountryRenderer extends HtmlMenuRenderer {
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,14 +22,6 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.1 2005/02/09 13:05:20 svieujot
- * new x:selectOneCountry component
- *
- *
*/
public class SelectOneCountryTag extends HtmlSelectOneMenuTag {
public String getComponentType() {
@@ -39,20 +31,20 @@
public String getRendererType() {
return "org.apache.myfaces.SelectOneCountryRenderer";
}
-
+
private String maxLength;
-
+
public void release() {
super.release();
maxLength=null;
}
-
+
protected void setProperties(UIComponent component) {
super.setProperties(component);
setIntegerProperty(component, "maxLength", maxLength);
}
-
+
public void setMaxLength(String maxLength){
this.maxLength = maxLength;
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/sortheader/HtmlCommandSortHeaderTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/sortheader/HtmlCommandSortHeaderTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/sortheader/HtmlCommandSortHeaderTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/sortheader/HtmlCommandSortHeaderTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,28 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2005/02/18 17:19:31 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.6 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.5 2004/08/13 13:34:20 manolito
- * HtmlCommandSortHeader now supports immediate attribute
- *
- * Revision 1.4 2004/07/01 21:53:10 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/04/05 11:04:54 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.2 2004/04/01 12:57:41 manolito
- * additional extended component classes for user role support
- *
- * Revision 1.1 2004/03/31 12:15:27 manolito
- * custom component refactoring
- *
*/
public class HtmlCommandSortHeaderTag
extends HtmlCommandLinkTag
@@ -64,7 +42,7 @@
private String _columnName;
private String _arrow;
private boolean _immediateSet;
-
+
public void release() {
super.release();
@@ -76,7 +54,7 @@
// User Role support --> already handled by HtmlPanelGroupTag
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/Stylesheet.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/Stylesheet.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/Stylesheet.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/Stylesheet.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,18 +24,8 @@
/**
- * @author mwessendorf (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/08/22 10:36:50 mwessendorf
- * typo
- *
- * Revision 1.1 2004/08/18 15:36:09 mwessendorf
- * added a new Stylesheet-Component
- *
+ * @author mwessendorf (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class Stylesheet extends UIOutput {
@@ -44,10 +34,10 @@
public static final String COMPONENT_FAMILY = "javax.faces.Output";
private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Stylesheet";
private static final Log log = LogFactory.getLog(Stylesheet.class);
-
+
private String _path = null;
-
-
+
+
// ------------------------------------------------------------ Constructors
public Stylesheet() {
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,15 +27,8 @@
import org.apache.commons.logging.LogFactory;
/**
- * @author mwessendorf (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/08/18 15:36:09 mwessendorf
- * added a new Stylesheet-Component
- *
+ * @author mwessendorf (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class StylesheetRenderer extends HtmlRenderer {
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/stylesheet/StylesheetTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,18 +20,8 @@
import org.apache.myfaces.taglib.html.HtmlOutputTextTagBase;
/**
- * @author mwessendorf (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2005/02/18 17:19:31 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.2 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/08/18 15:36:08 mwessendorf
- * added a new Stylesheet-Component
- *
+ * @author mwessendorf (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class StylesheetTag extends HtmlOutputTextTagBase {
@@ -63,7 +53,7 @@
}
-
+
/**
* overrides setProperties() form UIComponentTag.
*/
@@ -73,9 +63,9 @@
setStringProperty(component, "path", _path);
}
-
+
//---------------------------------------------only the Setters
-
+
public void setPath(String path) {
this._path = path;
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java Wed May 11 09:14:23 2005
@@ -24,13 +24,6 @@
/**
* @author Thomas Spiegl
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2005/01/09 21:56:33 tomsp
- * added new component swapimage
- *
- * Revision 1.1 2005/01/09 12:36:58 tomsp
- * added new component swapimage
- *
*/
public class HtmlSwapImage extends UIGraphic
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java Wed May 11 09:14:23 2005
@@ -34,13 +34,6 @@
/**
* @author Thomas Spiegl
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2005/01/09 21:56:33 tomsp
- * added new component swapimage
- *
- * Revision 1.1 2005/01/09 12:36:58 tomsp
- * added new component swapimage
- *
*/
public class HtmlSwapImageRenderer
extends HtmlRenderer
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/swapimage/HtmlSwapImageTag.java Wed May 11 09:14:23 2005
@@ -22,19 +22,6 @@
/**
* @author Thomas Spiegl
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/03/05 22:50:33 tomsp
- * changed swapimage tag
- *
- * Revision 1.3 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.2 2005/01/09 21:56:33 tomsp
- * added new component swapimage
- *
- * Revision 1.1 2005/01/09 12:36:58 tomsp
- * added new component swapimage
- *
*/
public class HtmlSwapImageTag
extends HtmlGraphicImageTagBase
@@ -62,7 +49,7 @@
_swapImageUrl=null;
_activeImageUrl=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,34 +34,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.10 2005/02/11 16:03:00 mmarinschek
- * solve bug in tabbed panel when datatable was displayed not on tab, but at the bottom of the datatable...
- *
- * Revision 1.9 2005/01/24 12:20:11 mmarinschek
- * Changed the TabbedPane component to only decode components which are on the visible tags - other components are not processed in the decode phase. Changed the HtmlRendererUtils back to submit empty strings for components which should be posted back but have null values.
- *
- * Revision 1.8 2004/11/26 14:29:12 oros
- * bug fix #1006636: VisibleOnUserRole attribute for x:panelTab tag
- *
- * Revision 1.7 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.6 2004/08/09 07:28:20 manolito
- * activeTabStyleClass, inactiveTabStyleClass, activeSubStyleClass, inactiveSubStyleClass, tagContentStyleClass via codegen
- *
- * Revision 1.5 2004/07/10 17:11:02 o_rossmueller
- * added attributes activeTabStyleClass, inactiveTabStyleClass, activeSubStyleClass, inactiveSubStyleClass, tagContentStyleClass to overwrite style attributes using css
- *
- * Revision 1.4 2004/07/01 21:53:05 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/04/16 15:13:31 manolito
- * validator attribute support and MethodBinding invoke exception handling fixed
- *
- * Revision 1.2 2004/04/06 15:36:31 manolito
- * go to render phase after tab switching
- *
*/
public class HtmlPanelTabbedPane
extends HtmlPanelGroup
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,34 +36,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.10 2005/02/16 00:50:37 oros
- * SF issue #1043331: replaced all by the corresponding numeric entity   so safari users will be happy, too, with MyFaces output
- *
- * Revision 1.9 2005/02/11 16:03:00 mmarinschek
- * solve bug in tabbed panel when datatable was displayed not on tab, but at the bottom of the datatable...
- *
- * Revision 1.8 2005/01/24 12:20:11 mmarinschek
- * Changed the TabbedPane component to only decode components which are on the visible tags - other components are not processed in the decode phase. Changed the HtmlRendererUtils back to submit empty strings for components which should be posted back but have null values.
- *
- * Revision 1.7 2004/11/26 14:29:12 oros
- * bug fix #1006636: VisibleOnUserRole attribute for x:panelTab tag
- *
- * Revision 1.6 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.5 2004/08/09 10:52:25 manolito
- * RFE #975649 - Enhance HtmlTabbedPaneRenderer (rendered attribute for TabbedPane component)
- *
- * Revision 1.4 2004/07/10 17:11:02 o_rossmueller
- * added attributes activeTabStyleClass, inactiveTabStyleClass, activeSubStyleClass, inactiveSubStyleClass, tagContentStyleClass to overwrite style attributes using css
- *
- * Revision 1.3 2004/07/01 21:53:05 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/05/18 12:02:13 manolito
- * getActionURL and getResourceURL must not call encodeActionURL or encodeResourceURL
- *
*/
public class HtmlTabbedPaneRenderer
extends HtmlRenderer
@@ -136,7 +108,7 @@
{
return true;
}
-
+
public void encodeChildren(FacesContext facescontext, UIComponent uicomponent) throws IOException
{
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeEvent.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeEvent.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeEvent.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeEvent.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,16 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/01 21:53:05 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/04/06 15:32:14 manolito
- * correct phase is APPLY_REQUEST_VALUES
- *
*/
public class TabChangeEvent
extends FacesEvent
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,22 +31,6 @@
*
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/09/01 18:32:56 mwessendorf
- * Organize Imports
- *
- * Revision 1.1 2004/08/09 22:01:38 o_rossmueller
- * tagChangeListener tag
- *
- * Revision 1.2 2004/07/01 21:53:06 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/22 21:14:55 o_rossmueller
- * TreeSelectionListener support
- *
*/
public class TabChangeListenerTag extends TagSupport
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tree/DefaultMutableTreeNode.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tree/DefaultMutableTreeNode.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tree/DefaultMutableTreeNode.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tree/DefaultMutableTreeNode.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,18 +22,9 @@
/**
* Default implementation of {@link MutableTreeNode}.
- *
+ *
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller </a>
* @version $Revision$ $Date$
- *
- * $Log$
- * Revision 1.5 2005/02/24 01:46:20 oros
- * fixed constructor to use List instead of ArrayList
- *
- * Revision 1.4 2004/11/26 12:14:10 oros
- * MYFACES-8: applied tree table patch by David Le Strat
- *
- *
*/
public class DefaultMutableTreeNode implements MutableTreeNode
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTree.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTree.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTree.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTree.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,26 +48,6 @@
*
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller </a>
* @version $Revision$ $Date$
- * <p/>
- * $Log$
- * Revision 1.31 2005/03/30 07:41:58 matzew
- * closed MYFACES-139. Thanks to Mathias Broekelmann
- *
- * Revision 1.30 2005/02/11 00:54:02 svieujot
- * Revert changes commited to the wrong branch.
- *
- * Revision 1.28 2004/12/24 14:13:16 svieujot
- * Upgrade the tree component to use the Extensions filter.
- *
- * Revision 1.27 2004/11/26 12:46:38 oros
- * cleanup: removed unused iconChild attribute
- *
- * Revision 1.26 2004/11/26 12:33:54 oros
- * MYFACES-9: store iconChildMiddle in component state
- *
- * Revision 1.25 2004/11/26 12:14:10 oros
- * MYFACES-8: applied tree table patch by David Le Strat
- *
*/
public class HtmlTree extends HtmlPanelGroup implements TreeModelListener
{
@@ -80,7 +60,7 @@
private static final int EVENT_REMOVED = 2;
private static final int EVENT_STRUCTURE_CHANGED = 3;
private static int counter = 0;
-
+
// Defaut images
private static final String DEFAULT_IMAGE_ICON_LINE = "images/line.gif";
private static final String DEFAULT_IMAGE_ICON_NOLINE = "images/noline.gif";
@@ -95,7 +75,7 @@
private static final String DEFAULT_IMAGE_ICON_NODE_CLOSE_FIRST = "images/node_close_first.gif";
private static final String DEFAULT_IMAGE_ICON_NODE_CLOSE_MIDDLE = "images/node_close_middle.gif";
private static final String DEFAULT_IMAGE_ICON_NODE_CLOSE_LAST = "images/node_close_last.gif";
-
+
private IconProvider iconProvider;
private boolean itemStatesRestored = false;
private String var;
@@ -197,7 +177,7 @@
{
if( iconLine != null )
return iconLine;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_LINE );
}
@@ -212,7 +192,7 @@
{
if( iconNoline != null )
return iconNoline;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NOLINE );
}
@@ -227,7 +207,7 @@
{
if( iconChildFirst != null )
return iconChildFirst;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_CHILD_FIRST );
}
@@ -242,7 +222,7 @@
{
if( iconChildMiddle != null )
return iconChildMiddle;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_CHILD_MIDDLE );
}
@@ -257,7 +237,7 @@
{
if( iconChildLast != null )
return iconChildLast;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_CHILD_LAST );
}
@@ -272,7 +252,7 @@
{
if( iconNodeOpen != null )
return iconNodeOpen;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NODE_OPEN );
}
@@ -287,7 +267,7 @@
{
if( iconNodeOpenFirst != null )
return iconNodeOpenFirst;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NODE_OPEN_FIRST );
}
@@ -302,7 +282,7 @@
{
if( iconNodeOpenMiddle != null )
return iconNodeOpenMiddle;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NODE_OPEN_MIDDLE );
}
@@ -317,7 +297,7 @@
{
if( iconNodeOpenLast != null )
return iconNodeOpenLast;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NODE_OPEN_LAST );
}
@@ -332,7 +312,7 @@
{
if( iconNodeClose != null )
return iconNodeClose;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NODE_CLOSE );
}
@@ -347,7 +327,7 @@
{
if( iconNodeCloseFirst != null )
return iconNodeCloseFirst;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NODE_CLOSE_FIRST );
}
@@ -362,7 +342,7 @@
{
if( iconNodeCloseMiddle != null )
return iconNodeCloseMiddle;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NODE_CLOSE_MIDDLE );
}
@@ -377,7 +357,7 @@
{
if( iconNodeCloseLast != null )
return iconNodeCloseLast;
-
+
return getDefaultImagePath( DEFAULT_IMAGE_ICON_NODE_CLOSE_LAST );
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,16 +24,6 @@
*
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 21:53:07 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/22 10:20:23 manolito
- * tree component
- *
*/
public class HtmlTreeImageCommandLink
extends HtmlCommandLink
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeNode.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeNode.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeNode.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tree/HtmlTreeNode.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,15 +30,7 @@
*
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
* @version $Revision$ $Date$
- *
- * $Log$
- * Revision 1.12 2004/11/26 12:46:38 oros
- * cleanup: removed unused iconChild attribute
- *
- * Revision 1.11 2004/11/26 12:14:10 oros
- * MYFACES-8: applied tree table patch by David Le Strat
- *
- */
+* /
public class HtmlTreeNode
extends HtmlCommandLink
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/tree/IconProvider.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/tree/IconProvider.java?rev=169651&r1=169650&r2=169651&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/tree/IconProvider.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/tree/IconProvider.java Wed May 11 09:14:23 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,16 +20,6 @@
*
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:50:58 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 21:53:07 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/04 12:19:14 o_rossmueller
- * added icon provider
- *
*/
public interface IconProvider
{