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:47:17 UTC
svn commit: r169649 [1/3] - in /myfaces/trunk/src:
components/org/apache/myfaces/custom/buffer/
components/org/apache/myfaces/custom/calendar/
components/org/apache/myfaces/custom/checkbox/
components/org/apache/myfaces/custom/collapsiblepanel/
components/org/apache/myfaces/custom/creditcardvalidator/
components/org/apache/myfaces/custom/crosstable/
components/org/apache/myfaces/custom/datalist/
components/org/apache/myfaces/custom/div/
components/org/apache/myfaces/custom/emailvalidator/
components/org/apache/myfaces/custom/equalvalidator/
components/org/apache/myfaces/custom/fileupload/
components/org/apache/myfaces/custom/inputHtml/
components/org/apache/myfaces/custom/isbnvalidator/
components/org/apache/myfaces/custom/jslistener/
components/org/apache/myfaces/custom/jsvalueset/
components/org/apache/myfaces/custom/layout/
components/org/apache/myfaces/custom/navigation/
junit/org/apache/myfaces/context/servlet/ myfaces/org/apache/myfaces/config/
myfaces/org/apache/myfaces/config/element/
myfaces/org/apache/myfaces/config/impl/digester/
myfaces/org/apache/myfaces/config/impl/digester/elements/
myfaces/org/apache/myfaces/context/
myfaces/org/apache/myfaces/context/portlet/
myfaces/org/apache/myfaces/context/servlet/
Author: grantsmith
Date: Wed May 11 08:47:12 2005
New Revision: 169649
URL: http://svn.apache.org/viewcvs?rev=169649&view=rev
Log:
Removing some $Log$ headers - not supported by SVN, clutter up sources. Batch #2.
Modified:
myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/Buffer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java
myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckboxTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/CreditCardValidator.java
myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/ValidateCreditCardTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/crosstable/HtmlColumnsTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlDataListTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlListRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/div/Div.java
myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/EmailValidator.java
myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/ValidateEmailTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java
myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/ValidateEqualTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFile.java
myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultFileImpl.java
myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultImplBase.java
myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultMemoryImpl.java
myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtml.java
myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java
myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ValidateISBNTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java
myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java
myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java
myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlCommandNavigationTag.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java
myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ApplicationMapTest.java
myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletFacesContextImplTest.java
myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletSessionMock.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigDispenser.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigUnmarshaller.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigurator.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/RuntimeConfig.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntries.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntry.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedBean.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedProperty.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntries.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntry.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationCase.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationRule.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/Renderer.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Attribute.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java
myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Property.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/ReleaseableExternalContext.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/ApplicationMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/InitParameterMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderValuesMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/SessionMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/AbstractAttributeMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ApplicationMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/CookieMap.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java
myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/SessionMap.java
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/Buffer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/Buffer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/Buffer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/Buffer.java Wed May 11 08:47:12 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,13 +22,6 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2005/05/02 16:40:09 svieujot
- * Slight code refactor for x:buffer
- *
- * Revision 1.1 2005/01/04 15:41:06 svieujot
- * new x:buffer component.
- *
*/
public class Buffer extends UIComponentBase{
@@ -62,10 +55,10 @@
super.restoreState(context, values[0]);
_intoExpression = (String) values[1];
}
-
+
void fill(String content, FacesContext facesContext){
ValueBinding intoVB;
-
+
if (_intoExpression == null) {
intoVB = getValueBinding("into");
_intoExpression = intoVB.getExpressionString();
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferRenderer.java Wed May 11 08:47:12 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.
@@ -37,28 +37,15 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/05/02 16:40:09 svieujot
- * Slight code refactor for x:buffer
- *
- * Revision 1.3 2005/02/01 16:54:07 svieujot
- * Clean up.
- *
- * Revision 1.2 2005/02/01 16:51:48 svieujot
- * Move the HtmlResponseWriterImpl to the shared sources directory.
- *
- * Revision 1.1 2005/01/04 15:41:06 svieujot
- * new x:buffer component.
- *
*/
public class BufferRenderer extends Renderer {
private static final Log log = LogFactory.getLog(BufferRenderer.class);
-
+
public static final String RENDERER_TYPE = "org.apache.myfaces.Buffer";
private ResponseWriter initialWriter;
private HtmlBufferResponseWriterWrapper bufferWriter;
-
+
public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) {
RendererUtils.checkParamValidity(facesContext, uiComponent, Buffer.class);
@@ -66,7 +53,7 @@
bufferWriter = HtmlBufferResponseWriterWrapper.getInstance( initialWriter );
facesContext.setResponseWriter( bufferWriter );
}
-
+
public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException{
RendererUtils.checkParamValidity(facesContext, component, Buffer.class);
RendererUtils.renderChildren(facesContext, component);
@@ -75,9 +62,9 @@
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) {
Buffer buffer = (Buffer)uiComponent;
buffer.fill(bufferWriter.toString(), facesContext);
-
+
facesContext.setResponseWriter( initialWriter );
-
+
if( bufferWriter.getDummyFormParams() != null ){
try{ // Attempt to add the dummy form params (will not work with Sun RI)
DummyFormResponseWriter dummyFormResponseWriter = DummyFormUtils.getDummyFormResponseWriter( facesContext );
@@ -90,30 +77,30 @@
}
}
}
-
+
private static class HtmlBufferResponseWriterWrapper extends HtmlResponseWriterImpl {
-
+
private ByteArrayOutputStream stream;
private PrintWriter writer;
-
+
static public HtmlBufferResponseWriterWrapper getInstance(ResponseWriter initialWriter){
ByteArrayOutputStream instanceStream = new ByteArrayOutputStream();
PrintWriter instanceWriter = new PrintWriter(instanceStream, true);
-
+
return new HtmlBufferResponseWriterWrapper(initialWriter, instanceStream, instanceWriter);
}
-
+
private HtmlBufferResponseWriterWrapper(ResponseWriter initialWriter, ByteArrayOutputStream stream, PrintWriter writer){
super(writer, initialWriter.getContentType(), initialWriter.getCharacterEncoding());
this.stream = stream;
this.writer = writer;
}
-
+
public String toString(){
try{
stream.flush();
writer.close();
-
+
return stream.toString( getCharacterEncoding() );
}catch(UnsupportedEncodingException e){
// an attempt to set an invalid character encoding would have caused this exception before
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/buffer/BufferTag.java Wed May 11 08:47:12 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,15 +19,8 @@
import org.apache.myfaces.taglib.html.HtmlComponentTagBase;
/**
- * @author Sylvain Vieujot (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.1 2005/01/04 15:41:06 svieujot
- * new x:buffer component.
- *
+ * @author Sylvain Vieujot (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class BufferTag extends HtmlComponentTagBase {
private String _into = null;
@@ -36,7 +29,7 @@
super.release();
_into = null;
}
-
+
public String getComponentType() {
return Buffer.COMPONENT_TYPE;
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Wed May 11 08:47:12 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,74 +45,6 @@
import java.util.List;
/**
- * $Log$
- * Revision 1.21 2005/04/08 02:02:26 schof
- * Fixes MYFACES-167 (Thanks to David Heffelfinger for reporting the bug and supplying the patch.)
- *
- * Revision 1.20 2005/02/11 14:11:04 mmarinschek
- * fixed jira 97
- *
- * Revision 1.19 2005/02/11 13:24:01 mmarinschek
- * fix jira 60, showing fix in examples
- *
- * Revision 1.18 2005/01/17 10:08:44 mmarinschek
- * trying to fix problem with added resources to header; css and js was not changeable by the user anymore...
- *
- * Revision 1.17 2005/01/09 18:15:12 mmarinschek
- * small changes - better error handling, label renderer supports more hooks for sub-classes
- *
- * Revision 1.16 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.15 2004/12/10 02:08:54 svieujot
- * Share code with HtmlInputDate.
- *
- * Revision 1.14 2004/12/09 12:18:43 mmarinschek
- * changes in Calendar-Renderer to check for submitted-value first
- *
- * Revision 1.13 2004/12/09 05:13:02 svieujot
- * Mark potential bugs where we use the backing bean's value, and do not check for submitted value
- *
- * Revision 1.12 2004/12/02 22:26:23 svieujot
- * Simplify the AddResource methods
- *
- * Revision 1.11 2004/12/01 20:25:10 svieujot
- * Make the Extensions filter support css and image resources.
- * Convert the popup calendar to use this new filter.
- *
- * Revision 1.10 2004/11/29 13:57:56 mmarinschek
- * changes for input-calendar bugs
- *
- * Revision 1.9 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.8 2004/09/06 08:41:48 tinytoony
- * changes to calendar - rendering wrong weekday, check output-text behavior
- *
- * Revision 1.7 2004/07/28 18:00:47 tinytoony
- * calendar; revisited again for complete i18
- *
- * Revision 1.6 2004/07/28 17:13:54 tinytoony
- * new calendar popup, revisited, global variables renamed to help with uniqueness
- *
- * Revision 1.5 2004/07/27 16:48:02 tinytoony
- * new calendar popup, revisited
- *
- * Revision 1.4 2004/07/27 06:28:32 tinytoony
- * new calendar component as a popup
- *
- * Revision 1.3 2004/07/01 21:53:11 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/04/20 14:39:12 royalts
- * writeLink: added text.setValue(content), removed link.setValue(content)
- *
- * Revision 1.1 2004/03/31 11:58:34 manolito
- * custom component refactoring
- *
- * Revision 1.6 2004/03/29 15:06:17 manolito
- * no longer depends on specific LinkRenderer
- *
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
*/
@@ -131,9 +63,9 @@
Locale currentLocale = facesContext.getViewRoot().getLocale();
-
+
Date value;
-
+
try
{
value = RendererUtils.getDateValue(inputCalendar);
@@ -142,7 +74,7 @@
{
value = null;
}
-
+
Calendar timeKeeper = Calendar.getInstance(currentLocale);
timeKeeper.setTime(value!=null?value:new Date());
@@ -156,7 +88,7 @@
{
if(inputCalendar.isAddResources())
addScriptAndCSSResources(facesContext);
-
+
String dateFormat = CalendarDateTimeConverter.createJSPopupFormat(facesContext,
inputCalendar.getPopupDateFormat());
@@ -185,7 +117,7 @@
RendererUtils.copyHtmlInputTextAttributes(inputCalendar, inputText);
inputText.setTransient(true);
-
+
if (value == null && inputCalendar.getSubmittedValue() != null)
{
inputText.setValue(inputCalendar.getSubmittedValue());
@@ -205,7 +137,7 @@
inputCalendar.getChildren().remove(inputText);
ResponseWriter writer = facesContext.getResponseWriter();
-
+
writer.startElement(HTML.SCRIPT_ELEM,null);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
writer.write("<!--\n");
@@ -281,7 +213,7 @@
writer.endElement(HTML.TABLE_ELEM);
}
}
-
+
/**
* Used by the x:inputDate renderer : HTMLDateRenderer
* @throws IOException
@@ -291,9 +223,9 @@
AddResource.addStyleSheet(HtmlCalendarRenderer.class, "WH/theme.css", facesContext);
AddResource.addStyleSheet(HtmlCalendarRenderer.class, "DB/theme.css", facesContext);
AddResource.addJavaScriptToHeader(HtmlCalendarRenderer.class, "popcalendar.js", facesContext);
-
+
ResponseWriter writer = facesContext.getResponseWriter();
-
+
writer.startElement(HTML.SCRIPT_ELEM, null);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
writer.write(
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java Wed May 11 08:47:12 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,40 +23,6 @@
/**
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.11 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.10 2005/01/17 10:08:44 mmarinschek
- * trying to fix problem with added resources to header; css and js was not changeable by the user anymore...
- *
- * Revision 1.9 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.8 2004/07/28 18:00:47 tinytoony
- * calendar; revisited again for complete i18
- *
- * Revision 1.7 2004/07/27 16:48:02 tinytoony
- * new calendar popup, revisited
- *
- * Revision 1.6 2004/07/27 06:28:32 tinytoony
- * new calendar component as a popup
- *
- * Revision 1.5 2004/07/01 21:53:11 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/05/18 14:31:36 manolito
- * user role support completely moved to components source tree
- *
- * Revision 1.3 2004/04/05 11:04:51 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.2 2004/04/01 12:57:39 manolito
- * additional extended component classes for user role support
- *
- * Revision 1.1 2004/03/31 12:15:25 manolito
- * custom component refactoring
- *
*/
public class HtmlInputCalendarTag
extends HtmlInputTagBase
@@ -77,7 +43,7 @@
// HTML universal attributes --> already implemented in HtmlComponentTagBase
- // HTML event handler attributes --> already implemented in MyFacesTag
+ // HTML event handler attributes --> already implemented in MyFacesTag
// UIOutput attributes
// value and converterId --> already implemented in UIComponentTagBase
@@ -106,7 +72,7 @@
// User Role support
private String _enabledOnUserRole;
private String _visibleOnUserRole;
-
+
public void release() {
super.release();
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java Wed May 11 08:47:12 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,20 +22,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2005/04/13 12:48:46 manolito
- * MYFACES-186 x:radio and x:checkbox cause ClassCastException
- * Since the proposed fix is within generated code block, I had to fix the generator instead!
- *
- * Revision 1.3 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/01 21:53:06 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/02 13:57:10 manolito
- * extended HtmlSelectManyCheckbox with layout "spread" and custom Checkbox component
- *
*/
public class HtmlCheckbox
extends UIComponentBase
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckboxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckboxTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckboxTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/checkbox/HtmlCheckboxTag.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,25 +23,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2005/02/18 17:19:31 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/07/01 21:53:06 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/05/18 14:31:37 manolito
- * user role support completely moved to components source tree
- *
- * Revision 1.2 2004/04/05 11:04:52 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.1 2004/04/02 13:57:10 manolito
- * extended HtmlSelectManyCheckbox with layout "spread" and custom Checkbox component
- *
*/
public class HtmlCheckboxTag
extends UIComponentTagBase
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java Wed May 11 08:47:12 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,11 +34,6 @@
/**
* @author Kalle Korhonen (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/10 08:22:17 matzew
- * added new component CollapsiblePanel (contributed by Kalle Korhonen) (MYFACES-68)
- *
- *
*/
public class HtmlCollapsiblePanelRenderer extends HtmlRenderer {
//private static final Log log = LogFactory.getLog(HtmlCollapsiblePanel.class);
@@ -48,24 +43,24 @@
{
return true;
}
-
+
public void encodeChildren(FacesContext facesContext, UIComponent uiComponent) throws IOException
{
// RendererUtils.checkParamValidity(facesContext, uiComponent, HtmlCollapsiblePanel.class);
ResponseWriter writer = facesContext.getResponseWriter();
HtmlCollapsiblePanel collapsiblePanel = (HtmlCollapsiblePanel)uiComponent;
-
+
HtmlCommandLink link = getLink(facesContext, collapsiblePanel);
collapsiblePanel.getChildren().add(link);
-
+
// Always render the link to toggle the collapsed state
RendererUtils.renderChild(facesContext, link);
link.setRendered(false);
-
+
// conditionally render the rest of the children
if (!collapsiblePanel.isCollapsed()) {
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- // TODO apply styles from the parent element to this DIV
+ // TODO apply styles from the parent element to this DIV
writer.startElement(HTML.DIV_ELEM, null);
RendererUtils.renderChildren(facesContext, uiComponent);
writer.endElement(HTML.DIV_ELEM );
@@ -82,7 +77,7 @@
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.startElement(HTML.DIV_ELEM, null);
-
+
HtmlCollapsiblePanel collapsiblePanel = (HtmlCollapsiblePanel)uiComponent;
ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
String viewId = facesContext.getViewRoot().getViewId();
@@ -90,8 +85,8 @@
Application application = facesContext.getApplication();
}
-
-
+
+
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
{
//RendererUtils.checkParamValidity(facesContext, uiComponent, HtmlCollapsiblePanel.class);
@@ -99,7 +94,7 @@
writer.endElement(HTML.DIV_ELEM );
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
}
-
+
public void decode(FacesContext facesContext, UIComponent uiComponent)
{
RendererUtils.checkParamValidity(facesContext, uiComponent, HtmlCollapsiblePanel.class);
@@ -108,7 +103,7 @@
//log.debug("new component's id is " + collapsiblePanel.getClientId(facesContext) + ", req id is " + reqValue);
if ((collapsiblePanel.getClientId(facesContext) + LINK_ID).equals(reqValue)) collapsiblePanel.setCollapsed(!collapsiblePanel.isCollapsed() );
}
-
+
protected HtmlCommandLink getLink(FacesContext facesContext, HtmlCollapsiblePanel collapsiblePanel)
throws IOException
{
@@ -120,7 +115,7 @@
//link.addActionListener(new ChangeCollapsedHandler());
List children = link.getChildren();
- // Create the indicator. You could later make this conditional and render optional images instead
+ // Create the indicator. You could later make this conditional and render optional images instead
HtmlOutputText uiText = (HtmlOutputText)application.createComponent(HtmlOutputText.COMPONENT_TYPE);
uiText.setTransient(true);
uiText.setValue(collapsiblePanel.isCollapsed() ? ">" : "ν");
@@ -128,7 +123,7 @@
uiText.setStyleClass(collapsiblePanel.getStyleClass());
uiText.setStyle(collapsiblePanel.getStyle());
children.add(uiText);
-
+
// Create the optional label
String label = collapsiblePanel.getValue();
if (label != null) {
@@ -141,25 +136,25 @@
}
return link;
}
-
-
+
+
// Couldn't get an ActionListner for a link to work properly. With each page submit, one more
// event was fired. I assume it is because the link component was set to transparent, and I didn't
- // know how to get a reference to it back in a new encoding phase
+ // know how to get a reference to it back in a new encoding phase
/*
public static class ChangeCollapsedHandler implements ActionListener {
// Can't make this class anonymous, because it won't work with state saving
// refer to http://forum.java.sun.com/thread.jspa?messageID=2885214�
-
+
/* (non-Javadoc)
* @see javax.faces.event.ActionListener#processAction(javax.faces.event.ActionEvent)
*/
/*
public void processAction(ActionEvent actionEvent) throws AbortProcessingException {
log.info("Got action event, processing " + actionEvent.getComponent().getId() + ", phase id " + actionEvent.getPhaseId() );
- if (!(actionEvent.getComponent().getParent() instanceof HtmlCollapsiblePanel) )
+ if (!(actionEvent.getComponent().getParent() instanceof HtmlCollapsiblePanel) )
throw new AbortProcessingException("The parent of the action source was of unexpected type, HtmlCollapsiblePanel was expected");
- HtmlCollapsiblePanel collapsiblePanel = (HtmlCollapsiblePanel)actionEvent.getComponent().getParent();
+ HtmlCollapsiblePanel collapsiblePanel = (HtmlCollapsiblePanel)actionEvent.getComponent().getParent();
collapsiblePanel.setCollapsed(!collapsiblePanel.isCollapsed() );
// Note that we need to remove the listeners here, otherwise they will be fired again for old components,
// don't quite understand why
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/CreditCardValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/CreditCardValidator.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/CreditCardValidator.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/CreditCardValidator.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,29 +27,9 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2004/11/30 09:37:43 matzew
- * changes i18n-messages for validation
- *
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/07/01 21:53:08 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/06/28 22:12:13 o_rossmueller
- * fix #978654: do not coerce null
- *
- * Revision 1.2 2004/06/05 09:37:43 mwessendorf
- * new validator for regExpr.
- * and began with Friendly validator messages
- *
- * Revision 1.1 2004/05/27 14:09:00 manolito
- * creditcard and email validator refactored
- *
*/
public class CreditCardValidator implements Validator,StateHolder {
-
+
/**
* <p>The standard converter id for this converter.</p>
*/
@@ -59,36 +39,36 @@
* <p>The message identifier of the {@link FacesMessage} to be created if
* the creditcard check fails.</p>
*/
- public static final String CREDITCARD_MESSAGE_ID = "org.apache.myfaces.Creditcard.INVALID";
-
+ public static final String CREDITCARD_MESSAGE_ID = "org.apache.myfaces.Creditcard.INVALID";
+
//private DEFAULT_VALUES
private static final boolean DEFAULT_AMEX = true;
private static final boolean DEFAULT_DISCOVER = true;
private static final boolean DEFAULT_MASTERCARD = true;
private static final boolean DEFAULT_VISA = true;
private static final boolean DEFAULT_NONE = false;
-
-
+
+
public CreditCardValidator(){
}
-
+
//Cardtypes, that are supported by Commons-Validator.
private Boolean _amex = null;
private Boolean _discover = null;
private Boolean _mastercard = null;
private Boolean _visa = null;
private Boolean _none = null;
-
+
//JSF-Field for StateHolder-IF
private boolean _transient = false;
-
+
//Field, to init the desired Validator
private int _initSum = 0;
private org.apache.commons.validator.CreditCardValidator creditCardValidator = null;
/**
- *
+ *
*/
public void validate(
FacesContext facesContext,
@@ -125,21 +105,21 @@
else{
computeValidators();
creditCardValidator = new org.apache.commons.validator.CreditCardValidator(_initSum);
- }
+ }
}
-
+
/**
* private methode, that counts the desired creditCards
- */
+ */
private void computeValidators(){
if(isAmex()){
this._initSum= org.apache.commons.validator.CreditCardValidator.AMEX + _initSum;
}
if(isVisa()){
- this._initSum= org.apache.commons.validator.CreditCardValidator.VISA+ _initSum;
+ this._initSum= org.apache.commons.validator.CreditCardValidator.VISA+ _initSum;
}
if(isMastercard()){
- this._initSum= org.apache.commons.validator.CreditCardValidator.MASTERCARD+ _initSum;
+ this._initSum= org.apache.commons.validator.CreditCardValidator.MASTERCARD+ _initSum;
}
if(isDiscover()){
this._initSum= org.apache.commons.validator.CreditCardValidator.DISCOVER+ _initSum;
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/ValidateCreditCardTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/ValidateCreditCardTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/ValidateCreditCardTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/creditcardvalidator/ValidateCreditCardTag.java Wed May 11 08:47:12 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 mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/09/15 07:58:59 mwessendorf
- * Custom Validators now work in OC4J - thanks to Daniel Kamakura for supporting this
- *
- * Revision 1.2 2004/07/01 21:53:08 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/27 14:09:00 manolito
- * creditcard and email validator refactored
- *
*/
public class ValidateCreditCardTag extends ValidatorTag {
//Cardtypes, that are supported by Commons-Validator.
@@ -46,7 +33,7 @@
private String _mastercard = null;
private String _visa = null;
private String _none = null;
-
+
public ValidateCreditCardTag()
{
}
@@ -90,7 +77,7 @@
* @see javax.faces.webapp.ValidatorTag#createValidator()
*/
protected Validator createValidator() throws JspException {
-
+
FacesContext facesContext = FacesContext.getCurrentInstance();
setValidatorId(CreditCardValidator.VALIDATOR_ID);
CreditCardValidator validator = (CreditCardValidator)super.createValidator();
@@ -156,8 +143,8 @@
}
return validator;
}
-
-
+
+
/* (non-Javadoc)
* @see javax.servlet.jsp.tagext.Tag#release()
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/crosstable/HtmlColumnsTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/crosstable/HtmlColumnsTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/crosstable/HtmlColumnsTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/crosstable/HtmlColumnsTag.java Wed May 11 08:47:12 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,10 +24,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 HtmlColumnsTag extends HtmlComponentBodyTagBase
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlDataListTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlDataListTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlDataListTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlDataListTag.java Wed May 11 08:47:12 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,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.6 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.5 2004/07/01 21:53:09 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/05/18 14:31:37 manolito
- * user role support completely moved to components source tree
- *
- * Revision 1.3 2004/04/05 11:04:52 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.2 2004/04/01 12:57:39 manolito
- * additional extended component classes for user role support
- *
- * Revision 1.1 2004/03/31 12:15:26 manolito
- * custom component refactoring
- *
*/
public class HtmlDataListTag
extends HtmlComponentBodyTagBase
@@ -95,7 +73,7 @@
_enabledOnUserRole=null;
_visibleOnUserRole=null;
}
-
+
protected void setProperties(UIComponent component)
{
super.setProperties(component);
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlListRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlListRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlListRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/datalist/HtmlListRenderer.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,22 +31,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.8 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.7 2004/09/02 17:23:25 tinytoony
- * fix for the span-element for other than the output-text
- *
- * Revision 1.6 2004/08/20 07:12:00 manolito
- * rowIndexVar and rowCountVar now handled correctly by component itself instead of renderer
- *
- * Revision 1.5 2004/08/09 11:47:09 manolito
- * CSS style support also for non OL or UL layout
- *
- * Revision 1.4 2004/08/09 09:10:39 manolito
- * RFE #990814 - dataList component ignores styleClass attribute
- *
*/
public class HtmlListRenderer
extends HtmlRenderer
@@ -194,7 +178,7 @@
else
{
if(uiComponent.getId()!=null && !uiComponent.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
- {
+ {
writer.endElement(HTML.SPAN_ELEM);
}
else
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/div/Div.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/div/Div.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/div/Div.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/div/Div.java Wed May 11 08:47:12 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,15 +22,8 @@
import org.apache.myfaces.component.html.util.HtmlComponentUtils;
/**
- * @author bdudney (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2005/02/09 17:41:30 svieujot
- * Apply Sean Schofield's patch for MYFACES-104
- *
- * Revision 1.1 2004/11/08 03:43:20 bdudney
- * Added a div element. x:div to use, inserts a div with class or style attributes
- *
+ * @author bdudney (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class Div extends UIOutput {
public static final String COMPONENT_TYPE = "org.apache.myfaces.Div";
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivRenderer.java Wed May 11 08:47:12 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,24 +25,8 @@
import org.apache.myfaces.renderkit.html.HtmlRenderer;
import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
/**
- * @author bdudney (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2005/02/09 21:17:57 svieujot
- * Bugfix for MYFACES-105, thanks to Norm Deane
- *
- * Revision 1.4 2005/02/09 17:41:30 svieujot
- * Apply Sean Schofield's patch for MYFACES-104
- *
- * Revision 1.3 2004/11/27 00:00:09 svieujot
- * Remove the limitation to have a style or a styleClass attribute because sometimes, just a plain <div> can be useful.
- *
- * Revision 1.2 2004/11/10 11:09:52 bdudney
- * div renderer now puts the class/style in quotes
- *
- * Revision 1.1 2004/11/08 03:43:20 bdudney
- * Added a div element. x:div to use, inserts a div with class or style attributes
- *
+ * @author bdudney (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class DivRenderer extends HtmlRenderer {
public static final String RENDERER_TYPE = "org.apache.myfaces.DivRenderer";
@@ -54,10 +38,10 @@
}
Div div = (Div) component;
ResponseWriter writer = context.getResponseWriter();
-
+
writer.startElement(HTML.DIV_ELEM, component);
HtmlRendererUtils.writeIdIfNecessary(writer, component, context);
-
+
String styleClass = div.getStyleClass();
String style = div.getStyle();
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/div/DivTag.java Wed May 11 08:47:12 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,12 +18,8 @@
import javax.faces.component.UIComponent;
import org.apache.myfaces.taglib.html.HtmlOutputTextTagBase;
/**
- * @author bdudney (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/11/08 03:43:20 bdudney
- * Added a div element. x:div to use, inserts a div with class or style attributes
- *
+ * @author bdudney (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class DivTag extends HtmlOutputTextTagBase {
private String _style = null;
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/EmailValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/EmailValidator.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/EmailValidator.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/EmailValidator.java Wed May 11 08:47:12 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,36 +28,9 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2004/11/30 09:37:42 matzew
- * changes i18n-messages for validation
- *
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/07/01 21:53:11 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/06/16 23:02:19 o_rossmueller
- * merged confignew_branch
- *
- * Revision 1.2.2.1 2004/06/13 15:59:05 o_rossmueller
- * started integration of new config mechanism:
- * - factories
- * - components
- * - render kits
- * - managed beans + managed properties (no list/map initialization)
- *
- * Revision 1.2 2004/06/05 09:37:43 mwessendorf
- * new validator for regExpr.
- * and began with Friendly validator messages
- *
- * Revision 1.1 2004/05/27 14:09:01 manolito
- * creditcard and email validator refactored
- *
*/
public class EmailValidator implements Validator {
-
+
/**
* <p>The standard converter id for this converter.</p>
*/
@@ -66,22 +39,22 @@
* <p>The message identifier of the {@link FacesMessage} to be created if
* the maximum length check fails.</p>
*/
- public static final String EMAIL_MESSAGE_ID = "org.apache.myfaces.Email.INVALID";
-
+ public static final String EMAIL_MESSAGE_ID = "org.apache.myfaces.Email.INVALID";
+
public EmailValidator(){
}
/**
* methode that validates an email-address.
- * it uses the commons-validator
+ * it uses the commons-validator
*/
public void validate(
FacesContext facesContext,
UIComponent uiComponent,
Object value)
throws ValidatorException {
-
-
+
+
if (facesContext == null) throw new NullPointerException("facesContext");
if (uiComponent == null) throw new NullPointerException("uiComponent");
@@ -92,7 +65,7 @@
if (!GenericValidator.isEmail(value.toString())) {
Object[] args = {value.toString()};
throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,EMAIL_MESSAGE_ID, args));
-
+
}
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/ValidateEmailTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/ValidateEmailTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/ValidateEmailTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/emailvalidator/ValidateEmailTag.java Wed May 11 08:47:12 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,23 +22,10 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/09/15 07:58:58 mwessendorf
- * Custom Validators now work in OC4J - thanks to Daniel Kamakura for supporting this
- *
- * Revision 1.2 2004/07/01 21:53:11 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/27 14:09:01 manolito
- * creditcard and email validator refactored
- *
*/
public class ValidateEmailTag extends ValidatorTag
{
-
+
public ValidateEmailTag()
{
}
@@ -52,7 +39,7 @@
EmailValidator validator = (EmailValidator)super.createValidator();
return validator;
}
-
+
public void release()
{
super.release();
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,20 +29,6 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2004/11/30 09:37:42 matzew
- * changes i18n-messages for validation
- *
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/07/01 21:53:10 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/06/27 22:06:26 mwessendorf
- * Log
- *
- *
*/
public class EqualValidator implements Validator, StateHolder {
@@ -55,7 +41,7 @@
* <p>The message identifier of the {@link FacesMessage} to be created if
* the equal_for check fails.</p>
*/
- public static final String EQUAL_MESSAGE_ID = "org.apache.myfaces.Equal.INVALID";
+ public static final String EQUAL_MESSAGE_ID = "org.apache.myfaces.Equal.INVALID";
public EqualValidator(){
}
@@ -63,7 +49,7 @@
//the foreign component_id on which the validation is based.
private String _for= null;
-
+
//JSF-Field for StateHolder-IF
private boolean _transient = false;
@@ -91,7 +77,7 @@
if(foreignComp.getValue()==null || !foreignComp.getValue().toString().equals(value.toString()) )
throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,EQUAL_MESSAGE_ID, args));
-
+
}
// -------------------------------------------------------- StateholderIF
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/ValidateEqualTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/ValidateEqualTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/ValidateEqualTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/ValidateEqualTag.java Wed May 11 08:47:12 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,29 +25,12 @@
/**
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.6 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.5 2004/09/15 07:58:59 mwessendorf
- * Custom Validators now work in OC4J - thanks to Daniel Kamakura for supporting this
- *
- * Revision 1.4 2004/07/11 16:20:21 mwessendorf
- * typo
- *
- * Revision 1.3 2004/07/01 21:53:10 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/06/27 22:06:27 mwessendorf
- * Log
- *
- *
*/
public class ValidateEqualTag extends ValidatorTag {
-
+
//the foreign component_id on which the validation is based.
private String _for = null;
-
+
public ValidateEqualTag(){
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java Wed May 11 08:47:12 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.
@@ -37,51 +37,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.15 2004/12/01 16:32:03 svieujot
- * Convert the Multipart filter in an ExtensionsFilter that provides an additional facility to include resources in a page.
- * Tested only with javascript resources right now, but should work fine with images too.
- * Some work to do to include css resources.
- * The popup component has been converted to use this new Filter.
- *
- * Revision 1.14 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.13 2004/09/03 12:32:05 tinytoony
- * file upload
- *
- * Revision 1.12 2004/07/14 06:02:48 svieujot
- * FileUpload : split file based and memory based implementation.
- * Use the storage="memory|file" attribute.
- * Default is memory because file based implementation fails to serialize.
- *
- * Revision 1.11 2004/07/12 03:06:36 svieujot
- * Restore error handling due to UploadedFileDefaultImpl changes
- *
- * Revision 1.10 2004/07/01 21:53:05 mwessendorf
- * ASF switch
- *
- * Revision 1.9 2004/05/24 22:48:10 svieujot
- * Making UploadedFile an interface, and adjusting the renderer.
- *
- * Revision 1.8 2004/05/18 14:26:49 manolito
- * added UserRoleAware support
- *
- * Revision 1.7 2004/05/10 22:17:24 o_rossmueller
- * max file size configurable by filter init parameter 'maxFileSize'
- * removed default creation of file contents byte array
- *
- * Revision 1.6 2004/04/26 13:16:32 manolito
- * Log was missing
- *
- * Revision 1.4 Sylvain Vieujot
- * Don't change the file bean if no file is uploaded.
- *
- * Revision 1.3 Sylvain Vieujot
- * Fix a null pointer exception in encodeEnd if the file name is null.
- *
- * Revision 1.2 Sylvain Vieujot
- * Upgraded to use commons fileUpload
*/
public class HtmlFileUploadRenderer
extends Renderer
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFile.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFile.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFile.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFile.java Wed May 11 08:47:12 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,23 +24,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.7 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.6 2004/07/12 03:04:32 svieujot
- * Make Serializable to be able to save it in the FacesContext
- *
- * Revision 1.5 2004/07/01 21:53:05 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/05/24 22:48:10 svieujot
- * Making UploadedFile an interface, and adjusting the renderer.
- *
- * Revision 1.3 2004/05/10 22:17:24 o_rossmueller
- * max file size configurable by filter init parameter 'maxFileSize'
- * removed default creation of file contents byte array
- *
*/
public interface UploadedFile extends Serializable
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultFileImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultFileImpl.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultFileImpl.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultFileImpl.java Wed May 11 08:47:12 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,20 +25,6 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/09/03 12:43:57 manolito
- * File item transient in file based UploadedFile and no more empty constructors
- *
- * Revision 1.2 2004/07/14 06:10:18 svieujot
- * Remove debug messages
- *
- * Revision 1.1 2004/07/14 06:02:48 svieujot
- * FileUpload : split file based and memory based implementation.
- * Use the storage="memory|file" attribute.
- * Default is memory because file based implementation fails to serialize.
*/
public class UploadedFileDefaultFileImpl extends UploadedFileDefaultImplBase
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultImplBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultImplBase.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultImplBase.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultImplBase.java Wed May 11 08:47:12 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,13 +22,6 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/09/03 12:43:57 manolito
- * File item transient in file based UploadedFile and no more empty constructors
- *
*/
public abstract class UploadedFileDefaultImplBase implements UploadedFile
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultMemoryImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultMemoryImpl.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultMemoryImpl.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/fileupload/UploadedFileDefaultMemoryImpl.java Wed May 11 08:47:12 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,23 +25,6 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/09/11 02:48:23 svieujot
- * Remove empty constructor
- *
- * Revision 1.3 2004/09/03 12:43:57 manolito
- * File item transient in file based UploadedFile and no more empty constructors
- *
- * Revision 1.2 2004/07/14 06:10:18 svieujot
- * Remove debug messages
- *
- * Revision 1.1 2004/07/14 06:02:48 svieujot
- * FileUpload : split file based and memory based implementation.
- * Use the storage="memory|file" attribute.
- * Default is memory because file based implementation fails to serialize.
*/
public class UploadedFileDefaultMemoryImpl extends UploadedFileDefaultImplBase
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtml.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtml.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtml.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtml.java Wed May 11 08:47:12 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,90 +26,27 @@
/**
* HTML Editor using the kupu library.
* http://kupu.oscom.org/
- *
+ *
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/03/26 20:31:37 svieujot
- * Rename x:htmlEditor to x:inputHtml.
- *
- * Revision 1.20 2005/03/22 02:13:28 svieujot
- * htmlEditor : Add a showAllToolBoxes short cut.
- *
- * Revision 1.19 2005/03/15 05:24:03 svieujot
- * Add a fallback textarea mode to the htmlEditor.
- *
- * Revision 1.18 2005/03/09 04:07:22 svieujot
- * htmlEditor : Kupu 1.2rc2 update
- *
- * Revision 1.17 2005/02/06 19:45:32 svieujot
- * Add allowExternalLinks attribute.
- *
- * Revision 1.16 2005/02/05 18:51:21 svieujot
- * x:htmlEditor : Upgrade to Kupu 1.2rc1, remove formularMode (too experimental), bugfixes.
- *
- * Revision 1.15 2005/01/03 03:49:31 svieujot
- * trim returned text
- *
- * Revision 1.14 2005/01/02 20:39:16 svieujot
- * HtmlEditor can now process HTML documents and HTML fragments.
- *
- * Revision 1.13 2004/12/24 13:21:50 matzew
- * organized imports
- *
- * Revision 1.12 2004/12/09 05:16:44 svieujot
- * Simplify by extending html.ext.HtmlInputText instead of extending UIInput and implementing UserRolesAware.
- *
- * Revision 1.11 2004/12/08 04:36:27 svieujot
- * Cancel last *source attributes, and make style and styleClass more modular.
- *
- * Revision 1.10 2004/12/08 04:13:56 svieujot
- * Add styleSource and styleClassSource for the htmlEditor source window.
- *
- * Revision 1.9 2004/12/06 04:26:07 svieujot
- * Make HtmlEditor UserRoleAware.
- *
- * Revision 1.8 2004/12/06 03:34:57 svieujot
- * Typo
- *
- * Revision 1.7 2004/12/06 01:03:42 svieujot
- * Bugfix : getter now use boolean instead of Boolean, and setters created.
- *
- * Revision 1.6 2004/12/04 22:25:36 svieujot
- * *** empty log message ***
- *
- * Revision 1.5 2004/12/04 03:26:28 svieujot
- * Various bug fixes
- *
- * Revision 1.4 2004/12/04 00:40:25 svieujot
- * htmlEditor : add style and styleClass attributes.
- *
- * Revision 1.3 2004/12/04 00:20:00 svieujot
- * htmlEditor : Add a formular mode, and more sensible defaults.
- *
- * Revision 1.2 2004/12/03 21:59:09 svieujot
- * Initial set of htmlEditor attributes.
- *
- * Revision 1.1 2004/12/02 22:28:30 svieujot
- * Add an x:htmlEditor based on the Kupu library.
*/
public class InputHtml extends HtmlInputText {
public static final String COMPONENT_TYPE = "org.apache.myfaces.InputHtml";
public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.InputHtml";
-
+
private static final Log log = LogFactory.getLog(HtmlInputText.class);
-
+
private String _style;
private String _styleClass;
-
+
private String _fallback;
private String _type;
-
+
private Boolean _allowEditSource;
private Boolean _allowExternalLinks;
private Boolean _addKupuLogo;
-
+
private Boolean _showAllToolBoxes;
private Boolean _showPropertiesToolBox;
private Boolean _showLinksToolBox;
@@ -129,26 +66,26 @@
public Object saveState(FacesContext context) {
Object values[] = new Object[5];
values[0] = super.saveState(context);
-
+
String[] display = new String[2];
display[0] = _style;
display[1] = _styleClass;
-
+
values[1] = display;
-
+
String[] types = new String[2];
types[0] = _fallback;
types[1] = _type;
-
+
values[2] = types;
-
+
Boolean toolBarButtons[] = new Boolean[3];
toolBarButtons[0] = _allowEditSource;
toolBarButtons[1] = _allowExternalLinks;
toolBarButtons[2] = _addKupuLogo;
-
+
values[3] = toolBarButtons;
-
+
Boolean toolBoxes[] = new Boolean[7];
toolBoxes[0] = _showAllToolBoxes;
toolBoxes[1] = _showPropertiesToolBox;
@@ -157,29 +94,29 @@
toolBoxes[4] = _showTablesToolBox;
toolBoxes[5] = _showCleanupExpressionsToolBox;
toolBoxes[6] = _showDebugToolBox;
-
+
values[4] = toolBoxes;
-
+
return values;
}
public void restoreState(FacesContext context, Object state) {
Object values[] = (Object[]) state;
super.restoreState(context, values[0]);
-
+
String[] display = (String[]) values[1];
_style = display[0];
_styleClass = display[1];
-
+
String[] types = (String[]) values[2];
_fallback = types[0];
_type = types[1];
-
+
Boolean[] toolBarButtons = (Boolean[]) values[3];
_allowEditSource = toolBarButtons[0];
_allowExternalLinks = toolBarButtons[1];
_addKupuLogo = toolBarButtons[2];
-
+
Boolean[] toolBoxes = (Boolean[]) values[4];
_showAllToolBoxes = toolBoxes[0];
_showPropertiesToolBox = toolBoxes[1];
@@ -189,7 +126,7 @@
_showCleanupExpressionsToolBox = toolBoxes[5];
_showDebugToolBox = toolBoxes[6];
}
-
+
public String getStyle(){
if (_style != null)
return _style;
@@ -199,7 +136,7 @@
public void setStyle(String style){
this._style = style;
}
-
+
public String getStyleClass(){
if (_styleClass != null)
return _styleClass;
@@ -209,7 +146,7 @@
public void setStyleClass(String styleClass){
this._styleClass = styleClass;
}
-
+
public String getFallback(){
if (_fallback != null)
return _fallback;
@@ -219,7 +156,7 @@
public void setFallback(String _fallback){
this._fallback = _fallback;
}
-
+
public String getType(){
if (_type != null)
return _type;
@@ -232,7 +169,7 @@
public boolean isTypeDocument(){
return getType().equals("document");
}
-
+
public boolean isAllowEditSource(){
if (_allowEditSource != null)
return _allowEditSource.booleanValue();
@@ -242,7 +179,7 @@
public void setAllowEditSource(boolean allowEditSource){
this._allowEditSource = Boolean.valueOf(allowEditSource);
}
-
+
public boolean isAllowExternalLinks(){
if (_allowExternalLinks != null)
return _allowExternalLinks.booleanValue();
@@ -252,7 +189,7 @@
public void setAllowExternalLinks(boolean allowExternalLinks){
this._allowExternalLinks = Boolean.valueOf(allowExternalLinks);
}
-
+
public boolean isAddKupuLogo(){
if (_addKupuLogo != null)
return _addKupuLogo.booleanValue();
@@ -262,7 +199,7 @@
public void setAddKupuLogo(boolean addKupuLogo){
this._addKupuLogo = Boolean.valueOf(addKupuLogo);
}
-
+
public boolean isShowAllToolBoxes(){
if (_showAllToolBoxes != null)
return _showAllToolBoxes.booleanValue();
@@ -272,7 +209,7 @@
public void setShowAllToolBoxes(boolean showAllToolBoxes){
this._showAllToolBoxes = Boolean.valueOf(showAllToolBoxes);
}
-
+
public boolean isShowPropertiesToolBox(){
if( isShowAllToolBoxes() )
return true;
@@ -285,7 +222,7 @@
public void setShowPropertiesToolBox(boolean showPropertiesToolBox){
this._showPropertiesToolBox = Boolean.valueOf(showPropertiesToolBox);
}
-
+
public boolean isShowLinksToolBox(){
if( isShowAllToolBoxes() )
return true;
@@ -298,7 +235,7 @@
public void setShowLinksToolBox(boolean showLinksToolBox){
this._showLinksToolBox = Boolean.valueOf(showLinksToolBox);
}
-
+
public boolean isShowImagesToolBox(){
if( isShowAllToolBoxes() )
return true;
@@ -311,7 +248,7 @@
public void setShowImagesToolBox(boolean showImagesToolBox){
this._showImagesToolBox = Boolean.valueOf(showImagesToolBox);
}
-
+
public boolean isShowTablesToolBox(){
if( isShowAllToolBoxes() )
return true;
@@ -324,7 +261,7 @@
public void setShowTablesToolBox(boolean showTablesToolBox){
this._showTablesToolBox = Boolean.valueOf(showTablesToolBox);
}
-
+
public boolean isShowCleanupExpressionsToolBox(){
if( isShowAllToolBoxes() )
return true;
@@ -337,7 +274,7 @@
public void setShowCleanupExpressionsToolBox(boolean showCleanupExpressionsToolBox){
this._showCleanupExpressionsToolBox = Boolean.valueOf(showCleanupExpressionsToolBox);
}
-
+
public boolean isShowDebugToolBox(){
if( isShowAllToolBoxes() )
return true;
@@ -350,7 +287,7 @@
public void setShowDebugToolBox(boolean showTablesToolBox){
this._showDebugToolBox = Boolean.valueOf(showTablesToolBox);
}
-
+
public boolean isShowAnyToolBox(){
return isShowAllToolBoxes()
|| isShowPropertiesToolBox()
@@ -365,31 +302,31 @@
String val = RendererUtils.getStringValue(context, this);
if( isHtmlDocument( val ) )
return val;
-
+
return "<html><body>"+(val==null ? "" : val)+"</body></html>";
}
-
+
private static boolean isHtmlDocument(String text){
if( text == null )
return false;
-
+
if( text.indexOf("<body>")!=-1 || text.indexOf("<body ")!=-1
|| text.indexOf("<BODY>")!=-1 || text.indexOf("<BODY ")!=-1 )
return true;
-
+
return false;
}
-
+
public String getValueFromDocument(String text){
if( text == null )
return "";
-
+
if( isTypeDocument() )
return text.trim();
-
+
if( !isHtmlDocument(text) )
return text.trim();
-
+
// Extract the fragment from the document.
String lcText = text.toLowerCase();
int textLength = lcText.length();
@@ -398,29 +335,29 @@
bodyStartIndex = lcText.indexOf("<body");
if( bodyStartIndex == -1 )
break; // not found.
-
+
bodyStartIndex += 5;
char c = lcText.charAt(bodyStartIndex);
if( c=='>' ){
break;
}
-
+
if( c!=' ' && c!='\t' )
continue;
-
+
bodyStartIndex = lcText.indexOf('>', bodyStartIndex);
}
bodyStartIndex++;
-
+
int bodyEndIndex = lcText.lastIndexOf("</body>")-1;
-
+
if( bodyStartIndex<0 || bodyEndIndex<0
|| bodyStartIndex > bodyEndIndex
|| bodyStartIndex>=textLength || bodyEndIndex>=textLength ){
log.warn("Couldn't extract HTML body from :\n"+text);
return text.trim();
}
-
+
return text.substring(bodyStartIndex, bodyEndIndex+1).trim();
}
}