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:45:12 UTC
svn commit: r169655 [4/8] - in /myfaces/trunk:
src/cactus/org/apache/myfaces/renderkit/html/
src/cactus/org/apache/myfaces/taglib/core/
src/cactus/org/apache/myfaces/taglib/html/
src/components/org/apache/myfaces/renderkit/html/ext/
src/components/org/apache/myfaces/taglib/html/ext/
src/junit/org/apache/myfaces/renderkit/
src/junit/org/apache/myfaces/renderkit/html/
src/junit/org/apache/myfaces/renderkit/html/util/
src/junit/org/apache/myfaces/util/ src/junit/org/apache/myfaces/webapp/
src/myfaces/org/apache/myfaces/lifecycle/
src/myfaces/org/apache/myfaces/portlet/
src/myfaces/org/apache/myfaces/renderkit/
src/myfaces/org/apache/myfaces/renderkit/html/
src/myfaces/org/apache/myfaces/taglib/core/
src/myfaces/org/apache/myfaces/taglib/html/
src/myfaces/org/apache/myfaces/util/ src/myfaces/org/apache/myfaces/webapp/
src/myfaces/org/apache/myfaces/webapp/filter/
src/share/org/apache/myfaces/renderkit/
src/share/org/apache/myfaces/renderkit/html/
src/share/org/apache/myfaces/renderkit/html/util/
src/share/org/apache/myfaces/taglib/
src/share/org/apache/myfaces/taglib/core/
src/share/org/apache/myfaces/taglib/html/ src/share/org/apache/myfaces/util/
src/share/org/apache/myfaces/webapp/webxml/
src/wml/org/apache/myfaces/wap/base/ src/wml/org/apache/myfaces/wap/def/
src/wml/org/apache/myfaces/wap/renderkit/
src/wml/org/apache/myfaces/wap/renderkit/wml/
src/xdoclet/org/apache/myfaces/xdoclet/
webapps/src/example/org/apache/myfaces/examples/validate/
Modified: myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java Wed May 11 09:45:06 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,43 +34,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Anton Koinov
* @version $Revision$ $Date$
- * $Log$
- * 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/23 09:15:15 mmarinschek
- * changes to utils to handle ie better
- *
- * Revision 1.10 2004/12/02 21:31:56 svieujot
- * Bugfix in encodeString
- *
- * Revision 1.9 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.8 2004/09/10 14:13:52 manolito
- * trivial change
- *
- * Revision 1.7 2004/09/08 15:51:15 manolito
- * Autoscroll now also for horizontal scrolling
- *
- * Revision 1.6 2004/09/08 15:23:11 manolito
- * Autoscroll feature
- *
- * Revision 1.5 2004/09/08 09:31:25 manolito
- * moved isJavascriptDetected from MyFacesConfig to JavascriptUtils class
- *
- * Revision 1.4 2004/07/16 13:06:30 manolito
- * encode javascript strings for jscook menu labels
- *
- * Revision 1.3 2004/07/09 02:44:55 dave0000
- * More efficient implementation
- *
- * Revision 1.2 2004/07/01 22:00:53 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/29 14:25:22 manolito
- * javascript function name bugfix
- *
*/
public final class JavascriptUtils
{
@@ -88,8 +51,8 @@
{
// utility class, do not instantiate
}
-
- private static final Set RESERVED_WORDS =
+
+ private static final Set RESERVED_WORDS =
new HashSet(Arrays.asList(new String[]{
"abstract",
"boolean",
@@ -146,19 +109,19 @@
"while",
"with"
}));
-
+
public static String getValidJavascriptName(String s, boolean checkForReservedWord)
{
if (checkForReservedWord && RESERVED_WORDS.contains(s))
{
return s + "_";
}
-
+
StringBuffer buf = null;
for (int i = 0, len = s.length(); i < len; i++)
{
char c = s.charAt(i);
-
+
if (Character.isLetterOrDigit(c))
{
// allowed char
@@ -171,14 +134,14 @@
buf = new StringBuffer(s.length() + 10);
buf.append(s.substring(0, i));
}
-
+
buf.append('_');
if (c < 16)
- {
+ {
// pad single hex digit values with '0' on the left
buf.append('0');
}
-
+
if (c < 128)
{
// first 128 chars match their byte representation in UTF-8
@@ -187,7 +150,7 @@
else
{
byte[] bytes;
- try
+ try
{
bytes = Character.toString(c).getBytes("UTF-8");
}
@@ -195,16 +158,16 @@
{
throw new RuntimeException(e);
}
-
+
for (int j = 0; j < bytes.length; j++)
{
int intVal = bytes[j];
- if (intVal < 0)
+ if (intVal < 0)
{
// intVal will be >= 128
intVal = 256 + intVal;
}
- else if (intVal < 16)
+ else if (intVal < 16)
{
// pad single hex digit values with '0' on the left
buf.append('0');
@@ -213,9 +176,9 @@
}
}
}
-
+
}
-
+
return buf == null ? s : buf.toString();
}
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentBodyTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentBodyTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentBodyTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentBodyTagBase.java Wed May 11 09:45:06 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,49 +31,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.15 2005/03/05 10:29:56 mmarinschek
- * better error handling
- *
- * Revision 1.14 2005/01/30 15:24:10 matzew
- * thanks to sean schofield for removing *legacy* attributes of MyFaces
- *
- * Revision 1.13 2005/01/28 17:19:09 matzew
- * Patch for MYFACES-91 form Sean Schofield
- *
- * Revision 1.12 2005/01/25 22:15:53 matzew
- * JavaDoc patch form Sean Schofield
- *
- * Revision 1.11 2005/01/10 08:08:12 matzew
- * added patch form sean schofield. forceId for reuse of "legacy JavaScript" (MyFaces-70)
- *
- * Revision 1.10 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.9 2004/07/01 22:01:21 mwessendorf
- * ASF switch
- *
- * Revision 1.8 2004/04/16 15:13:33 manolito
- * validator attribute support and MethodBinding invoke exception handling fixed
- *
- * Revision 1.7 2004/04/05 11:04:56 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.6 2004/04/01 13:18:39 manolito
- * warning message
- *
- * Revision 1.5 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
- * Revision 1.4 2004/04/01 09:33:43 manolito
- * user role support removed
- *
- * Revision 1.3 2004/03/31 11:14:28 royalts
- * no message
- *
- * Revision 1.2 2004/03/30 12:16:08 manolito
- * header comments
- *
*/
public abstract class UIComponentBodyTagBase
extends UIComponentBodyTag
@@ -100,7 +57,7 @@
/**
* TODO: Ignore <!-- --> comments
- */
+ */
private boolean isBodyContentEmpty()
{
BodyContent bodyContent = getBodyContent();
@@ -153,10 +110,10 @@
}
/**
- * Sets the forceId attribute of the tag. NOTE: Not every tag that extends this class will
- * actually make use of this attribute. Check the TLD to see which components actually
+ * Sets the forceId attribute of the tag. NOTE: Not every tag that extends this class will
+ * actually make use of this attribute. Check the TLD to see which components actually
* implement it.
- *
+ *
* @param aForceId The value of the forceId attribute.
*/
public void setForceId(String aForceId)
@@ -165,9 +122,9 @@
}
/**
- * Sets the forceIdIndex attribute of the tag. NOTE: Not every tag that extends this class will
+ * Sets the forceIdIndex attribute of the tag. NOTE: Not every tag that extends this class will
* actually make use of this attribute. Check the TLD to see which components actually implement it.
- *
+ *
* @param aForceIdIndex The value of the forceIdIndex attribute.
*/
public void setForceIdIndex(String aForceIdIndex)
@@ -218,7 +175,7 @@
{
UIComponentTagUtils.setValidatorProperty(getFacesContext(), component, value);
}
-
+
protected void setActionProperty(UIComponent component, String action)
{
UIComponentTagUtils.setActionProperty(getFacesContext(), component, action);
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentTagBase.java Wed May 11 09:45:06 2005
@@ -23,43 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.13 2005/03/07 09:06:51 matzew
- * Patch for the new tree form Sean Schofield
- *
- * Revision 1.12 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.11 2005/01/30 15:24:10 matzew
- * thanks to sean schofield for removing *legacy* attributes of MyFaces
- *
- * Revision 1.10 2005/01/28 17:19:09 matzew
- * Patch for MYFACES-91 form Sean Schofield
- *
- * Revision 1.9 2005/01/25 22:15:53 matzew
- * JavaDoc patch form Sean Schofield
- *
- * Revision 1.8 2005/01/10 08:08:12 matzew
- * added patch form sean schofield. forceId for reuse of "legacy JavaScript" (MyFaces-70)
- *
- * Revision 1.7 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.6 2004/07/01 22:01:21 mwessendorf
- * ASF switch
- *
- * Revision 1.5 2004/04/16 15:13:33 manolito
- * validator attribute support and MethodBinding invoke exception handling fixed
- *
- * Revision 1.4 2004/04/05 11:04:57 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.3 2004/04/01 09:33:43 manolito
- * user role support removed
- *
- * Revision 1.2 2004/03/30 12:16:08 manolito
- * header comments
- *
*/
public abstract class UIComponentTagBase
extends UIComponentTag
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentTagUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentTagUtils.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentTagUtils.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/UIComponentTagUtils.java Wed May 11 09:45:06 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.
@@ -33,25 +33,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.6 2004/08/06 22:41:00 o_rossmueller
- * fix #995085: set value of UIGraphic
- *
- * Revision 1.5 2004/07/01 22:01:21 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/04/23 13:57:54 manolito
- * bug #940740
- *
- * Revision 1.3 2004/04/16 15:13:33 manolito
- * validator attribute support and MethodBinding invoke exception handling fixed
- *
- * Revision 1.2 2004/03/30 12:16:08 manolito
- * header comments
- *
*/
public class UIComponentTagUtils
{
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/core/SelectItemTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/core/SelectItemTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/core/SelectItemTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/core/SelectItemTagBase.java Wed May 11 09:45:06 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 Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:36 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/06/23 13:44:22 royalts
- * no message
- *
*/
public class SelectItemTagBase
extends UIComponentTagBase
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlCommandButtonTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlCommandButtonTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlCommandButtonTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlCommandButtonTagBase.java Wed May 11 09:45:06 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,19 +25,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlCommandButtonTagBase
extends HtmlComponentTagBase
@@ -71,7 +58,7 @@
// HtmlCommandButton attributes
private String _image;
-
+
public void release() {
super.release();
_accesskey=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlCommandLinkTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlCommandLinkTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlCommandLinkTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlCommandLinkTagBase.java Wed May 11 09:45:06 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,22 +24,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.4 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/04/29 18:51:35 o_rossmueller
- * moved 'target' attribute to standard htmlCommandLink
- *
- * Revision 1.1 2004/03/31 11:58:44 manolito
- * custom component refactoring
- *
*/
public abstract class HtmlCommandLinkTagBase
extends HtmlComponentTagBase
@@ -75,7 +59,7 @@
private String _action;
private String _immediate;
private String _actionListener;
-
+
public void release() {
super.release();
_accesskey=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlComponentBodyTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlComponentBodyTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlComponentBodyTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlComponentBodyTagBase.java Wed May 11 09:45:06 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,19 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/03/30 13:24:59 manolito
- * refactoring: HtmlComponentTag moved to share and renamed to HtmlComponentTagBase
- *
*/
public abstract class HtmlComponentBodyTagBase
extends UIComponentBodyTagBase
@@ -79,7 +66,7 @@
_onmouseover=null;
_onmouseup=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlComponentTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlComponentTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlComponentTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlComponentTagBase.java Wed May 11 09:45:06 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,19 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 17:19:29 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/03/30 13:24:59 manolito
- * refactoring: HtmlComponentTag moved to share and renamed to HtmlComponentTagBase
- *
*/
public abstract class HtmlComponentTagBase
extends UIComponentTagBase
@@ -60,7 +47,7 @@
private String _onmouseout;
private String _onmouseover;
private String _onmouseup;
-
+
public void release() {
super.release();
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlDataTableTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlDataTableTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlDataTableTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlDataTableTagBase.java Wed May 11 09:45:06 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,19 +23,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/03/31 11:58:44 manolito
- * custom component refactoring
- *
*/
public abstract class HtmlDataTableTagBase
extends HtmlComponentBodyTagBase
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlFormTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlFormTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlFormTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlFormTagBase.java Wed May 11 09:45:06 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,19 +22,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlFormTagBase
extends HtmlComponentTagBase
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlGraphicImageTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlGraphicImageTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlGraphicImageTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlGraphicImageTagBase.java Wed May 11 09:45:06 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,19 +25,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 17:19:29 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlGraphicImageTagBase
extends HtmlComponentTagBase
@@ -70,21 +57,21 @@
// HtmlGraphicImage attributes
//none so far
-
+
public void release() {
super.release();
- _align=null;
+ _align=null;
_alt=null;
- _border=null;
+ _border=null;
_height=null;
- _hspace=null;
+ _hspace=null;
_ismap=null;
_longdesc=null;
_onblur=null;
_onchange=null;
_onfocus=null;
_usemap=null;
- _vspace=null;
+ _vspace=null;
_width=null;
}
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputHiddenTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputHiddenTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputHiddenTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputHiddenTagBase.java Wed May 11 09:45:06 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.
@@ -21,19 +21,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/04/19 20:51:45 schof
- * Moved HtmlInputHiddenTag to the components package since I needed a tag for x:inputHidden. It could not stay in the share directory since the component it references is not in the share package. Since HtmlInputHiddenTagBase was not doing anything I changed it so it could serve as the tag for h:inputHidden.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlInputHiddenTagBase
extends HtmlInputTagBase
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputSecretTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputSecretTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputSecretTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputSecretTagBase.java Wed May 11 09:45:06 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,19 +25,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlInputSecretTagBase
extends HtmlInputTagBase
@@ -75,7 +62,7 @@
// HTMLInputSecret attributes
private String _redisplay;
-
+
public void release() {
super.release();
_accesskey=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTagBase.java Wed May 11 09:45:06 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,31 +24,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2005/02/18 17:19:29 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.6 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.5 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/06/22 15:31:00 prophecyslides
- * Added readonly attribute
- *
- * Revision 1.3 2004/04/16 15:13:31 manolito
- * validator attribute support and MethodBinding invoke exception handling fixed
- *
- * Revision 1.2 2004/04/05 11:04:56 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.1 2004/03/30 13:41:20 royalts
- * no message
- *
- * Revision 1.2 2004/03/30 12:16:08 manolito
- * header comments
- *
*/
public abstract class HtmlInputTagBase
extends HtmlComponentTagBase
@@ -74,7 +49,7 @@
_valueChangeListener=null;
_readonly=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTextTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTextTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTextTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTextTagBase.java Wed May 11 09:45:06 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,19 +24,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlInputTextTagBase
extends HtmlInputTagBase
@@ -79,7 +66,7 @@
super.release();
_accesskey=null;
_align=null;
- _alt=null;
+ _alt=null;
_datafld=null;
_datasrc=null;
_dataformatas=null;
@@ -94,7 +81,7 @@
_tabindex=null;
_escape=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTextareaTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTextareaTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTextareaTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlInputTextareaTagBase.java Wed May 11 09:45:06 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,19 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlInputTextareaTagBase
extends HtmlInputTagBase
@@ -77,9 +64,9 @@
super.release();
_accesskey=null;
_cols=null;
- _datafld=null;
+ _datafld=null;
_datasrc=null;
- _dataformatas=null;
+ _dataformatas=null;
_disabled=null;
_onblur=null;
_onchange=null;
@@ -90,7 +77,7 @@
_tabindex=null;
_alt=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlMessageTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlMessageTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlMessageTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlMessageTagBase.java Wed May 11 09:45:06 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,19 +22,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/03/30 13:24:59 manolito
- * refactoring: HtmlComponentTag moved to share and renamed to HtmlComponentTagBase
- *
*/
public abstract class HtmlMessageTagBase
extends HtmlComponentTagBase
@@ -64,7 +51,7 @@
private String _fatalClass;
private String _fatalStyle;
private String _tooltip;
-
+
public void release() {
super.release();
_for=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputFormatTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputFormatTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputFormatTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputFormatTagBase.java Wed May 11 09:45:06 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,19 +22,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlOutputFormatTagBase
extends HtmlComponentTagBase
@@ -54,7 +41,7 @@
// HtmlOutputMessage attributes
private String _escape;
-
+
public void release() {
super.release();
_escape=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputLabelTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputLabelTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputLabelTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputLabelTagBase.java Wed May 11 09:45:06 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,19 +25,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 17:19:29 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlOutputLabelTagBase
extends HtmlComponentTagBase
@@ -60,7 +47,7 @@
//HTMLOutputLabel attributes
private String _for;
-
+
public void release() {
super.release();
_accesskey=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputLinkTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputLinkTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputLinkTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputLinkTagBase.java Wed May 11 09:45:06 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,19 +24,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlOutputLinkTagBase
extends HtmlComponentTagBase
@@ -69,7 +56,7 @@
// value and converterId --> already implemented in UIComponentTagBase
//HtmlCommandLink Attributes
-
+
public void release() {
super.release();
_accesskey=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputTextTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputTextTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputTextTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlOutputTextTagBase.java Wed May 11 09:45:06 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,19 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 17:19:29 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlOutputTextTagBase
extends HtmlComponentTagBase
@@ -53,7 +40,7 @@
// HtmlOutputText attributes
private String _escape;
-
+
public void release() {
super.release();
_escape=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlPanelGridTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlPanelGridTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlPanelGridTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlPanelGridTagBase.java Wed May 11 09:45:06 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,19 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlPanelGridTagBase
extends HtmlComponentBodyTagBase
@@ -94,7 +81,7 @@
_headerClass=null;
_rowClasses=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlPanelGroupTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlPanelGroupTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlPanelGroupTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlPanelGroupTagBase.java Wed May 11 09:45:06 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 Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlPanelGroupTagBase
extends HtmlComponentBodyTagBase
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectBooleanCheckboxTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectBooleanCheckboxTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectBooleanCheckboxTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectBooleanCheckboxTagBase.java Wed May 11 09:45:06 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,19 +24,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlSelectBooleanCheckboxTagBase
extends HtmlInputTagBase
@@ -86,7 +73,7 @@
_readonly=null;
_tabindex=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectListboxTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectListboxTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectListboxTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectListboxTagBase.java Wed May 11 09:45:06 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,19 +26,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlSelectListboxTagBase
extends HtmlInputTagBase
@@ -84,7 +71,7 @@
_size=null;
_tabindex=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectManyCheckboxTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectManyCheckboxTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectManyCheckboxTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectManyCheckboxTagBase.java Wed May 11 09:45:06 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,19 +25,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlSelectManyCheckboxTagBase
extends HtmlInputTagBase
@@ -75,13 +62,13 @@
private String _disabledClass;
private String _enabledClass;
private String _layout;
-
+
//FIXME: here there is no border element, in the others
// (HTMLSelectOneMenuTag, HtmlSelectOneRadioTag)
// there is... inconsistent...
//private String _border;
-
-
+
+
public void release() {
super.release();
_accesskey=null;
@@ -95,7 +82,7 @@
_onfocus=null;
_onselect=null;
_readonly=null;
- _size=null;
+ _size=null;
_tabindex=null;
_disabledClass=null;
_enabledClass=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectMenuTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectMenuTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectMenuTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectMenuTagBase.java Wed May 11 09:45:06 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,19 +26,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 18:24:35 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/01 12:57:44 manolito
- * additional extended component classes for user role support
- *
*/
public abstract class HtmlSelectMenuTagBase
extends HtmlInputTagBase
@@ -71,7 +58,7 @@
//HtmlSelectManyMenu Attributes
private String _border;
-
+
public void release() {
super.release();
_datafld=null;
Modified: myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectOneRadioTagBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectOneRadioTagBase.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectOneRadioTagBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/taglib/html/HtmlSelectOneRadioTagBase.java Wed May 11 09:45:06 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,19 +25,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Martin Marinschek
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/02/18 17:19:29 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/03/31 13:26:11 manolito
- * extended radio renderer
- *
*/
public abstract class HtmlSelectOneRadioTagBase
extends HtmlInputTagBase
@@ -93,7 +80,7 @@
_enabledClass=null;
_layout=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/share/org/apache/myfaces/util/ArrayUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/util/ArrayUtils.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/util/ArrayUtils.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/util/ArrayUtils.java Wed May 11 09:45:06 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 @@
/**
* Utility class for managing arrays
- *
- * $Log$
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:12 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/03/29 14:57:01 manolito
- * refactoring for implementation and non-standard component split
- *
- * Revision 1.8 2004/03/25 12:41:19 manolito
- * convenient constants for empty arrays
*
* @author Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/trunk/src/share/org/apache/myfaces/util/BiLevelCacheMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/util/BiLevelCacheMap.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/util/BiLevelCacheMap.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/util/BiLevelCacheMap.java Wed May 11 09:45:06 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,37 +28,21 @@
* and L2 cleared.
* </p>
* <p>
- * IMPORTANT:entrySet(), keySet(), and values() return unmodifiable snapshot collections.
+ * IMPORTANT:entrySet(), keySet(), and values() return unmodifiable snapshot collections.
* </p>
*
* @author Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.5 2004/08/10 08:23:13 manolito
- * trivial javadoc changes only
- *
- * Revision 1.4 2004/07/01 22:01:13 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/04/26 05:54:59 dave0000
- * Add coercion to ValueBinding (and related changes)
- *
- * Revision 1.2 2004/04/01 05:37:34 dave0000
- * Correct L2->L1 merge condition
- *
*/
public abstract class BiLevelCacheMap implements Map
{
//~ Instance fields ----------------------------------------------------------------------------
-
+
private static final int INITIAL_SIZE_L1 = 32;
/** To preinitialize <code>_cacheL1</code> with default values use an initialization block */
protected Map _cacheL1;
-
+
/** Must be final because it is used for synchronization */
private final Map _cacheL2;
private final int _mergeThreshold;
@@ -74,7 +58,7 @@
}
//~ Methods ------------------------------------------------------------------------------------
-
+
public boolean isEmpty()
{
synchronized (_cacheL2) {
@@ -106,7 +90,7 @@
public Set entrySet()
{
- synchronized (_cacheL2)
+ synchronized (_cacheL2)
{
mergeIfL2NotEmpty();
return Collections.unmodifiableSet(_cacheL1.entrySet());
@@ -148,21 +132,21 @@
mergeIfNeeded();
}
}
-
+
return retval;
}
public Set keySet()
{
- synchronized (_cacheL2)
+ synchronized (_cacheL2)
{
mergeIfL2NotEmpty();
return Collections.unmodifiableSet(_cacheL1.keySet());
}
}
- /**
- * If key is already in cacheL1, the new value will show with a delay,
+ /**
+ * If key is already in cacheL1, the new value will show with a delay,
* since merge L2->L1 may not happen immediately. To force the merge sooner,
* call <code>size()<code>.
*/
@@ -171,12 +155,12 @@
synchronized (_cacheL2)
{
_cacheL2.put(key, value);
-
+
// not really a miss, but merge to avoid big increase in L2 size
// (it cannot be reallocated, it is final)
mergeIfNeeded();
}
-
+
return value;
}
@@ -185,7 +169,7 @@
synchronized (_cacheL2)
{
mergeIfL2NotEmpty();
-
+
// sepatare merge to avoid increasing L2 size too much
// (it cannot be reallocated, it is final)
merge(map);
@@ -202,7 +186,7 @@
// nothing to remove
return null;
}
-
+
Object retval;
Map newMap;
synchronized (_cacheL1)
@@ -212,7 +196,7 @@
newMap = HashMapUtils.merge(_cacheL1, _cacheL2);
retval = newMap.remove(key);
}
-
+
_cacheL1 = newMap;
_cacheL2.clear();
_missCount = 0;
@@ -222,9 +206,9 @@
public int size()
{
- // Note: cannot simply return L1.size + L2.size
+ // Note: cannot simply return L1.size + L2.size
// because there might be overlaping of keys
- synchronized (_cacheL2)
+ synchronized (_cacheL2)
{
mergeIfL2NotEmpty();
return _cacheL1.size();
@@ -233,30 +217,30 @@
public Collection values()
{
- synchronized (_cacheL2)
+ synchronized (_cacheL2)
{
mergeIfL2NotEmpty();
return Collections.unmodifiableCollection(_cacheL1.values());
}
}
-
- private void mergeIfL2NotEmpty()
+
+ private void mergeIfL2NotEmpty()
{
if (!_cacheL2.isEmpty())
{
merge(_cacheL2);
}
}
-
- private void mergeIfNeeded()
+
+ private void mergeIfNeeded()
{
if (++_missCount >= _mergeThreshold)
{
merge(_cacheL2);
}
}
-
- private void merge(Map map)
+
+ private void merge(Map map)
{
Map newMap;
synchronized (_cacheL1)
@@ -274,15 +258,15 @@
/**
* Subclasses must implement to have automatic creation of new instances
* or alternatively can use <code>put<code> to add new items to the cache.<br>
- *
+ *
* Implementing this method is prefered to guarantee that there will be only
* one instance per key ever created. Calling put() to add items in a multi-
* threaded situation will require external synchronization to prevent two
* instances for the same key, which defeats the purpose of this cache
* (put() is useful when initialization is done during startup and items
- * are not added during execution or when (temporarily) having possibly two
+ * are not added during execution or when (temporarily) having possibly two
* or more instances of the same key is not of concern).<br>
- *
+ *
* @param key lookup key
* @return new instace for the requested key
*/
Modified: myfaces/trunk/src/share/org/apache/myfaces/util/ClassUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/util/ClassUtils.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/util/ClassUtils.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/util/ClassUtils.java Wed May 11 09:45:06 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,43 +32,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Anton Koinov
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.11 2005/01/19 13:18:04 mmarinschek
- * better logging of component information
- *
- * Revision 1.10 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.9 2004/10/05 22:34:21 dave0000
- * bug 1021656 with related improvements
- *
- * Revision 1.8 2004/08/10 10:57:38 manolito
- * fixed StackOverflow in ClassUtils and cleaned up ClassUtils methods
- *
- * Revision 1.7 2004/08/05 22:55:51 o_rossmueller
- * fix: resolve primitive classes
- *
- * Revision 1.6 2004/07/13 04:59:25 tinytoony
- * primitive types where not retrieved (call to javaTypeToClass not used)
- *
- * Revision 1.5 2004/07/13 04:56:55 tinytoony
- * primitive types where not retrieved (call to javaTypeToClass not used)
- *
- * Revision 1.4 2004/07/01 22:01:13 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/05/17 14:28:29 manolito
- * new configuration concept
- *
- * Revision 1.2 2004/05/11 04:24:10 dave0000
- * Bug 943166: add value coercion to ManagedBeanConfigurator
- *
- * Revision 1.1 2004/03/31 11:58:45 manolito
- * custom component refactoring
- *
- * Revision 1.12 2004/03/30 13:27:50 manolito
- * new getResourceAsStream method
- *
*/
public class ClassUtils
{
@@ -76,7 +39,7 @@
private static final Log log = LogFactory.getLog(ClassUtils.class);
private static final Logger COERCION_LOGGER = new Logger(System.out);
-
+
public static final Class BOOLEAN_ARRAY_CLASS = boolean[].class;
public static final Class BYTE_ARRAY_CLASS = byte[].class;
public static final Class CHAR_ARRAY_CLASS = char[].class;
@@ -118,7 +81,7 @@
COMMON_TYPES.put("java.lang.Float", Float.class);
COMMON_TYPES.put("java.lang.Double", Double.class);
COMMON_TYPES.put("java.lang.String", String.class);
-
+
COMMON_TYPES.put("byte[]", BYTE_ARRAY_CLASS);
COMMON_TYPES.put("char[]", CHAR_ARRAY_CLASS);
COMMON_TYPES.put("double[]", DOUBLE_ARRAY_CLASS);
@@ -139,7 +102,7 @@
COMMON_TYPES.put("java.lang.String[]", STRING_OBJECT_ARRAY_CLASS);
// array of void is not a valid type
}
-
+
/** utility class, do not instantiate */
private ClassUtils()
{
@@ -152,7 +115,7 @@
* Tries a Class.forName with the context class loader of the current thread first and
* automatically falls back to the ClassUtils class loader (i.e. the loader of the
* myfaces.jar lib) if necessary.
- *
+ *
* @param type fully qualified name of a non-primitive non-array class
* @return the corresponding Class
* @throws NullPointerException if type is null
@@ -182,7 +145,7 @@
/**
* Same as {@link #classForName(String)}, but throws a RuntimeException
* (FacesException) instead of a ClassNotFoundException.
- *
+ *
* @return the corresponding Class
* @throws NullPointerException if type is null
* @throws FacesException if class not found
@@ -204,7 +167,7 @@
/**
* Similar as {@link #classForName(String)}, but also supports primitive types
* and arrays as specified for the JavaType element in the JavaServer Faces Config DTD.
- *
+ *
* @param type fully qualified class name or name of a primitive type, both optionally
* followed by "[]" to indicate an array type
* @return the corresponding Class
@@ -240,7 +203,7 @@
/**
* Same as {@link #javaTypeToClass(String)}, but throws a RuntimeException
* (FacesException) instead of a ClassNotFoundException.
- *
+ *
* @return the corresponding Class
* @throws NullPointerException if type is null
* @throws FacesException if class not found
@@ -316,19 +279,19 @@
catch (ELException e)
{
String message = "Cannot coerce " + value.getClass().getName()
- + " to " + desiredClass.getName();
+ + " to " + desiredClass.getName();
log.error(message, e);
throw new FacesException(message, e);
}
}
/**
- * Gets the ClassLoader associated with the current thread. Returns the class loader associated with
+ * Gets the ClassLoader associated with the current thread. Returns the class loader associated with
* the specified default object if no context loader is associated with the current thread.
- *
+ *
* @param defaultObject The default object to use to determine the class loader (if none associated with current thread.)
* @return ClassLoader
- */
+ */
protected static ClassLoader getCurrentLoader(Object defaultObject)
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Modified: myfaces/trunk/src/share/org/apache/myfaces/util/LocaleUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/util/LocaleUtils.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/util/LocaleUtils.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/util/LocaleUtils.java Wed May 11 09:45:06 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,28 +24,21 @@
/**
* @author Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/08/23 05:13:39 dave0000
- * Externalize String-to-Locale conversion
- *
*/
public class LocaleUtils
{
private static final Log log = LogFactory.getLog(LocaleUtils.class);
-
+
/** Utility class, do not instatiate */
private LocaleUtils()
{
// utility class, do not instantiate
}
-
- /**
+
+ /**
* Converts a locale string to <code>Locale</code> class. Accepts both
* '_' and '-' as separators for locale components.
- *
+ *
* @param localeString string representation of a locale
* @return Locale instance, compatible with the string representation
*/
@@ -67,7 +60,7 @@
separatorCountry = localeString.indexOf('-');
separator = '-';
}
-
+
String language, country, variant;
if (separatorCountry < 0)
{
@@ -77,7 +70,7 @@
else
{
language = localeString.substring(0, separatorCountry);
-
+
int separatorVariant = localeString.indexOf(separator, separatorCountry + 1);
if (separatorVariant < 0)
{
@@ -90,7 +83,7 @@
variant = localeString.substring(separatorVariant + 1);
}
}
-
+
return new Locale(language, country, variant);
}
}
Modified: myfaces/trunk/src/share/org/apache/myfaces/util/MessageUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/util/MessageUtils.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/util/MessageUtils.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/util/MessageUtils.java Wed May 11 09:45:06 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,19 +36,6 @@
* @author Manfred Geiler
* @author Sean Schofield
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/08/17 12:15:34 manolito
- * NPE when there was no ViewRoot
- *
- * Revision 1.2 2004/07/01 22:01:13 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/03/30 16:59:47 manolito
- * MessageFactory removed, MessageUtils moved to util in src/share
- *
*/
public class MessageUtils
{
@@ -84,7 +71,7 @@
{
FacesMessage message = getMessage(facesContext, messageId, args);
message.setSeverity(severity);
-
+
return message;
}
@@ -120,10 +107,10 @@
facesContext.addMessage(forClientId,
getMessage(severity, messageId, args, facesContext));
}
-
+
/**
* Uses <code>MessageFormat</code> and the supplied parameters to fill in the param placeholders in the String.
- *
+ *
* @param locale The <code>Locale</code> to use when performing the substitution.
* @param msgtext The original parameterized String.
* @param params The params to fill in the String with.
@@ -166,12 +153,12 @@
String summary = null;
String detail = null;
String bundleName = getApplication().getMessageBundle();
- ResourceBundle bundle = null;
-
+ ResourceBundle bundle = null;
+
if (bundleName != null)
{
bundle = ResourceBundle.getBundle(bundleName, locale);
- try
+ try
{
summary = bundle.getString(messageId);
}
@@ -185,7 +172,7 @@
{
throw new NullPointerException();
}
-
+
try
{
summary = bundle.getString(messageId);
@@ -197,7 +184,7 @@
{
return null;
}
-
+
if (bundle == null)
{
throw new NullPointerException("Unable to locate ResrouceBundle: bundle is null");
Modified: myfaces/trunk/src/share/org/apache/myfaces/util/NullEnumeration.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/util/NullEnumeration.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/util/NullEnumeration.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/util/NullEnumeration.java Wed May 11 09:45:06 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,17 +22,6 @@
*
* @author Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:13 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/15 04:32:58 dave0000
- * make SessionMap request session every time
- *
- *
*/
public final class NullEnumeration implements Enumeration
{
Modified: myfaces/trunk/src/share/org/apache/myfaces/util/NullIterator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/util/NullIterator.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/util/NullIterator.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/util/NullIterator.java Wed May 11 09:45:06 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 Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:51:01 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:13 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/03/30 15:37:17 manolito
- * moved to share
- *
*/
public final class NullIterator implements Iterator
{