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 17:34:59 UTC
svn commit: r169646 [2/2] - in /myfaces/trunk: doc/
src/cactus/org/apache/myfaces/cactus/
src/components/org/apache/myfaces/application/jsp/
src/components/org/apache/myfaces/component/
src/components/org/apache/myfaces/component/html/ext/
src/components/org/apache/myfaces/component/html/util/
src/jsfapi/javax/faces/ src/jsfapi/javax/faces/component/
src/jsfapi/javax/faces/context/ src/jsfapi/javax/faces/convert/
src/jsfapi/javax/faces/event/ src/jsfapi/javax/faces/model/
src/jsfapi/javax/faces/validator/ src/jsfapi/javax/faces/webapp/
src/junit/javax/faces/component/ src/junit/org/apache/myfaces/application/
src/myfaces/org/apache/myfaces/application/
src/myfaces/org/apache/myfaces/application/jsp/
src/share/org/apache/myfaces/component/
Modified: myfaces/trunk/src/jsfapi/javax/faces/convert/FloatConverter.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/convert/FloatConverter.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/convert/FloatConverter.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/convert/FloatConverter.java Wed May 11 08:34:57 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.
@@ -19,17 +19,6 @@
import javax.faces.context.FacesContext;
/**
- * $Log$
- * Revision 1.9 2004/07/01 22:00:51 mwessendorf
- * ASF switch
- *
- * Revision 1.8 2004/06/07 13:40:37 mwessendorf
- * solved Feature Request #966892
- *
- * Revision 1.7 2004/03/26 12:08:42 manolito
- * Exceptions in getAsString now catched and
- * more relaxed Number casting in all number converters
- *
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
Modified: myfaces/trunk/src/jsfapi/javax/faces/convert/IntegerConverter.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/convert/IntegerConverter.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/convert/IntegerConverter.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/convert/IntegerConverter.java Wed May 11 08:34:57 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.
@@ -19,17 +19,6 @@
import javax.faces.context.FacesContext;
/**
- * $Log$
- * Revision 1.9 2004/07/01 22:00:51 mwessendorf
- * ASF switch
- *
- * Revision 1.8 2004/06/07 13:40:37 mwessendorf
- * solved Feature Request #966892
- *
- * Revision 1.7 2004/03/26 12:08:42 manolito
- * Exceptions in getAsString now catched and
- * more relaxed Number casting in all number converters
- *
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
Modified: myfaces/trunk/src/jsfapi/javax/faces/convert/LongConverter.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/convert/LongConverter.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/convert/LongConverter.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/convert/LongConverter.java Wed May 11 08:34:57 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.
@@ -19,17 +19,6 @@
import javax.faces.context.FacesContext;
/**
- * $Log$
- * Revision 1.9 2004/07/01 22:00:51 mwessendorf
- * ASF switch
- *
- * Revision 1.8 2004/06/07 13:40:37 mwessendorf
- * solved Feature Request #966892
- *
- * Revision 1.7 2004/03/26 12:08:42 manolito
- * Exceptions in getAsString now catched and
- * more relaxed Number casting in all number converters
- *
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
Modified: myfaces/trunk/src/jsfapi/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/convert/NumberConverter.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/convert/NumberConverter.java Wed May 11 08:34:57 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,23 +28,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.12 2005/04/09 19:07:02 svieujot
- * Closed MYFACES-177 thanks to Josh Holtzman.
- *
- * Revision 1.11 2004/07/01 22:00:51 mwessendorf
- * ASF switch
- *
- * Revision 1.10 2004/06/07 13:40:37 mwessendorf
- * solved Feature Request #966892
- *
- * Revision 1.9 2004/04/01 10:39:53 royalts
- * implements StateHoder was missing
- *
- * Revision 1.8 2004/03/26 12:08:42 manolito
- * Exceptions in getAsString now catched and
- * more relaxed Number casting in all number converters
- *
*/
public class NumberConverter
implements Converter, StateHolder
Modified: myfaces/trunk/src/jsfapi/javax/faces/convert/ShortConverter.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/convert/ShortConverter.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/convert/ShortConverter.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/convert/ShortConverter.java Wed May 11 08:34:57 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.
@@ -19,17 +19,6 @@
import javax.faces.context.FacesContext;
/**
- * $Log$
- * Revision 1.9 2004/07/01 22:00:50 mwessendorf
- * ASF switch
- *
- * Revision 1.8 2004/06/07 13:40:37 mwessendorf
- * solved Feature Request #966892
- *
- * Revision 1.7 2004/03/26 12:08:42 manolito
- * Exceptions in getAsString now catched and
- * more relaxed Number casting in all number converters
- *
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
Modified: myfaces/trunk/src/jsfapi/javax/faces/convert/_MessageUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/convert/_MessageUtils.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/convert/_MessageUtils.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/convert/_MessageUtils.java Wed May 11 08:34:57 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,14 +23,6 @@
import java.util.ResourceBundle;
/**
- * $Log$
- * Revision 1.3 2004/07/01 22:00:51 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/03/26 12:08:42 manolito
- * Exceptions in getAsString now catched and
- * more relaxed Number casting in all number converters
- *
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
Modified: myfaces/trunk/src/jsfapi/javax/faces/event/PhaseId.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/event/PhaseId.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/event/PhaseId.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/event/PhaseId.java Wed May 11 08:34:57 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,13 +21,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2004/07/01 22:01:14 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/05/21 10:38:01 manolito
- * trivial change in toString
- *
*/
public class PhaseId {
Modified: myfaces/trunk/src/jsfapi/javax/faces/model/ResultSetDataModel.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/model/ResultSetDataModel.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/model/ResultSetDataModel.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/model/ResultSetDataModel.java Wed May 11 08:34:57 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.
@@ -18,13 +18,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2004/07/01 22:01:10 mwessendorf
- * ASF switch
- *
- * Revision 1.6 2004/04/07 07:27:10 manolito
- * changed exception msg
- *
*/
public class ResultSetDataModel extends DataModel
{
Modified: myfaces/trunk/src/jsfapi/javax/faces/model/SelectItem.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/model/SelectItem.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/model/SelectItem.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/model/SelectItem.java Wed May 11 08:34:57 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,13 +20,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2004/07/01 22:01:10 mwessendorf
- * ASF switch
- *
- * Revision 1.6 2004/04/07 08:15:41 manolito
- * correct label handling
- *
*/
public class SelectItem implements Serializable
{
Modified: myfaces/trunk/src/jsfapi/javax/faces/model/SelectItemGroup.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/model/SelectItemGroup.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/model/SelectItemGroup.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/model/SelectItemGroup.java Wed May 11 08:34:57 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.
@@ -18,13 +18,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2004/07/01 22:01:10 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/04/07 08:20:01 manolito
- * EMPTY_SELECT_ITEMS
- *
*/
public class SelectItemGroup extends SelectItem
{
@@ -32,7 +25,7 @@
// FIELDS
private SelectItem[] _selectItems;
-
+
// CONSTRUCTORS
public SelectItemGroup()
{
Modified: myfaces/trunk/src/jsfapi/javax/faces/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/validator/DoubleRangeValidator.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/validator/DoubleRangeValidator.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/validator/DoubleRangeValidator.java Wed May 11 08:34:57 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,13 +23,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Thomas Spiegl
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.6 2004/06/14 12:55:22 manolito
- * Added missing CVS Log comment
- *
*/
public class DoubleRangeValidator
implements Validator, StateHolder
@@ -173,7 +166,7 @@
{
_transient = transientValue;
}
-
+
// MISC
public boolean equals(Object o)
{
Modified: myfaces/trunk/src/jsfapi/javax/faces/validator/LengthValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/validator/LengthValidator.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/validator/LengthValidator.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/validator/LengthValidator.java Wed May 11 08:34:57 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,13 +23,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Thomas Spiegl
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.10 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.9 2004/06/14 12:55:22 manolito
- * Added missing CVS Log comment
- *
*/
public class LengthValidator
implements Validator, StateHolder
@@ -85,7 +78,7 @@
throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, MINIMUM_MESSAGE_ID, args));
}
}
-
+
if (_maximum != null)
{
if (length > _maximum.intValue())
Modified: myfaces/trunk/src/jsfapi/javax/faces/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/validator/LongRangeValidator.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/validator/LongRangeValidator.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/validator/LongRangeValidator.java Wed May 11 08:34:57 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,13 +23,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Thomas Spiegl
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2004/07/01 22:01:11 mwessendorf
- * ASF switch
- *
- * Revision 1.6 2004/06/14 12:55:22 manolito
- * Added missing CVS Log comment
- *
*/
public class LongRangeValidator
implements Validator, StateHolder
Modified: myfaces/trunk/src/jsfapi/javax/faces/webapp/FacesServlet.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/webapp/FacesServlet.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/webapp/FacesServlet.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/webapp/FacesServlet.java Wed May 11 08:34:57 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,21 +26,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.12 2004/07/13 15:43:34 manolito
- * Bug #990228
- *
- * Revision 1.11 2004/07/01 22:00:54 mwessendorf
- * ASF switch
- *
- * Revision 1.10 2004/06/21 10:57:58 manolito
- * missing CVS Log keyword
- *
- * Revision 1.9 2004/06/16 23:02:20 o_rossmueller
- * merged confignew_branch
- *
- * Revision 1.8 2004/06/14 12:55:23 manolito
- * Added missing CVS Log comment
*/
public class FacesServlet
implements Servlet
Modified: myfaces/trunk/src/jsfapi/javax/faces/webapp/UIComponentTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/jsfapi/javax/faces/webapp/UIComponentTag.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/jsfapi/javax/faces/webapp/UIComponentTag.java (original)
+++ myfaces/trunk/src/jsfapi/javax/faces/webapp/UIComponentTag.java Wed May 11 08:34:57 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.
@@ -35,48 +35,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.26 2005/03/15 18:43:42 matzew
- * Patch from Stan Silver FOR MYFACES-123
- *
- * Revision 1.25 2005/03/12 02:17:52 mmarinschek
- * ui component logging enhanced
- *
- * Revision 1.24 2005/03/12 02:15:18 mmarinschek
- * jsvalueset now supports maps of maps; ui component logging enhanced
- *
- * Revision 1.23 2004/08/27 12:47:52 manolito
- * automatically assign IDs to facets and children of components that where created by binding
- *
- * Revision 1.22 2004/07/05 23:43:36 o_rossmueller
- * fix #985274: call setProperties for viewRoot
- *
- * Revision 1.21 2004/07/01 22:00:54 mwessendorf
- * ASF switch
- *
- * Revision 1.20 2004/04/26 13:13:52 manolito
- * always release facesContext
- *
- * Revision 1.19 2004/04/26 12:01:39 manolito
- * more reluctant releasing of members for Resin compatibility
- *
- * Revision 1.18 2004/04/20 11:16:23 royalts
- * no message
- *
- * Revision 1.17 2004/04/20 11:11:03 royalts
- * no message
- *
- * Revision 1.16 2004/04/20 10:54:21 royalts
- * added index check to findComponent
- *
- * Revision 1.15 2004/03/31 12:48:03 manolito
- * bug: newly created children added always at end
- *
- * Revision 1.14 2004/03/31 02:29:41 dave0000
- * avoid lastIndexOf scan if not needed
- *
- * Revision 1.13 2004/03/26 11:48:33 manolito
- * additional NPE check
*/
public abstract class UIComponentTag
implements Tag
@@ -225,10 +183,10 @@
public static boolean isValueReference(String value)
{
if (value == null) throw new NullPointerException("value");
-
+
int start = value.indexOf("#{");
if (start < 0) return false;
-
+
int end = value.lastIndexOf('}');
return (end >=0 && start < end);
}
@@ -493,7 +451,7 @@
* Recurse all facets and children and assign them an unique ID if necessary.
* We must *not* use UIViewRoot#createUniqueId here, because this would affect the
* order of the created ids upon rerendering the page!
- */
+ */
private int recurseFacetsAndChildrenForId(FacesContext context,
Iterator facetsAndChildren,
String idPrefix,
@@ -531,7 +489,7 @@
}
parentTag._facetsAdded.add(facetName);
}
-
+
private int getAddedChildrenCount(UIComponentTag parentTag)
{
return parentTag._childrenAdded != null ?
@@ -649,7 +607,7 @@
RenderKitFactory renderFactory = (RenderKitFactory)FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
RenderKit renderKit = renderFactory.getRenderKit(facesContext,
facesContext.getViewRoot().getRenderKitId());
-
+
_writer = renderKit.createResponseWriter(new _PageContextOutWriter(pageContext),
pageContext.getRequest().getContentType(), //TODO: is this the correct content type?
pageContext.getRequest().getCharacterEncoding());
Modified: myfaces/trunk/src/junit/javax/faces/component/UISelectManyTest.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/junit/javax/faces/component/UISelectManyTest.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/junit/javax/faces/component/UISelectManyTest.java (original)
+++ myfaces/trunk/src/junit/javax/faces/component/UISelectManyTest.java Wed May 11 08:34:57 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,13 +25,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/07/01 22:01:37 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/06 13:02:48 manolito
- * junit tests for UISelectMany
- *
*/
public class UISelectManyTest
extends TestCase
Modified: myfaces/trunk/src/junit/org/apache/myfaces/application/NavigationHandlerImplTest.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/junit/org/apache/myfaces/application/NavigationHandlerImplTest.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/junit/org/apache/myfaces/application/NavigationHandlerImplTest.java (original)
+++ myfaces/trunk/src/junit/org/apache/myfaces/application/NavigationHandlerImplTest.java Wed May 11 08:34:57 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.3 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 22:01:14 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/26 11:24:15 manolito
- * new NavigationHandlerImplTest and some junit refactoring
- *
*/
public class NavigationHandlerImplTest
extends MyFacesBaseTest
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/application/ApplicationFactoryImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/application/ApplicationFactoryImpl.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/application/ApplicationFactoryImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/application/ApplicationFactoryImpl.java Wed May 11 08:34:57 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 Manfred Geiler (latest modification by $Author$)
* @author Thomas Spiegl
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.9 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.8 2004/07/01 22:05:13 mwessendorf
- * ASF switch
- *
- * Revision 1.7 2004/04/28 08:12:45 manolito
- * comments
- *
*/
public class ApplicationFactoryImpl
extends ApplicationFactory
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/application/ApplicationImpl.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/application/ApplicationImpl.java Wed May 11 08:34:57 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.
@@ -49,32 +49,6 @@
* @author Anton Koinov
* @author Thomas Spiegl
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.37 2005/03/10 10:26:00 matzew
- * Patch for the ApplicationImpl form Mike Traum (MYFACES-122).
- * Also changed behaivor of "createConverter(java.lang.String converterId)"
- *
- * Revision 1.36 2005/03/04 00:28:45 mmarinschek
- * Changes in configuration due to missing Attribute/Property classes for the converter; not building in the functionality yet except for part of the converter properties
- *
- * Revision 1.35 2004/12/03 08:46:09 manolito
- * MYFACES-45 / ApplicationImpl does not correctly traverse a Class' hierarchy to create a Converter
- *
- * Revision 1.34 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.33 2004/09/08 07:45:05 mwessendorf
- * set DefaultRenderKitId = "HTML_BASIC"
- *
- * Revision 1.32 2004/08/10 10:57:37 manolito
- * fixed StackOverflow in ClassUtils and cleaned up ClassUtils methods
- *
- * Revision 1.31 2004/07/01 22:05:14 mwessendorf
- * ASF switch
- *
- * Revision 1.30 2004/06/14 12:55:23 manolito
- * Added missing CVS Log comment
- *
*/
public class ApplicationImpl
extends Application
@@ -290,7 +264,7 @@
log.error("addComponent: component = null is not allowed");
throw new NullPointerException("addComponent: component = null is not allowed");
}
-
+
try
{
_componentClassMap.put(componentType, ClassUtils.simpleClassForName(componentClassName));
@@ -316,7 +290,7 @@
throw new NullPointerException("addConverter: converterClass = null ist not allowed");
}
-
+
try
{
_converterIdToClassMap.put(converterId, ClassUtils.simpleClassForName(converterClass));
@@ -341,7 +315,7 @@
log.error("addConverter: converterClass = null is not allowed");
throw new NullPointerException("addConverter: converterClass = null ist not allowed");
}
-
+
try
{
_converterClassToClassMap.put(targetClass, ClassUtils.simpleClassForName(converterClass));
@@ -383,7 +357,7 @@
log.error("addValidator: validatorClass = null is not allowed");
throw new NullPointerException("addValidator: validatorClass = null ist not allowed");
}
-
+
try
{
_validatorClassMap.put(validatorId, ClassUtils.simpleClassForName(validatorClass));
@@ -609,7 +583,7 @@
throw new NullPointerException("createMethodBinding: reference = null ist not allowed");
}
- // We choose to instantiate a new MethodBinding every time as this is much easier
+ // We choose to instantiate a new MethodBinding every time as this is much easier
// and about as efficient as implementing a cache specifically for MethodBinding,
// which is complicated by the need to use a conposite key=(reference, params)
// (significant part of MethodBinding is already cached by ValueBinding implicitly)
@@ -623,15 +597,15 @@
log.error("createValidator: validatorId = null is not allowed");
throw new NullPointerException("createValidator: validatorId = null ist not allowed");
}
-
+
Class validatorClass = (Class) _validatorClassMap.get(validatorId);
if (validatorClass == null)
{
- String message = "Unknown converter id '" + validatorId + "'.";
+ String message = "Unknown converter id '" + validatorId + "'.";
log.error(message);
throw new FacesException(message);
}
-
+
try
{
return (Validator) validatorClass.newInstance();
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/application/NavigationHandlerImpl.java Wed May 11 08:34:57 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.
@@ -45,47 +45,6 @@
* @author Thomas Spiegl (latest modification by $Author$)
* @author Anton Koinov
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.35 2005/03/11 09:12:15 matzew
- * Patch from Stan Silver that removes the portlet dependency (MYFACES-126)
- *
- * Revision 1.34 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
- * Revision 1.33 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.32 2004/08/26 08:03:29 manolito
- * viewId for redirect might already contain a query string, so we must check for ? in url
- *
- * Revision 1.31 2004/08/26 08:00:58 manolito
- * add current queryString to url on redirect
- *
- * Revision 1.30 2004/07/07 08:34:57 mwessendorf
- * removed unused import-statements
- *
- * Revision 1.29 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.28 2004/07/01 22:05:14 mwessendorf
- * ASF switch
- *
- * Revision 1.27 2004/06/16 23:02:21 o_rossmueller
- * merged confignew_branch
- *
- * Revision 1.26.2.1 2004/06/16 02:07:22 o_rossmueller
- * get navigation rules from RuntimeConfig
- * refactored all remaining usages of MyFacesFactoryFinder to use RuntimeConfig
- *
- * Revision 1.26 2004/05/18 12:02:28 manolito
- * getActionURL and getResourceURL must not call encodeActionURL or encodeResourceURL
- *
- * Revision 1.25 2004/05/10 04:49:26 dave0000
- * small optimization improvements
- *
- * Revision 1.24 2004/04/26 11:28:16 manolito
- * global navigation-rule with no from-view-id NPE bug
- *
*/
public class NavigationHandlerImpl
extends NavigationHandler
@@ -93,13 +52,13 @@
private static final Log log = LogFactory.getLog(NavigationHandlerImpl.class);
private static final String ASTERISK = "*";
-
+
private Map _navigationCases = null;
private List _wildcardKeys = new ArrayList();
public NavigationHandlerImpl()
{
- if (log.isTraceEnabled()) log.trace("New NavigationHandler instance created");
+ if (log.isTraceEnabled()) log.trace("New NavigationHandler instance created");
}
public void handleNavigation(FacesContext facesContext, String fromAction, String outcome)
@@ -161,7 +120,7 @@
" toViewId =" + navigationCase.getToViewId() +
" redirect=" + navigationCase.isRedirect());
}
- if (navigationCase.isRedirect() &&
+ if (navigationCase.isRedirect() &&
(!PortletUtil.isPortletRequest(facesContext)))
{ // Spec section 7.4.2 says "redirects not possible" in this case for portlets
ExternalContext externalContext = facesContext.getExternalContext();
@@ -183,7 +142,7 @@
}
}
}
-
+
try
{
externalContext.redirect(externalContext.encodeActionURL(redirectPath));
@@ -239,13 +198,13 @@
{
if (_navigationCases == null)
{
- synchronized(this)
+ synchronized(this)
{
if (_navigationCases == null)
{
ExternalContext externalContext = facesContext.getExternalContext();
RuntimeConfig runtimeConfig = RuntimeConfig.getCurrentInstance(externalContext);
-
+
Collection rules = runtimeConfig.getNavigationRules();
int rulesSize = rules.size();
Map cases = new HashMap(HashMapUtils.calcCapacity(rulesSize));
@@ -255,7 +214,7 @@
{
NavigationRule rule = (NavigationRule) iterator.next();
String fromViewId = rule.getFromViewId();
-
+
//specification 7.4.2 footnote 4 - missing fromViewId is allowed:
if (fromViewId == null)
{
@@ -265,7 +224,7 @@
{
fromViewId = fromViewId.trim();
}
-
+
List list = (List) cases.get(fromViewId);
if (list == null)
{
@@ -278,15 +237,15 @@
} else {
list.addAll(rule.getNavigationCases());
}
-
+
}
Collections.sort(wildcardKeys, new KeyComparator());
-
+
synchronized (cases)
{
// We do not really need this sychronization at all, but this
// gives us the peace of mind that some good optimizing compiler
- // will not rearrange the execution of the assignment to an
+ // will not rearrange the execution of the assignment to an
// earlier time, before all init code completes
_navigationCases = cases;
_wildcardKeys = wildcardKeys;
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Wed May 11 08:34:57 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,42 +41,6 @@
* @author Thomas Spiegl (latest modification by $Author$)
* @author Manfred Geiler
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.22 2005/01/18 07:03:15 matzew
- * added patch form Sean Schofield to solve state saving issue on server side. (MyFaces-81)
- *
- * Revision 1.21 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.20 2004/08/15 15:35:26 o_rossmueller
- * fix #1008685: hold view state by viewId
- *
- * Revision 1.19 2004/08/15 15:31:09 o_rossmueller
- * fix #1008685: hold view state by viewId
- *
- * Revision 1.18 2004/08/13 13:15:20 manolito
- * FIXME comment
- *
- * Revision 1.17 2004/07/21 11:22:40 mwessendorf
- * last modification in effect of Adam Winer bug-report.
- *
- * Revision 1.16 2004/07/01 22:05:20 mwessendorf
- * ASF switch
- *
- * Revision 1.15 2004/05/18 08:29:38 manolito
- * saveSerializedView now caches the SerializedView within the request, so that multiple calls only process the saveState methods of components once.
- *
- * Revision 1.14 2004/04/13 08:08:08 manolito
- * NPE bug fix
- *
- * Revision 1.13 2004/04/06 10:26:03 royalts
- * restoreView(...) returns null if restoredViewId != viewId
- *
- * Revision 1.12 2004/04/06 10:20:27 manolito
- * no state restoring for different viewId
- *
- * Revision 1.11 2004/03/25 08:52:40 manolito
- * fixed server state saving
*/
public class JspStateManagerImpl
extends MyfacesStateManager
@@ -321,7 +285,7 @@
}
return _renderKitFactory;
}
-
+
protected void saveSerializedViewInServletSession(ExternalContext externalContext,
String viewId,
SerializedView serializedView)
@@ -331,7 +295,7 @@
Object sv[] = new Object[] {serializedView.getStructure(), serializedView.getState()};
externalContext.getSessionMap().put(SERIALIZED_VIEW_SESSION_ATTR + "-" + viewId, sv);
}
-
+
protected SerializedView getSerializedViewFromServletSession(ExternalContext externalContext,
String viewId)
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Wed May 11 08:34:57 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.
@@ -45,61 +45,6 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.35 2005/03/10 15:44:59 matzew
- * Patch for supporting Strut-Faces form Mike Traum (MYFACES-121)
- *
- * Revision 1.34 2005/02/10 20:31:21 matzew
- * organized import statements
- *
- * Revision 1.33 2005/02/10 20:24:17 matzew
- * closed MYFACES-101 in Jira; Thanks to Stan Silvert (JBoss Group)
- *
- * Revision 1.32 2005/01/27 02:38:44 svieujot
- * Remove portlet-api dependency while keeping portlet support.
- *
- * Revision 1.31 2005/01/26 17:03:12 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
- * Revision 1.30 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.29 2004/10/05 08:22:55 manolito
- * #1031187 [PATCH] JspViewHandlerImpl: Remove dep on ServletRequest
- *
- * Revision 1.28 2004/09/02 09:04:14 manolito
- * typing errors in comments
- *
- * Revision 1.27 2004/09/01 18:32:55 mwessendorf
- * Organize Imports
- *
- * Revision 1.26 2004/08/11 23:09:35 o_rossmueller
- * handle character encoding as described in section 2.5.2.2 of JSF 1.1
- *
- * Revision 1.25 2004/08/11 22:56:30 o_rossmueller
- * handle character encoding as described in section 2.5.2.2 of JSF 1.1
- *
- * Revision 1.24 2004/07/16 08:34:01 manolito
- * cosmetic change
- *
- * Revision 1.23 2004/07/10 06:35:08 mwessendorf
- * is defaultRenderKitId set in faces-config.xml ?
- *
- * Revision 1.22 2004/07/01 22:05:20 mwessendorf
- * ASF switch
- *
- * Revision 1.21 2004/05/18 12:02:14 manolito
- * getActionURL and getResourceURL must not call encodeActionURL or encodeResourceURL
- *
- * Revision 1.20 2004/05/12 01:41:31 o_rossmueller
- * fix #951896: added state params to link URLs for ALLOW_JAVASCRIPT=false
- *
- * Revision 1.19 2004/04/27 07:37:56 manolito
- * bugfix: handleCharacterEncoding must be called before any request parameters are retrieved
- *
- * Revision 1.18 2004/04/05 09:16:24 manolito
- * javadoc header
- *
*/
public class JspViewHandlerImpl
extends ViewHandler
@@ -143,7 +88,7 @@
}
public String calculateRenderKitId(FacesContext facesContext)
- {
+ {
String renderKitId = facesContext.getApplication().getDefaultRenderKitId();
return (renderKitId!=null) ? renderKitId : RenderKitFactory.HTML_BASIC_RENDER_KIT;
//TODO: how to calculate from client?
@@ -201,7 +146,7 @@
url.setParameter(MyFacesGenericPortlet.VIEW_ID, viewId);
return url.toString();
}
-
+
String path = getViewIdPath(facesContext, viewId);
if (path.length() > 0 && path.charAt(0) == '/')
{
@@ -242,7 +187,7 @@
externalContext.dispatch(viewId);
return;
}
-
+
ServletMapping servletMapping = getServletMapping(externalContext);
if (servletMapping.isExtensionMapping())
{
@@ -274,7 +219,7 @@
ServletResponse response = (ServletResponse) externalContext.getResponse();
response.setLocale(viewToRender.getLocale());
}
-
+
// TODO: 2.5.2.2 for Portlet? What do I do?
externalContext.dispatch(viewId);
@@ -332,11 +277,11 @@
throw new IllegalArgumentException("ViewId must start with '/' (viewId = " + viewId + ")");
}
- if (PortletUtil.isPortletRequest(facescontext))
+ if (PortletUtil.isPortletRequest(facescontext))
{
return viewId;
}
-
+
ServletMapping servletMapping = getServletMapping(facescontext.getExternalContext());
if (servletMapping.isExtensionMapping())
@@ -415,7 +360,7 @@
}
}
- // handle cases as best possible where servletPath is not a faces servlet,
+ // handle cases as best possible where servletPath is not a faces servlet,
// such as when coming through struts-faces
if (mappings.size() > 0) {
return (ServletMapping) mappings.get(0);
Modified: myfaces/trunk/src/share/org/apache/myfaces/component/UIColumns.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/component/UIColumns.java?rev=169646&r1=169645&r2=169646&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/component/UIColumns.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/component/UIColumns.java Wed May 11 08:34:57 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 Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/03/29 11:40:50 matzew
- * added new crosstable component (x:columns). Contributed by Mathias Broekelmann
- *
*/
public class UIColumns extends UIData
{
@@ -31,13 +27,13 @@
public static final String COMPONENT_FAMILY = UIData.COMPONENT_FAMILY;
/**
- *
+ *
*/
public UIColumns()
{
super();
}
-
+
/**
* @see javax.faces.component.UIComponentBase#getRendererType()
*/