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 [2/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/
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.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,90 +37,6 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2005/04/21 04:07:13 svieujot
- * Kupu 1.2 update
- *
- * Revision 1.1 2005/03/26 20:31:37 svieujot
- * Rename x:htmlEditor to x:inputHtml.
- *
- * Revision 1.26 2005/03/15 21:24:41 svieujot
- * Style handling improvements.
- *
- * Revision 1.25 2005/03/15 05:24:03 svieujot
- * Add a fallback textarea mode to the htmlEditor.
- *
- * Revision 1.24 2005/03/09 04:13:52 svieujot
- * htmlEditor : remove unused scripts
- *
- * Revision 1.23 2005/03/09 04:07:22 svieujot
- * htmlEditor : Kupu 1.2rc2 update
- *
- * Revision 1.22 2005/02/08 14:24:45 svieujot
- * Temporarily hide unimplemented functionalities (internal images library & internal links library).
- *
- * Revision 1.21 2005/02/07 01:40:42 svieujot
- * style attribute fix.
- *
- * Revision 1.20 2005/02/06 19:45:32 svieujot
- * Add allowExternalLinks attribute.
- *
- * Revision 1.19 2005/02/05 23:07:45 svieujot
- * x:htmlEditor Add full page mode (zoom) & bugfixes
- *
- * Revision 1.18 2005/02/05 18:51:21 svieujot
- * x:htmlEditor : Upgrade to Kupu 1.2rc1, remove formularMode (too experimental), bugfixes.
- *
- * Revision 1.17 2005/01/02 20:39:16 svieujot
- * HtmlEditor can now process HTML documents and HTML fragments.
- *
- * 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:16:26 svieujot
- * Start implementing UserRoleAware.
- *
- * Revision 1.14 2004/12/09 05:19:12 svieujot
- * Bugfix for submitted values that were not taken care of.
- *
- * Revision 1.13 2004/12/08 04:36:27 svieujot
- * Cancel last *source attributes, and make style and styleClass more modular.
- *
- * Revision 1.12 2004/12/08 04:13:56 svieujot
- * Add styleSource and styleClassSource for the htmlEditor source window.
- *
- * Revision 1.11 2004/12/06 04:26:07 svieujot
- * Make HtmlEditor UserRoleAware.
- *
- * Revision 1.10 2004/12/06 01:03:42 svieujot
- * Bugfix : getter now use boolean instead of Boolean, and setters created.
- *
- * Revision 1.9 2004/12/04 03:50:44 svieujot
- * Remove bug for IE
- *
- * Revision 1.8 2004/12/04 03:26:28 svieujot
- * Various bug fixes
- *
- * Revision 1.7 2004/12/04 02:09:42 svieujot
- * Several small fixes.
- *
- * Revision 1.6 2004/12/04 00:40:25 svieujot
- * htmlEditor : add style and styleClass attributes.
- *
- * Revision 1.5 2004/12/04 00:20:00 svieujot
- * htmlEditor : Add a formular mode, and more sensible defaults.
- *
- * Revision 1.4 2004/12/03 21:59:09 svieujot
- * Initial set of htmlEditor attributes.
- *
- * Revision 1.3 2004/12/03 12:55:30 svieujot
- * Get ride of the save button / process.
- *
- * Revision 1.2 2004/12/03 08:31:28 manolito
- * writer.append copy'n'paste error?
- *
- * Revision 1.1 2004/12/02 22:28:30 svieujot
- * Add an x:htmlEditor based on the Kupu library.
*/
public class InputHtmlRenderer extends HtmlRenderer {
// TODO : Finish Disabled mode.
@@ -133,12 +49,12 @@
return ((InputHtml)uiComponent).isDisabled();
}
-
+
private static boolean useFallback(InputHtml editor){
// TODO : Handle fallback="auto"
return editor.getFallback().equals("true");
}
-
+
public void encodeEnd(FacesContext context, UIComponent uiComponent) throws IOException {
RendererUtils.checkParamValidity(context, uiComponent, InputHtml.class);
InputHtml editor = (InputHtml) uiComponent;
@@ -147,16 +63,16 @@
else
encodeEndNormalMode(context, editor);
}
-
+
private void encodeEndFallBackMode(FacesContext context, InputHtml editor) throws IOException {
- String clientId = editor.getClientId(context);
+ String clientId = editor.getClientId(context);
// Use only a textarea
ResponseWriter writer = context.getResponseWriter();
writer.startElement(HTML.TEXTAREA_ELEM, editor);
writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
HtmlRendererUtils.writeIdIfNecessary(writer, editor, context);
-
+
if( editor.getStyle()!=null )
writer.writeAttribute(HTML.STYLE_ATTR, editor.getStyle(), null);
if( editor.getStyleClass()!=null )
@@ -170,11 +86,11 @@
writer.endElement(HTML.TEXTAREA_ELEM);
}
-
+
private static String htmlToPlainText(String html){
return getHtmlBody( html ).replaceAll("<br.*>","\n");
}
-
+
private static String getHtmlBody(String html){
String lcText = html.toLowerCase();
int textLength = lcText.length();
@@ -183,31 +99,31 @@
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 ){
return html.trim();
}
-
+
return html.substring(bodyStartIndex, bodyEndIndex+1).trim();
}
-
+
private void encodeEndNormalMode(FacesContext context, InputHtml editor) throws IOException {
String clientId = editor.getClientId(context);
String formId;
@@ -218,11 +134,11 @@
}
formId = tmpComponent.getClientId(context);
}
-
-
+
+
AddResource.addStyleSheet(InputHtmlRenderer.class, "kupustyles.css", context);
AddResource.addStyleSheet(InputHtmlRenderer.class, "kupudrawerstyles.css", context);
-
+
AddResource.addJavaScriptToHeader(InputHtmlRenderer.class, "sarissa.js", context);
AddResource.addJavaScriptToHeader(InputHtmlRenderer.class, "kupuhelpers.js", context);
AddResource.addJavaScriptToHeader(InputHtmlRenderer.class, "kupueditor.js", context);
@@ -235,15 +151,15 @@
AddResource.addJavaScriptToHeader(InputHtmlRenderer.class, "kupustart_form.js", context);
AddResource.addJavaScriptToHeader(InputHtmlRenderer.class, "kupusourceedit.js", context);
AddResource.addJavaScriptToHeader(InputHtmlRenderer.class, "kupudrawers.js", context);
-
+
ResponseWriter writer = context.getResponseWriter();
writer.startElement(HTML.DIV_ELEM,null);
writer.writeAttribute(HTML.STYLE_ATTR, "display: none;",null);
-
+
writer.startElement("xml", null);
writer.writeAttribute("id", "kupuconfig", null);
-
+
writer.startElement("kupuconfig", null);
writeTag(writer, "dst", "fulldoc.html");
@@ -252,14 +168,14 @@
writeTag(writer, "strict_output", "1");
writeTag(writer, "content_type", "application/xhtml+xml");
writeTag(writer, "compatible_singletons", "1");
-
+
writer.startElement("table_classes", null);
writeTag(writer, "class", "plain");
writeTag(writer, "class", "listing");
writeTag(writer, "class", "grid");
writeTag(writer, "class", "data");
writer.endElement("table_classes");
-
+
writer.startElement("cleanup_expressions",null);
writer.startElement("set",null);
writer.startElement("name",null);
@@ -296,10 +212,10 @@
writer.endElement("expression");
writer.endElement("set");
writer.endElement("cleanup_expressions");
-
+
writeTag(writer, "image_xsl_uri", AddResource.getResourceMappedPath(InputHtmlRenderer.class, "kupudrawers/drawer.xsl", context));
writeTag(writer, "link_xsl_uri", AddResource.getResourceMappedPath(InputHtmlRenderer.class, "kupudrawers/drawer.xsl", context));
-
+
// TODO : Make this work (reference available images, ...).
writeTag(writer, "image_libraries_uri", AddResource.getResourceMappedPath(InputHtmlRenderer.class, "kupudrawers/imagelibrary.xml", context));
writeTag(writer, "link_libraries_uri", AddResource.getResourceMappedPath(InputHtmlRenderer.class, "kupudrawers/linklibrary.xml", context));
@@ -310,7 +226,7 @@
writer.endElement("xml");
writer.endElement(HTML.DIV_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-fulleditor", null);
@@ -347,7 +263,7 @@
writer.endElement(HTML.BUTTON_ELEM);
}
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SELECT_ELEM,null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-tb-styles",null);
writer.startElement(HTML.OPTION_ELEM,null);
@@ -356,7 +272,7 @@
writer.writeAttribute("i18n:translate", "paragraph-normal", null);
writer.write("Normal");
writer.endElement(HTML.OPTION_ELEM);
-
+
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute(HTML.VALUE_ATTR, "H1",null);
writer.startElement(HTML.SPAN_ELEM,null);
@@ -366,7 +282,7 @@
writer.endElement(HTML.SPAN_ELEM);
writer.write(" 1");
writer.endElement(HTML.OPTION_ELEM);
-
+
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute(HTML.VALUE_ATTR, "H2",null);
writer.startElement(HTML.SPAN_ELEM,null);
@@ -376,7 +292,7 @@
writer.endElement(HTML.SPAN_ELEM);
writer.write(" 2");
writer.endElement(HTML.OPTION_ELEM);
-
+
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute(HTML.VALUE_ATTR, "H3",null);
writer.startElement(HTML.SPAN_ELEM,null);
@@ -386,7 +302,7 @@
writer.endElement(HTML.SPAN_ELEM);
writer.write(" 3");
writer.endElement(HTML.OPTION_ELEM);
-
+
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute(HTML.VALUE_ATTR, "H4",null);
writer.startElement(HTML.SPAN_ELEM,null);
@@ -396,7 +312,7 @@
writer.endElement(HTML.SPAN_ELEM);
writer.write(" 4");
writer.endElement(HTML.OPTION_ELEM);
-
+
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute(HTML.VALUE_ATTR, "H5",null);
writer.startElement(HTML.SPAN_ELEM,null);
@@ -406,7 +322,7 @@
writer.endElement(HTML.SPAN_ELEM);
writer.write(" 5");
writer.endElement(HTML.OPTION_ELEM);
-
+
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute(HTML.VALUE_ATTR, "H6",null);
writer.startElement(HTML.SPAN_ELEM,null);
@@ -416,22 +332,22 @@
writer.endElement(HTML.SPAN_ELEM);
writer.write(" 6");
writer.endElement(HTML.OPTION_ELEM);
-
+
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute("xmlns:i18n", "http://xml.zope.org/namespaces/i18n", null);
writer.writeAttribute(HTML.VALUE_ATTR, "PRE",null);
writer.writeAttribute("i18n:translate", "paragraph-formatted", null);
writer.write("Formatted");
writer.endElement(HTML.OPTION_ELEM);
-
+
writer.endElement(HTML.SELECT_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.STYLE_ATTR, "display: none", null);
writeButton(writer, "kupu-save", "Save", "s");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-bg-basicmarkup", null);
@@ -439,20 +355,20 @@
writeButton(writer, "kupu-italic", "italic: alt-i", "i");
writeButton(writer, "kupu-underline", "underline: alt-u", "u");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-bg-subsuper", null);
writeButton(writer, "kupu-subscript", "subscript: alt--", "-");
writeButton(writer, "kupu-superscript", "superscript: alt-+", "+");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writeButton(writer, "kupu-forecolor", "text color: alt-f", "f");
writeButton(writer, "kupu-hilitecolor", "background color: alt-h", "h");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-bg-justify", null);
@@ -460,27 +376,27 @@
writeButton(writer, "kupu-justifycenter", "center justify: alt-c", "c");
writeButton(writer, "kupu-justifyright", "right justify: alt-r", "r");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-bg-list", null);
writeButton(writer, "kupu-insertorderedlist", "numbered list: alt-#", "#", "kupu-list-ol-addbutton");
writeButton(writer, "kupu-insertunorderedlist", "unordered list: alt-*", "*", "kupu-list-ul-addbutton");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-bg-definitionlist", null);
writeButton(writer, "kupu-insertdefinitionlist", "definition list: alt-=", "=", "kupu-list-dl-addbutton");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-bg-indent", null);
writeButton(writer, "kupu-outdent", "outdent: alt-<", "<");
writeButton(writer, "kupu-indent", "indent: alt->", ">");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
if( ! editor.isAllowExternalLinks() ){
@@ -491,21 +407,21 @@
writeButton(writer, "kupu-exthyperlink", "external link", null, "kupu-linkdrawer-button");
writeButton(writer, "kupu-table", "table", null, "kupu-tabledrawer-button");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-bg-remove", null);
writeButton(writer, "kupu-removeimage invisible", "Remove image", null, "kupu-removeimage-button");
writeButton(writer, "kupu-removelink invisible", "Remove link", null, "kupu-removelink-button");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-bg-undo", null);
writeButton(writer, "kupu-undo", "undo: alt-z", "z");
writeButton(writer, "kupu-redo", "redo: alt-y", "y");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-tb-buttongroup", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-source", null);
@@ -514,7 +430,7 @@
}
writeButton(writer, "kupu-source", "edit HTML code", null);
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.endElement(HTML.SPAN_ELEM); // kupu-tb-buttons
writer.startElement(HTML.SELECT_ELEM,null);
@@ -524,7 +440,7 @@
writeOption(writer, "circle", "list-circle", "○");
writeOption(writer, "none", "list-nobullet", "no bullet");
writer.endElement(HTML.SELECT_ELEM);
-
+
writer.startElement(HTML.SELECT_ELEM,null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-olstyles", null);
writeOption(writer, "decimal", "list-decimal", "1");
@@ -533,7 +449,7 @@
writeOption(writer, "upper-alpha", "list-upperalpha", "A");
writeOption(writer, "lower-alpha", "list-loweralpha", "a");
writer.endElement(HTML.SELECT_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM,null);
writer.writeAttribute(HTML.STYLE_ATTR, "display:block;", null);
writer.startElement(HTML.DIV_ELEM,null);
@@ -541,7 +457,7 @@
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-drawer", null);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
// External Link drawer
writer.startElement(HTML.DIV_ELEM,null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-linkdrawer", null);
@@ -611,7 +527,7 @@
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
// Table drawer
writer.startElement(HTML.DIV_ELEM,null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-tabledrawer",null);
@@ -630,7 +546,7 @@
writer.startElement(HTML.TABLE_ELEM,null);
writer.writeAttribute(HTML.WIDTH_ATTR, "100%",null);
writer.startElement(HTML.TBODY_ELEM,null);
-
+
writer.startElement(HTML.TR_ELEM,null);
writer.startElement(HTML.TD_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
@@ -648,18 +564,18 @@
writer.endElement(HTML.SELECT_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.startElement(HTML.TR_ELEM, null);
-
+
writer.startElement(HTML.TD_ELEM, null);
writer.writeAttribute(HTML.COLSPAN_ATTR, "2", null);
writer.writeAttribute(HTML.CLASS_ATTR, "", null); // ?
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-tabledrawer-addtable", null);
writer.startElement(HTML.TABLE_ELEM, null);
writer.writeAttribute(HTML.WIDTH_ATTR, "100%", null);
-
+
writer.startElement(HTML.TR_ELEM, null);
writer.startElement(HTML.TD_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
@@ -674,7 +590,7 @@
writer.endElement(HTML.INPUT_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.startElement(HTML.TR_ELEM, null);
writer.startElement(HTML.TD_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
@@ -688,7 +604,7 @@
writer.endElement(HTML.INPUT_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.startElement(HTML.TR_ELEM, null);
writer.startElement(HTML.TD_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
@@ -707,7 +623,7 @@
writer.endElement(HTML.LABEL_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.startElement(HTML.TR_ELEM, null);
writer.startElement(HTML.TD_ELEM, null);
writer.writeAttribute(HTML.COLSPAN_ATTR, "2", null);
@@ -719,7 +635,7 @@
writer.endElement(HTML.BUTTON_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.startElement(HTML.TR_ELEM, null);
writer.startElement(HTML.TD_ELEM, null);
writer.writeAttribute(HTML.COLSPAN_ATTR, "2", null);
@@ -731,15 +647,15 @@
writer.endElement(HTML.BUTTON_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.endElement(HTML.TABLE_ELEM);
writer.endElement(HTML.DIV_ELEM); // kupu-tabledrawer-addtable
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-tabledrawer-edittable", null);
writer.startElement(HTML.TABLE_ELEM, null);
writer.writeAttribute(HTML.WIDTH_ATTR, "100%", null);
-
+
writer.startElement(HTML.TR_ELEM,null);
writer.startElement(HTML.TD_ELEM,null);
writer.writeAttribute(HTML.WIDTH_ATTR, "50%", null);
@@ -755,7 +671,7 @@
writer.endElement(HTML.SELECT_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.startElement(HTML.TR_ELEM,null);
writer.startElement(HTML.TD_ELEM,null);
writer.write("Column");
@@ -775,7 +691,7 @@
writer.endElement(HTML.BUTTON_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.startElement(HTML.TR_ELEM,null);
writer.startElement(HTML.TD_ELEM,null);
writer.write("Row");
@@ -795,7 +711,7 @@
writer.endElement(HTML.BUTTON_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.startElement(HTML.TR_ELEM,null);
writer.startElement(HTML.TD_ELEM,null);
writer.write("Fix Table");
@@ -809,13 +725,13 @@
writer.endElement(HTML.BUTTON_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.endElement(HTML.TABLE_ELEM);
writer.endElement(HTML.DIV_ELEM); // kupu-tabledrawer-edittable
-
+
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
-
+
writer.endElement(HTML.TBODY_ELEM);
writer.endElement(HTML.TABLE_ELEM);
writer.endElement(HTML.TD_ELEM);
@@ -831,9 +747,9 @@
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM); // kupu-tabledrawer
-
+
writer.endElement(HTML.DIV_ELEM); // toolbar
-
+
//
// Tool Boxes
//
@@ -843,7 +759,7 @@
if( ! editor.isShowAnyToolBox() ){
writer.writeAttribute(HTML.STYLE_ATTR, "display: none", null);
}
-
+
// Properties tool box
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox", null);
@@ -859,7 +775,7 @@
writer.write("Title:");
writer.endElement(HTML.DIV_ELEM);
writer.startElement(HTML.INPUT_ELEM, null);
- writer.writeAttribute(HTML.CLASS_ATTR, "wide", null); // TODO : Check class name. Should be something like kupu-wide in next version.
+ writer.writeAttribute(HTML.CLASS_ATTR, "wide", null); // TODO : Check class name. Should be something like kupu-wide in next version.
writer.writeAttribute(HTML.ID_ATTR, "kupu-properties-title", null);
writer.endElement(HTML.INPUT_ELEM);
writer.startElement(HTML.DIV_ELEM, null);
@@ -884,7 +800,7 @@
writer.writeAttribute("i18n:translate", "links", null);
writer.write("Links");
writer.endElement(HTML.H1_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-addlink", null);
@@ -896,13 +812,13 @@
writer.write("Link the highlighted text to this URL:");
writer.endElement(HTML.SPAN_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
writer.startElement(HTML.INPUT_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-link-input", null);
writer.writeAttribute(HTML.CLASS_ATTR, "wide", null);
writer.writeAttribute(HTML.TYPE_ATTR, "text", null);
writer.endElement(HTML.INPUT_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-buttons", null);
writer.startElement(HTML.BUTTON_ELEM, null);
@@ -912,10 +828,10 @@
writer.write("Make Link");
writer.endElement(HTML.BUTTON_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
// Images tool box
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox", null);
@@ -937,20 +853,20 @@
writer.write("Insert image at the following URL:");
writer.endElement(HTML.SPAN_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
writer.startElement(HTML.INPUT_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-image-input", null);
writer.writeAttribute(HTML.VALUE_ATTR, "kupuimages/kupu_icon.gif", null);
writer.writeAttribute(HTML.CLASS_ATTR, "wide", null);
writer.writeAttribute(HTML.TYPE_ATTR, "text", null);
writer.endElement(HTML.INPUT_ELEM);
-
+
writer.startElement(HTML.SPAN_ELEM, null);
writer.writeAttribute("xmlns:i18n", "http://xml.zope.org/namespaces/i18n", null);
writer.writeAttribute("i18n:translate", "", null);
writer.write("Image float:");
writer.endElement(HTML.SPAN_ELEM);
-
+
writer.startElement(HTML.SELECT_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-image-float-select", null);
writer.writeAttribute(HTML.CLASS_ATTR, "wide", null);
@@ -958,7 +874,7 @@
writeOption(writer, "left", "Left");
writeOption(writer, "right", "Right");
writer.endElement(HTML.SELECT_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "text-align: center", null);
writer.startElement(HTML.BUTTON_ELEM, null);
@@ -983,7 +899,7 @@
writer.writeAttribute("i18n:translate", "table-inspector", null);
writer.write("Tables");
writer.endElement(HTML.H1_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
writer.write("Table Class:");
@@ -992,7 +908,7 @@
writer.writeAttribute(HTML.ID_ATTR, "kupu-table-classchooser", null);
writer.endElement(HTML.SELECT_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
// Add table
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-toolbox-addtable", null);
@@ -1005,7 +921,7 @@
writer.writeAttribute(HTML.TYPE_ATTR, "text", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-table-newrows", null);
writer.endElement(HTML.INPUT_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
writer.write("Columns:");
@@ -1015,7 +931,7 @@
writer.writeAttribute(HTML.TYPE_ATTR, "text", null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-table-newcols", null);
writer.endElement(HTML.INPUT_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
writer.write("Headings:");
@@ -1029,18 +945,18 @@
writer.write("Create");
writer.endElement(HTML.LABEL_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-buttons", null);
writeButton(writer, "kupu-table-fixall-button", "Fix Table");
writeButton(writer, "kupu-table-addtable-button", "Add Table");
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM); // Add table
-
+
// Edit table
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-toolbox-edittable", null);
-
+
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
writer.write("Col Align:");
@@ -1052,7 +968,7 @@
writeOption(writer, "right", "Right");
writer.endElement(HTML.SELECT_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
writer.startElement(HTML.DIV_ELEM,null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-buttons", null);
writer.write("<br/>");
@@ -1065,9 +981,9 @@
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM); // Edit table
-
+
writer.endElement(HTML.DIV_ELEM);
-
+
// Cleanup expressions tool box
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox", null);
@@ -1102,7 +1018,7 @@
writer.endElement(HTML.BUTTON_ELEM);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
// Debug tool box
writer.startElement(HTML.DIV_ELEM, null);
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox", null);
@@ -1120,9 +1036,9 @@
writer.writeAttribute(HTML.CLASS_ATTR, "kupu-toolbox-label", null);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
writer.endElement(HTML.DIV_ELEM); // kupu-toolboxes
-
+
// Color Chooser
writer.startElement(HTML.TABLE_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, "kupu-colorchooser", null);
@@ -1130,7 +1046,7 @@
writer.writeAttribute(HTML.CELLSPACING_ATTR, "0", null);
writer.writeAttribute(HTML.STYLE_ATTR, "position: fixed; border-style: solid; border-color: black; border-width: 1px;", null);
writer.endElement(HTML.TABLE_ELEM);
-
+
// Edit space
writer.startElement(HTML.DIV_ELEM, null);
if( !editor.isShowAnyToolBox() ){
@@ -1158,16 +1074,16 @@
//writer.writeAttribute(HTML.STYLE_ATTR, "display: none", null);
writer.endElement(HTML.TEXTAREA_ELEM);
writer.endElement(HTML.DIV_ELEM);
-
+
writer.endElement(HTML.DIV_ELEM); // kupu-fulleditor
-
+
String text = editor.getValueAsHtmlDocument( context );
String encodedText = text == null ? "" : JavascriptUtils.encodeString( text );
-
+
AddResource.addJavaScriptToHeader(InputHtmlRenderer.class, "myFacesUtils.js", context);
-
+
String resourceBaseURL = AddResource.getResourceMappedPath(InputHtmlRenderer.class, "", context);
-
+
writer.startElement(HTML.SCRIPT_ELEM, null);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
writer.write("myFacesKupuSet(" +
@@ -1178,17 +1094,17 @@
");");
writer.endElement(HTML.SCRIPT_ELEM);
}
-
+
static private void writeTag(ResponseWriter writer, String tagName, String tagBody) throws IOException{
writer.startElement(tagName, null);
writer.writeText(tagBody, null);
writer.endElement(tagName);
}
-
+
static private void writeButton(ResponseWriter writer, String classAttr, String title, String accessKey) throws IOException{
writeButton(writer, classAttr, title, accessKey, classAttr+"-button");
}
-
+
static private void writeButton(ResponseWriter writer, String classAttr, String title, String accessKey, String id) throws IOException{
writeButton(writer, classAttr, title, accessKey, id, true);
}
@@ -1209,7 +1125,7 @@
writer.write(" ");
writer.endElement(HTML.BUTTON_ELEM);
}
-
+
static private void writeButton(ResponseWriter writer, String id, String text) throws IOException{
writer.startElement(HTML.BUTTON_ELEM, null);
writer.writeAttribute(HTML.TYPE_ATTR, "button", null);
@@ -1217,14 +1133,14 @@
writer.write(text);
writer.endElement(HTML.BUTTON_ELEM);
}
-
+
static private void writeOption(ResponseWriter writer, String value, String body) throws IOException{
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute(HTML.VALUE_ATTR, value, null);
writer.write(body);
writer.endElement(HTML.OPTION_ELEM);
}
-
+
static private void writeOption(ResponseWriter writer, String value, String translate, String body) throws IOException{
writer.startElement(HTML.OPTION_ELEM,null);
writer.writeAttribute("xmlns:i18n", "http://xml.zope.org/namespaces/i18n", null);
@@ -1256,7 +1172,7 @@
}
}
}
-
+
public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue) throws ConverterException {
RendererUtils.checkParamValidity(facesContext, uiComponent, InputHtml.class);
InputHtml editor = (InputHtml) uiComponent;
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlTag.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,66 +24,15 @@
/**
* @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.16 2005/03/22 02:13:28 svieujot
- * htmlEditor : Add a showAllToolBoxes short cut.
- *
- * Revision 1.15 2005/03/18 15:38:15 svieujot
- * Bugfix for weblogic.
- *
- * Revision 1.14 2005/03/15 05:24:03 svieujot
- * Add a fallback textarea mode to the htmlEditor.
- *
- * Revision 1.13 2005/03/09 04:07:22 svieujot
- * htmlEditor : Kupu 1.2rc2 update
- *
- * Revision 1.12 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.11 2005/02/06 19:45:32 svieujot
- * Add allowExternalLinks attribute.
- *
- * Revision 1.10 2005/02/05 18:51:21 svieujot
- * x:htmlEditor : Upgrade to Kupu 1.2rc1, remove formularMode (too experimental), bugfixes.
- *
- * Revision 1.9 2005/01/02 20:39:16 svieujot
- * HtmlEditor can now process HTML documents and HTML fragments.
- *
- * Revision 1.8 2004/12/10 02:16:26 svieujot
- * Start implementing UserRoleAware.
- *
- * Revision 1.7 2004/12/08 04:36:27 svieujot
- * Cancel last *source attributes, and make style and styleClass more modular.
- *
- * Revision 1.6 2004/12/08 04:13:56 svieujot
- * Add styleSource and styleClassSource for the htmlEditor source window.
- *
- * 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 InputHtmlTag extends UIComponentTagBase {
-
+
private String style;
private String styleClass;
private String fallback;
private String type;
-
+
private String allowEditSource;
private String allowExternalLinks;
private String addKupuLogo;
@@ -95,15 +44,15 @@
private String showTablesToolBox;
private String showCleanupExpressionsToolBox;
private String showDebugToolBox;
-
+
private String enabledOnUserRole;
private String visibleOnUserRole;
-
+
private String immediate;
private String required;
private String validator;
private String valueChangeListener;
-
+
public void release() {
super.release();
style=null;
@@ -113,7 +62,7 @@
allowEditSource=null;
allowExternalLinks=null;
addKupuLogo=null;
-
+
showAllToolBoxes=null;
showPropertiesToolBox=null;
showLinksToolBox=null;
@@ -123,26 +72,26 @@
showDebugToolBox=null;
enabledOnUserRole=null;
visibleOnUserRole=null;
-
+
immediate=null;
required=null;
validator=null;
valueChangeListener=null;
}
-
+
protected void setProperties(UIComponent component) {
super.setProperties(component);
-
+
setStringProperty(component, "style", style);
setStringProperty(component, "styleClass", styleClass);
-
+
setStringProperty(component, "fallback", fallback);
setBooleanProperty(component, "type", type);
-
+
setBooleanProperty(component, "allowEditSource", allowEditSource);
setBooleanProperty(component, "allowExternalLinks", allowExternalLinks);
setBooleanProperty(component, "addKupuLogo", addKupuLogo);
-
+
setBooleanProperty(component, "showAllToolBoxes", showAllToolBoxes);
setBooleanProperty(component, "showPropertiesToolBox", showPropertiesToolBox);
setBooleanProperty(component, "showLinksToolBox", showLinksToolBox);
@@ -150,16 +99,16 @@
setBooleanProperty(component, "showTablesToolBox", showTablesToolBox);
setBooleanProperty(component, "showCleanupExpressionsToolBox", showCleanupExpressionsToolBox);
setBooleanProperty(component, "showDebugToolBox", showDebugToolBox);
-
+
setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, enabledOnUserRole);
setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, visibleOnUserRole);
-
+
setBooleanProperty(component, JSFAttr.IMMEDIATE_ATTR, immediate);
setBooleanProperty(component, JSFAttr.REQUIRED_ATTR, required);
setValidatorProperty(component, validator);
setValueChangedListenerProperty(component, valueChangeListener);
}
-
+
public String getComponentType() {
return InputHtml.COMPONENT_TYPE;
}
@@ -171,11 +120,11 @@
public void setStyle(String style){
this.style = style;
}
-
+
public void setStyleClass(String styleClass){
this.styleClass = styleClass;
}
-
+
public void setFallback(String fallback){
this.fallback = fallback;
}
@@ -183,15 +132,15 @@
public void setType(String type){
this.type = type;
}
-
+
public void setAllowEditSource(String allowEditSource){
this.allowEditSource = allowEditSource;
}
-
+
public void setAllowExternalLinks(String allowExternalLinks){
this.allowExternalLinks = allowExternalLinks;
}
-
+
public void setAddKupuLogo(String addKupuLogo){
this.addKupuLogo = addKupuLogo;
}
@@ -203,27 +152,27 @@
public void setShowPropertiesToolBox(String showPropertiesToolBox){
this.showPropertiesToolBox = showPropertiesToolBox;
}
-
+
public void setShowLinksToolBox(String showLinksToolBox){
this.showLinksToolBox = showLinksToolBox;
}
-
+
public void setShowImagesToolBox(String showImagesToolBox){
this.showImagesToolBox = showImagesToolBox;
}
-
+
public void setShowTablesToolBox(String showTablesToolBox){
this.showTablesToolBox = showTablesToolBox;
}
-
+
public void setShowCleanupExpressionsToolBox(String showCleanupExpressionsToolBox){
this.showCleanupExpressionsToolBox = showCleanupExpressionsToolBox;
}
-
+
public void setShowDebugToolBox(String showDebugToolBox){
this.showDebugToolBox = showDebugToolBox;
}
-
+
public void setEnabledOnUserRole(String enabledOnUserRole){
this.enabledOnUserRole = enabledOnUserRole;
}
@@ -231,7 +180,7 @@
public void setVisibleOnUserRole(String visibleOnUserRole){
this.visibleOnUserRole = visibleOnUserRole;
}
-
+
public void setImmediate(String immediate){
this.immediate = immediate;
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.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,20 +26,10 @@
/**
* @author <a href="mailto:matzew@apache.org">Matthias We�endorf</a> (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/11/30 09:37:42 matzew
- * changes i18n-messages for validation
- *
- * Revision 1.2 2004/11/23 04:59:24 svieujot
- * Remove "unmappable character for encoding UTF8" warning.
- *
- * Revision 1.1 2004/11/20 20:17:05 matzew
- * added new validator for ISBN codes
- *
*/
public class ISBNValidator implements Validator {
-
+
/**
* <p>The standard converter id for this converter.</p>
*/
@@ -48,28 +38,28 @@
* <p>The message identifier of the {@link FacesMessage} to be created if
* the maximum length check fails.</p>
*/
- public static final String ISBN_MESSAGE_ID = "org.apache.myfaces.ISBN.INVALID";
-
+ public static final String ISBN_MESSAGE_ID = "org.apache.myfaces.ISBN.INVALID";
+
/**
* <p>isbnValidator</p>
*/
private org.apache.commons.validator.ISBNValidator isbnValidator;
-
+
public ISBNValidator(){
isbnValidator = new org.apache.commons.validator.ISBNValidator();
}
/**
* methode that validates isbn codes.
- * 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");
@@ -80,7 +70,7 @@
if (!isbnValidator.isValid( value.toString())) {
Object[] args = {value.toString()};
throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,ISBN_MESSAGE_ID, args));
-
+
}
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ValidateISBNTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ValidateISBNTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ValidateISBNTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/isbnvalidator/ValidateISBNTag.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,25 +24,18 @@
/**
* @author <a href="mailto:matzew@apache.org">Matthias We�endorf</a> (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/11/23 04:59:23 svieujot
- * Remove "unmappable character for encoding UTF8" warning.
- *
- * Revision 1.1 2004/11/20 20:17:05 matzew
- * added new validator for ISBN codes
- *
*/
public class ValidateISBNTag extends ValidatorTag{
-
+
public ValidateISBNTag(){}
-
+
protected Validator createValidator() throws JspException
{
setValidatorId(ISBNValidator.VALIDATOR_ID);
ISBNValidator validator = (ISBNValidator)super.createValidator();
return validator;
}
-
+
public void release()
{
super.release();
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java Wed May 11 08:47:12 2005
@@ -10,13 +10,6 @@
/**
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2005/01/04 16:09:57 mmarinschek
- * ChangeListener now uses renderer
- *
- * Revision 1.1 2004/12/17 13:19:10 mmarinschek
- * new component jsValueChangeListener
- *
*/
public class JsValueChangeListener extends UIOutput
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java Wed May 11 08:47:12 2005
@@ -22,14 +22,6 @@
import java.util.Map;
/**
- * $Log$
- * Revision 1.1 2005/01/04 16:09:57 mmarinschek
- * ChangeListener now uses renderer
- *
- * Revision 1.1 2004/12/19 00:50:55 mmarinschek
- * JsValueSetTag
- *
- *
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
*/
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java Wed May 11 08:47:12 2005
@@ -22,23 +22,6 @@
/**
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2005/02/18 17:19:30 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.4 2005/01/04 16:09:57 mmarinschek
- * ChangeListener now uses renderer
- *
- * Revision 1.3 2004/12/20 06:33:51 mmarinschek
- * bugs killed
- *
- * Revision 1.2 2004/12/19 00:50:55 mmarinschek
- * JsValueSetTag
- *
- * Revision 1.1 2004/12/17 13:19:10 mmarinschek
- * new component jsValueChangeListener
- *
- *
*/
public class JsValueChangeListenerTag
extends UIComponentTagBase
@@ -57,7 +40,7 @@
private String _for;
private String _property;
private String _expressionValue;
-
+
public void release() {
super.release();
_for=null;
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java Wed May 11 08:47:12 2005
@@ -12,11 +12,6 @@
/**
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/19 00:50:55 mmarinschek
- * JsValueSetTag
- *
- *
*/
public class HtmlJsValueSet extends UIOutput
{
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.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,17 +29,6 @@
import java.util.Map;
/**
- * $Log$
- * Revision 1.3 2005/03/12 02:15:18 mmarinschek
- * jsvalueset now supports maps of maps; ui component logging enhanced
- *
- * Revision 1.2 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.1 2004/12/19 00:50:55 mmarinschek
- * JsValueSetTag
- *
- *
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
*/
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java Wed May 11 08:47:12 2005
@@ -10,20 +10,6 @@
/**
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2005/02/18 17:19:31 matzew
- * added release() to tag clazzes.
- *
- * Revision 1.2 2005/01/04 16:09:57 mmarinschek
- * ChangeListener now uses renderer
- *
- * Revision 1.1 2004/12/19 00:50:55 mmarinschek
- * JsValueSetTag
- *
- * Revision 1.1 2004/12/17 13:19:10 mmarinschek
- * new component jsValueChangeListener
- *
- *
*/
public class HtmlJsValueSetTag
extends UIComponentTagBase
@@ -50,7 +36,7 @@
// HtmlJsValueSet attributes
private String _name;
-
+
public void release() {
super.release();
_name=null;
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.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:53 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.2 2004/04/01 12:57:40 manolito
- * additional extended component classes for user role support
- *
- * Revision 1.1 2004/03/31 12:15:26 manolito
- * custom component refactoring
- *
*/
public class HtmlPanelLayoutTag
extends HtmlComponentBodyTagBase
@@ -97,7 +75,7 @@
private String _enabledOnUserRole;
private String _visibleOnUserRole;
-
+
public void release() {
super.release();
_layout=null;
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlCommandNavigationTag.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlCommandNavigationTag.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlCommandNavigationTag.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlCommandNavigationTag.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.
@@ -21,19 +21,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.4 2004/07/01 21:53:08 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/04/05 11:04:53 manolito
- * setter for renderer type removed, no more default renderer type needed
- *
- * Revision 1.2 2004/04/01 12:57:40 manolito
- * additional extended component classes for user role support
- *
*/
public class HtmlCommandNavigationTag
extends HtmlCommandLinkTag
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.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.
@@ -33,19 +33,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.5 2005/02/16 00:50:37 oros
- * SF issue #1043331: replaced all by the corresponding numeric entity   so safari users will be happy, too, with MyFaces output
- *
- * Revision 1.4 2004/10/13 11:50:57 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/01 21:53:08 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/05/18 17:08:21 manolito
- * no message
- *
*/
public class HtmlNavigationRenderer
extends HtmlLinkRenderer
Modified: myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ApplicationMapTest.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ApplicationMapTest.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ApplicationMapTest.java (original)
+++ myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ApplicationMapTest.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,49 +27,34 @@
/**
* Test for AbstractAttributeMap core functionality through ApplicationMap.
- *
+ *
* @author Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * $Log$
- * Revision 1.6 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.5 2004/07/01 22:01:09 mwessendorf
- * ASF switch
- *
- * Revision 1.4 2004/04/02 13:57:18 bdudney
- * cleaned up the tests so they all run and added
-execution to the build.xml file.
- *
- * Revision 1.3 2004/03/30 05:38:50 dave0000
- * add copyright statement
- *
*/
public class ApplicationMapTest extends MyFacesBaseTest
{
private Object _test0 = new Object();
private Object _test1 = new Object();
-
+
public ApplicationMapTest(String name)
{
super(name);
}
-
+
private void init()
{
Map appMap = _facesContext.getExternalContext().getApplicationMap();
-
+
appMap.clear();
assertTrue(appMap.isEmpty());
assertEquals(0, appMap.size());
-
+
assertNull(appMap.put("test1", _test1));
assertFalse(appMap.isEmpty());
assertEquals(1, appMap.size());
-
+
Object test2 = new Object();
assertNull(appMap.put("test2", test2));
@@ -83,7 +68,7 @@
assertSame(_test1, appMap.put("test1", test2));
assertSame(test2, appMap.put("test1", _test1));
-
+
assertEquals(4, appMap.size());
assertSame(test4, appMap.remove("test4"));
@@ -91,15 +76,15 @@
assertNull(appMap.put("test4", test4));
assertEquals(4, appMap.size());
}
-
+
public void testClear()
{
// Map
init();
Map appMap = _facesContext.getExternalContext().getApplicationMap();
-
+
assertFalse(appMap.isEmpty());
-
+
appMap.clear();
assertTrue(appMap.isEmpty());
@@ -108,9 +93,9 @@
// EntrySet
init();
Set entrySet = appMap.entrySet();
-
+
assertFalse(entrySet.isEmpty());
-
+
entrySet.clear();
assertTrue(appMap.isEmpty());
@@ -121,9 +106,9 @@
// KeySet
init();
Set keySet = appMap.keySet();
-
+
assertFalse(keySet.isEmpty());
-
+
keySet.clear();
assertTrue(appMap.isEmpty());
@@ -134,9 +119,9 @@
// Values
init();
Collection values = appMap.values();
-
+
assertFalse(values.isEmpty());
-
+
values.clear();
assertTrue(appMap.isEmpty());
@@ -150,7 +135,7 @@
init();
Map appMap = _facesContext.getExternalContext().getApplicationMap();
Map cache = new HashMap();
-
+
for (Iterator it = appMap.entrySet().iterator(); it.hasNext();)
{
Entry entry = (Entry) it.next();
@@ -162,14 +147,14 @@
Entry entry = (Entry) it.next();
assertSame(entry.getValue(), cache.put(entry.getKey(), entry.getValue()));
}
-
+
assertSame(_test1, cache.get("test1"));
int size = appMap.size();
-
+
assertNull(appMap.put("test0", _test0));
assertEquals(size + 1, appMap.size());
-
+
findTest0: {
for (Iterator it = appMap.entrySet().iterator(); it.hasNext();)
{
@@ -187,7 +172,7 @@
}
throw new IllegalStateException("Test0 not found");
}
-
+
for (Iterator it = appMap.entrySet().iterator(); it.hasNext();)
{
// Only one remove() will succeed
@@ -205,7 +190,7 @@
init();
Map appMap = _facesContext.getExternalContext().getApplicationMap();
Map cache = new HashMap();
-
+
for (Iterator it = appMap.keySet().iterator(); it.hasNext();)
{
String key = (String) it.next();
@@ -221,10 +206,10 @@
assertSame(_test1, cache.get("test1"));
int size = appMap.size();
-
+
assertNull(appMap.put("test0", _test0));
assertEquals(size + 1, appMap.size());
-
+
findTest0: {
for (Iterator it = appMap.keySet().iterator(); it.hasNext();)
{
@@ -242,7 +227,7 @@
}
throw new IllegalStateException("Test0 not found");
}
-
+
for (Iterator it = appMap.entrySet().iterator(); it.hasNext();)
{
// Only one remove() will succeed
@@ -260,7 +245,7 @@
init();
Map appMap = _facesContext.getExternalContext().getApplicationMap();
Set cache = new HashSet();
-
+
for (Iterator it = appMap.values().iterator(); it.hasNext();)
{
assertTrue(cache.add(it.next()));
@@ -272,12 +257,12 @@
}
assertTrue(cache.contains(_test1));
-
+
int size = appMap.size();
-
+
assertNull(appMap.put("test0", _test0));
assertEquals(size + 1, appMap.size());
-
+
findTest0: {
for (Iterator it = appMap.values().iterator(); it.hasNext();)
{
@@ -295,7 +280,7 @@
}
throw new IllegalStateException("Test0 not found");
}
-
+
for (Iterator it = appMap.entrySet().iterator(); it.hasNext();)
{
// Only one remove() will succeed
Modified: myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletFacesContextImplTest.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletFacesContextImplTest.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletFacesContextImplTest.java (original)
+++ myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletFacesContextImplTest.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,16 +24,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:09 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/04/16 13:57:00 manolito
- * Bug #922317 - ClassCastException in action handler after adding message
- *
*/
public class ServletFacesContextImplTest
extends MyFacesBaseTest
Modified: myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletSessionMock.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletSessionMock.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletSessionMock.java (original)
+++ myfaces/trunk/src/junit/org/apache/myfaces/context/servlet/ServletSessionMock.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,16 +27,6 @@
/**
* @author Anton Koinov (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:00:57 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/10 05:30:15 dave0000
- * Fix issue with setting Managed Bean to a wrong scope
- *
*/
public class ServletSessionMock implements HttpSession
{
@@ -75,7 +65,7 @@
public void setMaxInactiveInterval(int arg0)
{
// FIXME Auto-generated method stub
-
+
}
public int getMaxInactiveInterval()
@@ -121,25 +111,25 @@
public void putValue(String arg0, Object arg1)
{
// FIXME Auto-generated method stub
-
+
}
public void removeAttribute(String arg0)
{
// FIXME Auto-generated method stub
-
+
}
public void removeValue(String arg0)
{
// FIXME Auto-generated method stub
-
+
}
public void invalidate()
{
// FIXME Auto-generated method stub
-
+
}
public boolean isNew()
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigDispenser.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigDispenser.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigDispenser.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigDispenser.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,30 +25,6 @@
*
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 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.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:05 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.3 2004/07/01 22:05:09 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/06/16 23:02:23 o_rossmueller
- * merged confignew_branch
- *
- * Revision 1.1.2.1 2004/06/16 01:25:52 o_rossmueller
- * refactorings: FactoryFinder, decorator creation, dispenser (removed reverse order)
- * bug fixes
- * additional tests
- *
- * Revision 1.1 2004/05/17 14:28:27 manolito
- * new configuration concept
- *
*/
public interface FacesConfigDispenser
{
@@ -186,7 +162,7 @@
/**
- * @return Iterator over {@link javax.faces.event.PhaseListener} implementation class names
+ * @return Iterator over {@link javax.faces.event.PhaseListener} implementation class names
*/
public Iterator getLifecyclePhaseListeners();
}
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigUnmarshaller.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigUnmarshaller.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigUnmarshaller.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigUnmarshaller.java Wed May 11 08:47:12 2005
@@ -1,13 +1,13 @@
/*
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,22 +27,6 @@
*
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:05 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.3 2004/07/01 22:05:09 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/06/04 23:51:48 o_rossmueller
- * Digester-based config parser/dispenser
- *
- * Revision 1.1 2004/05/17 14:28:27 manolito
- * new configuration concept
- *
*/
public interface FacesConfigUnmarshaller
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigurator.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/FacesConfigurator.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.
@@ -78,75 +78,6 @@
*
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.11 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.10 2005/01/26 17:03:11 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
- * Revision 1.9 2004/12/13 22:20:34 oros
- * fix #1046763: close temporary jar file before trying to delete it
- *
- * Revision 1.8 2004/11/11 22:46:35 bdudney
- * added some error reporting
- *
- * Revision 1.7 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.6 2004/08/23 05:13:39 dave0000
- * Externalize String-to-Locale conversion
- *
- * Revision 1.5 2004/08/10 10:57:38 manolito
- * fixed StackOverflow in ClassUtils and cleaned up ClassUtils methods
- *
- * Revision 1.4 2004/07/20 14:56:41 manolito
- * removed public FactoryFinder method getValidFactoryNames - there is no such method in JSF 1.1 !
- *
- * Revision 1.3 2004/07/13 06:42:43 tinytoony
- * does not break if converter-class has not been found, instead logs as error.
- *
- * Revision 1.2 2004/07/07 08:34:58 mwessendorf
- * removed unused import-statements
- *
- * Revision 1.1 2004/07/07 00:25:05 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.7 2004/07/06 23:21:19 o_rossmueller
- * fix #985217: decoration support for factories
- *
- * Revision 1.6 2004/07/01 22:05:09 mwessendorf
- * ASF switch
- *
- * Revision 1.5 2004/06/17 23:23:48 o_rossmueller
- * fix: entity resolver
- *
- * Revision 1.4 2004/06/16 23:02:24 o_rossmueller
- * merged confignew_branch
- *
- * Revision 1.3.2.3 2004/06/16 01:25:52 o_rossmueller
- * refactorings: FactoryFinder, decorator creation, dispenser (removed reverse order)
- * bug fixes
- * additional tests
- *
- * Revision 1.3.2.2 2004/06/15 11:54:22 o_rossmueller
- * fixed decorator pattern support
- * <p/>
- * Revision 1.3.2.1 2004/06/13 15:59:07 o_rossmueller
- * started integration of new config mechanism:
- * - factories
- * - components
- * - render kits
- * - managed beans + managed properties (no list/map initialization)
- * <p/>
- * Revision 1.3 2004/06/08 20:50:09 o_rossmueller
- * completed configurator
- * <p/>
- * Revision 1.2 2004/06/04 23:51:48 o_rossmueller
- * Digester-based config parser/dispenser
- * <p/>
- * Revision 1.1 2004/05/17 14:28:28 manolito
- * new configuration concept
*/
public class FacesConfigurator
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/ManagedBeanBuilder.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/ManagedBeanBuilder.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.
@@ -32,23 +32,6 @@
*
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a> (latest modification by $Author$)
* @author Anton Koinov
- *
- * $Log$
- * Revision 1.5 2005/01/05 16:22:57 bdudney
- * added fail early code so that if you specify a non-existent property in the managed-bean stuff it will fail early instead of a lame error message that leads down a rabit trail.
- *
- * Revision 1.4 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/10/05 22:34:22 dave0000
- * bug 1021656 with related improvements
- *
- * Revision 1.2 2004/08/10 10:57:38 manolito
- * fixed StackOverflow in ClassUtils and cleaned up ClassUtils methods
- *
- * Revision 1.1 2004/07/07 00:25:05 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
*/
public class ManagedBeanBuilder
{
@@ -130,7 +113,7 @@
value = property.getRuntimeValue(facesContext);
break;
}
- PropertyResolver propertyResolver =
+ PropertyResolver propertyResolver =
facesContext.getApplication().getPropertyResolver();
Class propertyClass = null;
@@ -157,9 +140,9 @@
private void initializeMap(FacesContext facesContext, MapEntries mapEntries, Map map)
{
Application application = facesContext.getApplication();
- Class keyClass = (mapEntries.getKeyClass() == null)
+ Class keyClass = (mapEntries.getKeyClass() == null)
? String.class : ClassUtils.simpleJavaTypeToClass(mapEntries.getKeyClass());
- Class valueClass = (mapEntries.getValueClass() == null)
+ Class valueClass = (mapEntries.getValueClass() == null)
? String.class : ClassUtils.simpleJavaTypeToClass(mapEntries.getValueClass());
ValueBinding valueBinding;
@@ -177,7 +160,7 @@
if (entry.isNullValue())
{
map.put(ClassUtils.convertToType(key, keyClass), null);
- }
+ }
else
{
Object value = entry.getValue();
@@ -204,7 +187,7 @@
if (entry.isNullValue())
{
list.add(null);
- }
+ }
else
{
Object value = entry.getValue();