richfaces-svn-commits July 2007

richfaces-svn-commits@lists.jboss.org

1 participants
535 discussions

JBoss Rich Faces SVN: r1465 - branches/3.0.2/richfaces/dataTable/src/main/config/component.

by richfaces-svn-commits＠lists.jboss.org

Author: vkorluzhenko Date: 2007-07-04 10:48:13 -0400 (Wed, 04 Jul 2007) New Revision: 1465 Modified: branches/3.0.2/richfaces/dataTable/src/main/config/component/dataGrid.xml branches/3.0.2/richfaces/dataTable/src/main/config/component/dataList.xml branches/3.0.2/richfaces/dataTable/src/main/config/component/dataTable.xml branches/3.0.2/richfaces/dataTable/src/main/config/component/subTable.xml Log: http://jira.jboss.org/jira/browse/RF-410 Modified: branches/3.0.2/richfaces/dataTable/src/main/config/component/dataGrid.xml =================================================================== --- branches/3.0.2/richfaces/dataTable/src/main/config/component/dataGrid.xml 2007-07-04 14:40:56 UTC (rev 1464) +++ branches/3.0.2/richfaces/dataTable/src/main/config/component/dataGrid.xml 2007-07-04 14:48:13 UTC (rev 1465) @@ -38,7 +38,7 @@ <property> <name>ajaxKeys</name> <classname>java.lang.String</classname> - <description>This attribute defines strings that are updated after an AJAX request</description> + <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property> <name>elements</name> Modified: branches/3.0.2/richfaces/dataTable/src/main/config/component/dataList.xml =================================================================== --- branches/3.0.2/richfaces/dataTable/src/main/config/component/dataList.xml 2007-07-04 14:40:56 UTC (rev 1464) +++ branches/3.0.2/richfaces/dataTable/src/main/config/component/dataList.xml 2007-07-04 14:48:13 UTC (rev 1465) @@ -40,7 +40,7 @@ <property> <name>ajaxKeys</name> <classname>java.lang.String</classname> - <description>This attribute defines strings that are updated after an AJAX request</description> + <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property> <name>rowKey</name> @@ -118,7 +118,7 @@ <property> <name>ajaxKeys</name> <classname>java.lang.String</classname> - <description>This attribute defines strings that are updated after an AJAX request</description> + <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property> <name>rowKey</name> @@ -202,7 +202,7 @@ <property> <name>ajaxKeys</name> <classname>java.lang.String</classname> - <description>This attribute defines strings that are updated after an AJAX request</description> + <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property> <name>rowKey</name> Modified: branches/3.0.2/richfaces/dataTable/src/main/config/component/dataTable.xml =================================================================== --- branches/3.0.2/richfaces/dataTable/src/main/config/component/dataTable.xml 2007-07-04 14:40:56 UTC (rev 1464) +++ branches/3.0.2/richfaces/dataTable/src/main/config/component/dataTable.xml 2007-07-04 14:48:13 UTC (rev 1465) @@ -35,7 +35,7 @@ <property> <name>ajaxKeys</name> <classname>java.lang.String</classname> - <description>This attribute defines strings that are updated after an AJAX request</description> + <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property> <name>columns</name> Modified: branches/3.0.2/richfaces/dataTable/src/main/config/component/subTable.xml =================================================================== --- branches/3.0.2/richfaces/dataTable/src/main/config/component/subTable.xml 2007-07-04 14:40:56 UTC (rev 1464) +++ branches/3.0.2/richfaces/dataTable/src/main/config/component/subTable.xml 2007-07-04 14:48:13 UTC (rev 1465) @@ -34,7 +34,7 @@ <property> <name>ajaxKeys</name> <classname>java.lang.String</classname> - <description>This attribute defines strings that are updated after an AJAX request</description> + <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property disabled="true" hidden="true"> <name>breakBefore</name>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1464 - in branches/3.0.2/richfaces/modal-panel/src/main: java/org/richfaces/component and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-07-04 10:40:56 -0400 (Wed, 04 Jul 2007) New Revision: 1464 Modified: branches/3.0.2/richfaces/modal-panel/src/main/config/component/modalPanel.xml branches/3.0.2/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java branches/3.0.2/richfaces/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java branches/3.0.2/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js branches/3.0.2/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx Log: http://jira.jboss.com/jira/browse/RF-69 Modified: branches/3.0.2/richfaces/modal-panel/src/main/config/component/modalPanel.xml =================================================================== --- branches/3.0.2/richfaces/modal-panel/src/main/config/component/modalPanel.xml 2007-07-04 13:13:57 UTC (rev 1463) +++ branches/3.0.2/richfaces/modal-panel/src/main/config/component/modalPanel.xml 2007-07-04 14:40:56 UTC (rev 1464) @@ -1,173 +1,187 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > -<components> - <component> - <name>org.richfaces.ModalPanel</name> - <family>org.richfaces.ModalPanel</family> - <classname>org.richfaces.component.html.HtmlModalPanel</classname> - <superclass>org.richfaces.component.UIModalPanel</superclass> - <test> - <classname>org.richfaces.component.html.HtmlModalPanelComponentTest</classname> - <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> - </test> - <description> - <![CDATA[ - ]]> - </description> - <renderer generate="true" override="true"> - <name>org.richfaces.ModalPanelRenderer</name> - <template>org/richfaces/htmlModalPanel.jspx</template> - </renderer> - <tag> - <name>modalPanel</name> - <classname>org.richfaces.taglib.ModalPanelTag</classname> - <superclass> - org.ajax4jsf.framework.taglib.HtmlComponentTagBase - </superclass> - </tag> -  - &ui_component_attributes; -  - - <property> - <name>headerClass</name> - <classname>java.lang.String</classname> - <description>CSS style(s) is/are to be applied to component header when this component is rendered - </description> - <defaultvalue>""</defaultvalue> - </property> - - <property> - <name>controlsClass</name> - <classname>java.lang.String</classname> - <description>CSS style(s) is/are to be applied to component controls when this component is rendered - </description> - <defaultvalue>""</defaultvalue> - </property> - - <property> - <name>width</name> - <classname>int</classname> - <description> - Attribute defines width of component - </description> - <defaultvalue>300</defaultvalue> - </property> - <property> - <name>height</name> - <classname>int</classname> - <description>Attribute defines height of component - </description> - <defaultvalue>200</defaultvalue> - </property> - - <property> - <name>minWidth</name> - <classname>int</classname> - <description> - Attribute defines min width of component - </description> - <defaultvalue>-1</defaultvalue> - </property> - <property> - <name>minHeight</name> - <classname>int</classname> - <description> - Attribute defines min height of component - </description> - <defaultvalue>-1</defaultvalue> - </property> - - <property> - <name>left</name> - <classname>java.lang.String</classname> - <description> - Attribute defines X position of component left-top corner - </description> - <defaultvalue>"auto"</defaultvalue> - </property> - <property> - <name>top</name> - <classname>java.lang.String</classname> - <description> - Attribute defines Y position of component left-top corner - </description> - <defaultvalue>"auto"</defaultvalue> - </property> - - <property> - <name>resizeable</name> - <classname>boolean</classname> - <description> - if "true" there is possibility to change component size - </description> - <defaultvalue>true</defaultvalue> - </property> - <property> - <name>moveable</name> - <classname>boolean</classname> - <description> - if "true" there is possibility to move component - </description> - <defaultvalue>true</defaultvalue> - </property> - - <property> - <name>zindex</name> - <classname>int</classname> - <description> - Attribute is similar to the standard HTML attribute and can specify window placement relative to the content - </description> - <defaultvalue>100</defaultvalue> - </property> - - <property> - <name>shadowOpacity</name> - <classname>java.lang.String</classname> - <description> - HTML CSS class attribute of element for pop-up - suggestion content - </description> - </property> - - <property> - <name>shadowDepth</name> - <classname>java.lang.String</classname> - <description> - Pop-up shadow depth for suggestion content - </description> - </property> - - <property> - <name>onshow</name> - <classname>java.lang.String</classname> - <description> - Event must occurs after panel opened - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> - - <property> - <name>onhide</name> - <classname>java.lang.String</classname> - <description> - Event must occurs after panel closed - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> - - - </component> -</components> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > +<components> + <component> + <name>org.richfaces.ModalPanel</name> + <family>org.richfaces.ModalPanel</family> + <classname>org.richfaces.component.html.HtmlModalPanel</classname> + <superclass>org.richfaces.component.UIModalPanel</superclass> + <test> + <classname>org.richfaces.component.html.HtmlModalPanelComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> + <description> + <![CDATA[ + ]]> + </description> + <renderer generate="true" override="true"> + <name>org.richfaces.ModalPanelRenderer</name> + <template>org/richfaces/htmlModalPanel.jspx</template> + </renderer> + <tag> + <name>modalPanel</name> + <classname>org.richfaces.taglib.ModalPanelTag</classname> + <superclass> + org.ajax4jsf.framework.taglib.HtmlComponentTagBase + </superclass> + </tag> +  + &ui_component_attributes; +  + + <property> + <name>headerClass</name> + <classname>java.lang.String</classname> + <description>CSS style(s) is/are to be applied to component header when this component is rendered + </description> + <defaultvalue>""</defaultvalue> + </property> + + <property> + <name>controlsClass</name> + <classname>java.lang.String</classname> + <description>CSS style(s) is/are to be applied to component controls when this component is rendered + </description> + <defaultvalue>""</defaultvalue> + </property> + + <property> + <name>width</name> + <classname>int</classname> + <description> + Attribute defines width of component + </description> + <defaultvalue>300</defaultvalue> + </property> + <property> + <name>height</name> + <classname>int</classname> + <description>Attribute defines height of component + </description> + <defaultvalue>200</defaultvalue> + </property> + + <property> + <name>minWidth</name> + <classname>int</classname> + <description> + Attribute defines min width of component + </description> + <defaultvalue>-1</defaultvalue> + </property> + <property> + <name>minHeight</name> + <classname>int</classname> + <description> + Attribute defines min height of component + </description> + <defaultvalue>-1</defaultvalue> + </property> + + <property> + <name>left</name> + <classname>java.lang.String</classname> + <description> + Attribute defines X position of component left-top corner + </description> + <defaultvalue>"auto"</defaultvalue> + </property> + <property> + <name>top</name> + <classname>java.lang.String</classname> + <description> + Attribute defines Y position of component left-top corner + </description> + <defaultvalue>"auto"</defaultvalue> + </property> + + <property> + <name>resizeable</name> + <classname>boolean</classname> + <description> + if "true" there is possibility to change component size + </description> + <defaultvalue>true</defaultvalue> + </property> + <property> + <name>moveable</name> + <classname>boolean</classname> + <description> + if "true" there is possibility to move component + </description> + <defaultvalue>true</defaultvalue> + </property> + + <property> + <name>zindex</name> + <classname>int</classname> + <description> + Attribute is similar to the standard HTML attribute and can specify window placement relative to the content + </description> + <defaultvalue>100</defaultvalue> + </property> + + <property> + <name>shadowOpacity</name> + <classname>java.lang.String</classname> + <description> + HTML CSS class attribute of element for pop-up + suggestion content + </description> + </property> + + <property> + <name>shadowDepth</name> + <classname>java.lang.String</classname> + <description> + Pop-up shadow depth for suggestion content + </description> + </property> + + <property> + <name>onshow</name> + <classname>java.lang.String</classname> + <description> + Event must occurs after panel opened + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> + + <property> + <name>onhide</name> + <classname>java.lang.String</classname> + <description> + Event must occurs after panel closed + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> + <property> + <name>showWhenRendered</name> + <classname>boolean</classname> + <description> + iA "true" value for this attribute makes a modal panel opened as default. + </description> + <defaultvalue>false</defaultvalue> + </property> + <property> + <name>keepState</name> + <classname>boolean</classname> + <description> + </description> + <defaultvalue>false</defaultvalue> + </property> + + </component> +</components> Modified: branches/3.0.2/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java =================================================================== --- branches/3.0.2/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-07-04 13:13:57 UTC (rev 1463) +++ branches/3.0.2/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-07-04 14:40:56 UTC (rev 1464) @@ -1,108 +1,114 @@ -/** - * License Agreement. - * - * JBoss RichFaces 3.0 - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.component; - -import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; - -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; - -/** - * JSF component class - * - */ -public abstract class UIModalPanel extends UIComponentBase { - - public static final String COMPONENT_TYPE = "org.richfaces.ModalPanel"; - - private static final String COMPONENT_FAMILY = "org.richfaces.ModalPanel"; - - /** - * Shadow depth. - */ - private static final int SHADOW_DEPTH = 4; - - public abstract int getWidth(); - public abstract int getHeight(); - - public abstract void setWidth(int width); - public abstract void setHeight(int height); - - public abstract int getMinWidth(); - public abstract int getMinHeight(); - - public abstract void setMinWidth(int width); - public abstract void setMinHeight(int height); - - public abstract boolean isResizeable(); - public abstract boolean isMoveable(); - - public abstract void setResizeable(boolean resizeable); - public abstract void setMoveable(boolean moveable); - - public abstract String getLeft(); - public abstract String getTop(); - - public abstract void setLeft(String left); - public abstract void setTop(String top); - - public abstract int getZindex(); - public abstract void setZindex(int zindex); - - public boolean getRendersChildren() { - return true; - } - - public String getShadowStyle() { - String shadow = (String) getAttributes().get("shadowDepth"); - if (shadow == null) { - shadow = Integer.toString(SHADOW_DEPTH); - } - - String shadowStyle = "top: " + shadow + "; left: " + shadow + ";"; - - FacesContext context = FacesContext.getCurrentInstance(); - if (null == context) - return shadowStyle; - - String opacity = (String) getAttributes().get("shadowOpacity"); - String filterOpacity; - - if (null == opacity) { - Skin skin = SkinFactory.getInstance().getSkin(context); - opacity = (String) skin.getParameter(context, "shadowOpacity"); - } - try { - Double op = Double.valueOf(opacity); - filterOpacity = Integer.toString(op.intValue() * 10); - opacity = Double.toString(op.doubleValue() / 10); - } catch (Exception e) { - // illegal opacity - return ";"; - } - shadowStyle += " opacity:" + opacity - + "; filter:alpha(opacity=" + filterOpacity + ");"; - - return shadowStyle; - } -} +/** + * License Agreement. + * + * JBoss RichFaces 3.0 - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.component; + +import javax.faces.component.UIComponentBase; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.framework.skin.Skin; +import org.ajax4jsf.framework.skin.SkinFactory; + +/** + * JSF component class + * + */ +public abstract class UIModalPanel extends UIComponentBase { + + public static final String COMPONENT_TYPE = "org.richfaces.ModalPanel"; + + private static final String COMPONENT_FAMILY = "org.richfaces.ModalPanel"; + + /** + * Shadow depth. + */ + private static final int SHADOW_DEPTH = 4; + + public abstract int getWidth(); + public abstract int getHeight(); + + public abstract void setWidth(int width); + public abstract void setHeight(int height); + + public abstract int getMinWidth(); + public abstract int getMinHeight(); + + public abstract void setMinWidth(int width); + public abstract void setMinHeight(int height); + + public abstract boolean isResizeable(); + public abstract boolean isMoveable(); + + public abstract void setResizeable(boolean resizeable); + public abstract void setMoveable(boolean moveable); + + public abstract String getLeft(); + public abstract String getTop(); + + public abstract void setLeft(String left); + public abstract void setTop(String top); + + public abstract int getZindex(); + public abstract void setZindex(int zindex); + + public abstract boolean isShowWhenRendered(); + public abstract void setShowWhenRendered(boolean opened); + + public abstract boolean isKeepState(); + public abstract void setKeepState(boolean keepState); + + public boolean getRendersChildren() { + return true; + } + + public String getShadowStyle() { + String shadow = (String) getAttributes().get("shadowDepth"); + if (shadow == null) { + shadow = Integer.toString(SHADOW_DEPTH); + } + + String shadowStyle = "top: " + shadow + "; left: " + shadow + ";"; + + FacesContext context = FacesContext.getCurrentInstance(); + if (null == context) + return shadowStyle; + + String opacity = (String) getAttributes().get("shadowOpacity"); + String filterOpacity; + + if (null == opacity) { + Skin skin = SkinFactory.getInstance().getSkin(context); + opacity = (String) skin.getParameter(context, "shadowOpacity"); + } + try { + Double op = Double.valueOf(opacity); + filterOpacity = Integer.toString(op.intValue() * 10); + opacity = Double.toString(op.doubleValue() / 10); + } catch (Exception e) { + // illegal opacity + return ";"; + } + shadowStyle += " opacity:" + opacity + + "; filter:alpha(opacity=" + filterOpacity + ");"; + + return shadowStyle; + } +} Modified: branches/3.0.2/richfaces/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java =================================================================== --- branches/3.0.2/richfaces/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-07-04 13:13:57 UTC (rev 1463) +++ branches/3.0.2/richfaces/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-07-04 14:40:56 UTC (rev 1464) @@ -22,7 +22,11 @@ package org.richfaces.renderkit; import java.io.IOException; +import java.util.Map; +import javax.faces.component.UIComponent; +import javax.faces.component.UIPanel; +import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.servlet.ServletContext; @@ -97,6 +101,33 @@ return true; } + public String getShowScript(FacesContext context, UIModalPanel panel) { + StringBuffer result = new StringBuffer(); + + ExternalContext exCtx = context.getExternalContext(); + Map rqMap = exCtx.getRequestParameterMap(); + Object clnId = rqMap.get(panel.getClientId(context) + "OpenedState"); + + if (panel.isKeepState()) { + if (null != clnId) { + boolean opened = new Boolean((String) clnId).booleanValue(); + panel.setShowWhenRendered(opened); + if (opened) { + result.append("Richfaces.showModalPanel('" + panel.getClientId(context) + "');"); + } + } else { + if (panel.isShowWhenRendered()) { + result.append("Richfaces.showModalPanel('" + panel.getClientId(context) + "');"); + } + } + } else { + if (null == clnId && panel.isShowWhenRendered()) { + result.append("Richfaces.showModalPanel('" + panel.getClientId(context) + "');"); + } + } + return result.toString(); + } + // public static String getOptions(FacesContext context, UIComponent component, RendererUtils utils) { // Map options = new HashMap(); // Modified: branches/3.0.2/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js =================================================================== --- branches/3.0.2/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-07-04 13:13:57 UTC (rev 1463) +++ branches/3.0.2/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-07-04 14:40:56 UTC (rev 1464) @@ -1,718 +1,742 @@ -if (!window.DW) { - window.DW = {}; -} - -if (!window.Richfaces) { - window.Richfaces = {}; -} - -sizeA = 4; -sizeB = 40; - -ModalPanel = Class.create(); - -{ - var searchString = "MSIE"; - var agent = navigator.userAgent; - var idx = agent.indexOf(searchString); - if (idx != -1) { - var versIdx = agent.indexOf(";", idx); - var versString; - - if (versIdx != -1) { - versString = agent.substring(idx + searchString.length, versIdx); - } else { - versString = agent.substring(idx + searchString.length); - } - - if (parseFloat(versString) < 7) { - ModalPanel.disableSelects = true; - } - } -} - -ModalPanel.panels = new Array(); - -A4J.AJAX.AddListener({ - onafterajax: function(req, event, data) { - var i = 0; - while (i < ModalPanel.panels.length) { - var panel = ModalPanel.panels[i]; - - var elt = panel.markerId; - - if (!Richfaces.isNodeInDOMTree(elt)) { - panel.destroy(); - - ModalPanel.panels.splice(i, 1); - //check all panels again. maybe we've removed parent of any panel just now - i = 0; - } else { - i++; - } - } - } -}); - -ModalPanel.Context = Class.create(); -ModalPanel.Context.prototype = { - initialize: function(modalPanel) { - this.cdiv = modalPanel.contentDiv; - this.isPositionFixed = Richfaces.getComputedStyle(this.cdiv, "position") == "fixed"; - }, - - left: function(offset) { - return offset; - }, - - top: function(offset) { - return offset; - }, - - width: function() { - return this.cdiv.offsetWidth; - }, - - height: function() { - return this.cdiv.offsetHeight; - } -} - - function getSizeElement() { - var element; - if (document.compatMode=='CSS1Compat') { - element = document.documentElement; - } else { - element = document.body; - } - - return element; - } - - -ModalPanel.prototype = { - initialize: function(id, options) { - this.markerId = $(id); - - this.id = $(id + "Container"); - - this.options = options; - - this.baseZIndex = this.options.zindex ? this.options.zindex : 100; - - this.minWidth = Math.max(this.options.minWidth, 2*sizeA + 2); - this.minHeight = Math.max(this.options.minHeight, 2*sizeA + 2); - - this.div = $(id + "Div"); - this.cursorDiv = $(id + "CursorDiv"); - this.cdiv = $(id + "CDiv"); - this.contentDiv = $(id + "ContentDiv"); - this.shadowDiv = $(id + "ShadowDiv"); - - this.context = new ModalPanel.Context(this); - - this.borders = new Array(); - - if (this.options.resizeable) { - this.borders.push(new ModalPanel.Border(id + "ResizerNWU", this, "NW-resize", ModalPanel.Sizer.NWU)); - this.borders.push(new ModalPanel.Border(id + "ResizerN", this, "N-resize", ModalPanel.Sizer.N)); - this.borders.push(new ModalPanel.Border(id + "ResizerNEU", this, "NE-resize", ModalPanel.Sizer.NEU)); - this.borders.push(new ModalPanel.Border(id + "ResizerNEL", this, "NE-resize", ModalPanel.Sizer.NEL)); - this.borders.push(new ModalPanel.Border(id + "ResizerE", this, "E-resize", ModalPanel.Sizer.E)); - this.borders.push(new ModalPanel.Border(id + "ResizerSEU", this, "SE-resize", ModalPanel.Sizer.SEU)); - this.borders.push(new ModalPanel.Border(id + "ResizerSEL", this, "SE-resize", ModalPanel.Sizer.SEL)); - this.borders.push(new ModalPanel.Border(id + "ResizerS", this, "S-resize", ModalPanel.Sizer.S)); - this.borders.push(new ModalPanel.Border(id + "ResizerSWL", this, "SW-resize", ModalPanel.Sizer.SWL)); - this.borders.push(new ModalPanel.Border(id + "ResizerSWU", this, "SW-resize", ModalPanel.Sizer.SWU)); - this.borders.push(new ModalPanel.Border(id + "ResizerW", this, "W-resize", ModalPanel.Sizer.W)); - this.borders.push(new ModalPanel.Border(id + "ResizerNWL", this, "NW-resize", ModalPanel.Sizer.NWL)); - } - - if (this.options.moveable && $(id + "Header")) { - this.header = new ModalPanel.Border(id + "Header", this, "move", ModalPanel.Header); - } - - this.id.modalPanel = this; - - if (this.div.style.setExpression) - if (ModalPanel.disableSelects /* IE 6 */ || Richfaces.getComputedStyle(this.div, "position") != "fixed" /* IE again, not in strict mode*/) - - { - this.div.style.position = "absolute"; - this.cursorDiv.style.position = "absolute"; - - //that is to apply filter - this.div.style.width = "1px"; - this.div.style.height = "1px"; - this.cursorDiv.style.width = "1px"; - this.cursorDiv.style.height = "1px"; - - this.cdiv.style.position = "absolute"; - - this.cdiv.mpUseExpr = true; - } - - if (this.options.onshow && this.options.onshow != ""){ - this.eventOnShow = new Function("event",this.options.onshow).bindAsEventListener(this); - } - if (this.options.onhide && this.options.onhide != ""){ - this.eventOnHide = new Function("event",this.options.onhide).bindAsEventListener(this); - } - - - ModalPanel.panels.push(this); - - this.eventFirstOnfocus = this.firstOnfocus.bindAsEventListener(this); - this.eventLastOnfocus = this.lastOnfocus.bindAsEventListener(this); - - this.firstHref = $(this.markerId.id + "FirstHref"); - this.lastHref = $(this.markerId.id + "LastHref"); - }, - - destroy: function() { - - this.traverseSelects(true); - - if (this.floatedToBody) { - var parent = this.id.parentNode; - if (parent) { - parent.removeChild(this.id); - } - } - }, - - initIframe : function() { - if (this.contentWindow) { - Element.setStyle(this.contentWindow.document.body, { "margin" : "0px 0px 0px 0px" }); - } else { - //TODO opera etc. - - } - - if("transparent" == Element.getStyle(document.body, "background-color")) { - this.allowTransparency = true; - } - - //this.style.opacity = "0.5"; - //this.style.filter='progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=50)'; - //var iframeBodyStyle = this.contentWindow.document.body.style; - //iframeBodyStyle.backgroundColor = "#d0d0d0"; - //iframeBodyStyle.filter = "alpha(opacity=50)"; - //iframeBodyStyle.opacity = "0.5"; - //iframeBodyStyle.zIndex = "99"; - }, - - traverseSelects: function(enable) { - if (!ModalPanel.disableSelects) { - return ; - } - - var children = document.body.childNodes; - for (var k = 0; k < children.length; k++) { - var child = children[k]; - if (child != this.id && child.getElementsByTagName) { - - var selects = child.getElementsByTagName("SELECT"); - - for (var i = 0; i < selects.length; i++) { - var elt = selects[i]; - - if (enable) { - if (elt._mdwCount) { - elt._mdwCount -= 1; - - if (elt._mdwCount == 0) { - if (elt._mdwDisabled) { - elt._mdwDisabled = undefined; - } else { - elt.disabled = false; - } - - elt._mdwCount = undefined; - } - } - } else { - if (elt._mdwCount) { - elt._mdwCount += 1; - } else { - if (elt.disabled) { - elt._mdwDisabled = true; - } else { - elt.disabled = true; - } - - elt._mdwCount = 1; - } - } - } - } - } - }, - - setLeft: function(pos) { - if (this.cdiv.mpUseExpr) { - this.cdiv.mpLeft = pos; - } else { - this.cdiv.style.left = pos + "px"; - } - }, - - setTop: function(pos) { - if (this.cdiv.mpUseExpr) { - this.cdiv.mpTop = pos; - } else { - this.cdiv.style.top = pos + "px"; - } - }, - - firstOnfocus: function(event) { - if (this.firstHref) { - this.firstHref.focus(); - } - }, - - lastOnfocus: function(event) { - if (this.lastHref) { - this.lastHref.focus(); - } - }, - - processAllFocusElements: function(root) { - if (root.focus && - // Many not visible elements have focus method, we is had to avoid processing them. - /^a|input|select|button|textarea$/i.test(root.tagName) && - !root.disabled && !/^hidden$/.test(root.type) && - !/^none$/.test(root.style.display)) { - this.execute(root); - } else { - if (root == this.cdiv) - this.inModalPanel = true; - var child = root.firstChild; - while (child) { - this.processAllFocusElements(child); - child = child.nextSibling; - } - if (root == this.cdiv) - this.inModalPanel = false; - } - }, - - processTabindexes: function(input) { - if (!this.inModalPanel) { - if (!this.firstOutside) - this.firstOutside = input; - this.lastOutside = input; - if (input.tabIndex) { - input.prevTabIndex = input.tabIndex; - } - input.tabIndex = undefined; - if (input.accesskey) { - input.prevAccesskey = input.accesskey; - } - input.accesskey = undefined; - } - }, - - restoreTabindexes: function(input) { - if (!this.inModalPanel) { - if (input.prevTabIndex) - input.tabIndex = input.prevTabIndex; - if (input.prevAccesskey) - input.accesskey = input.prevAccesskey; - } - }, - - preventFocus: function() { - this.execute = this.processTabindexes; - this.processAllFocusElements(document); - - if (this.firstOutside) { - Event.observe(this.firstOutside, "focus", this.eventFirstOnfocus); - } - if (this.lastOutside && this.lastOutside != this.firstOutside) { - Event.observe(this.lastOutside, "focus", this.eventLastOnfocus); - } - }, - - restoreFocus: function() { - this.execute = this.restoreTabindexes; - this.processAllFocusElements(document); - - if (this.firstOutside) { - Event.stopObserving(this.firstOutside, "focus", this.eventFirstOnfocus); - this.firstOutside = null; - } - if (this.lastOutside) { - Event.stopObserving(this.lastOutside, "focus", this.eventLastOnfocus); - this.lastOutside = null; - } - }, - - show: function(opts) { - this.preventFocus(); - - if (!this.floatedToBody) { - this.parent = this.id.parentNode; - document.body.appendChild(this.id.parentNode.removeChild(this.id)); - this.floatedToBody = true; - } - - if (ModalPanel.disableSelects && !this.iframe) { - new Insertion.Top(this.cdiv, - "<iframe src=\"javascript:''\" frameborder=\"0\" scrolling=\"no\" id=\"" + this.markerId.id + "IFrame\"" + - "style=\"position: absolute; width: 1px; height: 1px; background-color: white; overflow-y: hidden; z-index: 1;\">" + - "</iframe>"); - - this.iframe = $(this.markerId.id + "IFrame"); - - //alert("IFrame:" + this.iframe + "created!"); - - this.iframe.onload = this.initIframe.bind(this.iframe); - } - - var options = {}; - - if (!this.cdiv.mpSet) { - Object.extend(options, this.options); - } - - if (opts) { - Object.extend(options, opts); - } - - if (options.width) { - if (this.minWidth > options.width) { - options.width = this.minWidth; - } - - if (this.iframe) { - this.iframe.style.width = options.width + 'px'; - } - this.contentDiv.style.width = options.width + 'px'; - this.shadowDiv.style.width = options.width + 'px'; - } - - if (options.height) { - if (this.minHeight > options.height) { - options.height = this.minHeight; - } - - if (this.iframe) { - this.iframe.style.height = options.height + 'px'; - } - this.contentDiv.style.height = options.height + 'px'; - this.shadowDiv.style.height = options.height + 'px'; - } - - if (options.left) { - var _left; - if (options.left != "auto") { - _left = parseInt(options.left, 10); - } else { - var cw = getSizeElement().clientWidth; - if (RichFaces.navigatorType() == "OPERA") - _left = (cw - this.contentDiv.style.width.replace("px", "")) / 2; - else - _left = (cw - Richfaces.getComputedStyleSize(this.contentDiv, "width")) / 2; - - } - - this.setLeft(_left); - } - - if (options.top) { - var _top; - if (options.top != "auto") { - _top = parseInt(options.top, 10); - } else { - var cw = getSizeElement().clientHeight; - _top = (cw - Richfaces.getComputedStyleSize(this.contentDiv, "height")) / 2; - } - - this.setTop(_top); - } - - this.cdiv.mpSet = true; - - //Element.setStyle(this.dialogWindow.document.body, { "margin" : "0px 0px 0px 0px" }); - //if("transparent" == Element.getStyle(document.body, "background-color")) { - // this.iframe.allowTransparency = true; - //} - - - this.traverseSelects(); - - //this.shape.init(this.cdiv, this.options); - - if (this.div.style.position == "absolute") - { - var we = "getSizeElement().clientWidth + \"px\""; - var he = "getSizeElement().clientHeight + \"px\""; - this.div.style.setExpression("width", we); - this.div.style.setExpression("height", he); - - this.cursorDiv.style.setExpression("width", we); - this.cursorDiv.style.setExpression("height", he); - - var le = "-Position.cumulativeOffset(this.parentNode)[0] + getSizeElement().scrollLeft + \"px\""; - var te = "-Position.cumulativeOffset(this.parentNode)[1] + getSizeElement().scrollTop + \"px\""; - - this.div.style.setExpression("left", le); - this.div.style.setExpression("top", te); - - this.cursorDiv.style.setExpression("left", le); - this.cursorDiv.style.setExpression("top", te); - - - var leftExpr = "(this.mpLeft || 0) + -Position.cumulativeOffset(this.parentNode)[0] + getSizeElement().scrollLeft + \"px\""; - var topExpr = "(this.mpTop || 0) + -Position.cumulativeOffset(this.parentNode)[1] + getSizeElement().scrollTop + \"px\""; - - this.cdiv.style.setExpression("left", leftExpr); - this.cdiv.style.setExpression("top", topExpr); - - - /* That's how we output debug info - DOM inspector rulez */ - /* - document.body.setExpression("_clientLeft", "getSizeElement().clientLeft"); - document.body.setExpression("_clientTop", "getSizeElement().clientTop"); - document.body.setExpression("_scrollLeft", "getSizeElement().scrollLeft"); - document.body.setExpression("_scrollTop", "getSizeElement().scrollTop"); - */ - /* */ - } - - this.id.style.visibility = "hidden"; - - Element.show(this.id); - - this.doResizeOrMove(ModalPanel.Sizer.Diff.EMPTY); - - for (var k = 0; k < this.borders.length; k++ ) { - this.borders[k].doPosition(); - } - - if (this.header) { - this.header.doPosition(); - } - - this.id.style.visibility = ""; - - var event = {}; - event.parameters = opts || {}; - if (this.eventOnShow) this.eventOnShow(event); - - this.lastOnfocus(); - }, - - startDrag: function(border) { - for (var k = 0; k < this.borders.length; k++ ) { - //this.borders[k].hide(); - } - }, - - endDrag: function(border) { - for (var k = 0; k < this.borders.length; k++ ) { - //this.borders[k].show(); - this.borders[k].doPosition(); - } - }, - - hide: function(opts) { - this.restoreFocus(); - - this.traverseSelects(true); - - if (this.div.style.removeExpression) { - this.div.style.removeExpression("width"); - this.div.style.removeExpression("height"); - - this.div.style.removeExpression("left"); - this.div.style.removeExpression("top"); - - this.cursorDiv.style.removeExpression("width"); - this.cursorDiv.style.removeExpression("height"); - - this.cursorDiv.style.removeExpression("left"); - this.cursorDiv.style.removeExpression("top"); - - this.cdiv.style.removeExpression("left"); - this.cdiv.style.removeExpression("top"); - } - - Element.hide(this.id); - - if (this.floatedToBody && this.parent) { - document.body.removeChild(this.id); - this.parent.appendChild(this.id); - this.floatedToBody = false; - } - - var event = {}; - event.parameters = opts || {}; - if (this.eventOnHide) this.eventOnHide(event); - }, - - doResizeOrMove: function(diff) { - var vetoes = {}; - var cssHash = {}; - var cssHashWH = {}; - - var vetoeChange = false; - var newSize; - // Avoid currentStyle bug in opera - if (RichFaces.navigatorType() != "OPERA") - newSize = Richfaces.getComputedStyleSize(this.contentDiv, "width"); - else - newSize = parseInt(this.contentDiv.style.width.replace("px", ""), 10); - - var oldSize = newSize; - newSize += diff.deltaWidth || 0; - - if (newSize >= this.minWidth) { - if (diff.deltaWidth) { - cssHashWH.width = newSize + 'px'; - } - } else { - if (diff.deltaWidth) { - cssHashWH.width = this.minWidth + 'px'; - - vetoes.vx = oldSize - this.minWidth; - } - - vetoes.x = true; - } - - if (vetoes.vx && diff.deltaX) { - diff.deltaX = -vetoes.vx; - } - - if (diff.deltaX && (vetoes.vx || !vetoes.x)) { - if (vetoes.vx) { - diff.deltaX = vetoes.vx; - } - var newPos; - if (this.cdiv.mpUseExpr) { - newPos = this.cdiv.mpLeft || 0; - newPos += diff.deltaX; - - this.cdiv.mpLeft = newPos; - } else { - newPos = Richfaces.getComputedStyleSize(this.cdiv, "left"); - newPos += diff.deltaX; - cssHash.left = newPos + 'px'; - } - } - - var newSize = Richfaces.getComputedStyleSize(this.contentDiv, "height"); - var oldSize = newSize; - newSize += diff.deltaHeight || 0; - - if (newSize >= this.minHeight) { - if (diff.deltaHeight) { - cssHashWH.height = newSize + 'px'; - } - } else { - if (diff.deltaHeight) { - cssHashWH.height = this.minHeight + 'px'; - - vetoes.vy = oldSize - this.minHeight; - } - - vetoes.y = true; - } - - if (vetoes.vy && diff.deltaY) { - diff.deltaY = -vetoes.vy; - } - - if (diff.deltaY && (vetoes.vy || !vetoes.y)) { - if (vetoes.vy) { - diff.deltaY = vetoes.vy; - } - - var newPos; - if (this.cdiv.mpUseExpr) { - newPos = this.cdiv.mpTop || 0; - newPos += diff.deltaY; - - this.cdiv.mpTop = newPos; - } else { - newPos = Richfaces.getComputedStyleSize(this.cdiv, "top"); - newPos += diff.deltaY; - cssHash.top = newPos + 'px'; - } - } - - Element.setStyle(this.cdiv, cssHash); - - Element.setStyle(this.contentDiv, cssHashWH); - Element.setStyle(this.shadowDiv, cssHashWH); - if (this.iframe) { - Element.setStyle(this.iframe, cssHashWH); - } - - var w = this.context.width(); - var h = this.context.height(); - - this.context.reduced = null; - - if (w <= 2*sizeB) { - this.context.reduced = {}; - this.context.reduced.w = w; - } - - if (h <= 2*sizeB) { - if (!this.context.reduced) { - this.context.reduced = {}; - } - - this.context.reduced.h = h; - } - - if (this.header) { - this.header.doPosition(); - } - - return vetoes; - } - -} - -Richfaces.findModalPanel = function (id) { - if (id) { - var prefId = (id.charAt(0) == ':' ? id : ':' + id); - - for (var i = 0; i < ModalPanel.panels.length; i++ ) { - var pnl = ModalPanel.panels[i]; - if (pnl && pnl.markerId) { - var pnlId = pnl.markerId.id; - - if (pnlId) { - //try to match ids - if (pnlId.length >= prefId.length) { - var substr = pnlId.substring(pnlId.length - prefId.length, pnlId.length); - if (substr == prefId) { - return pnl.id; - } - } - } - } - } - } -} - -Richfaces.showModalPanel = function (id, opts) { - var panel = $(id + "Container"); - if (!panel) { - panel = Richfaces.findModalPanel(id); - } - panel.modalPanel.show(opts); -} - -Richfaces.hideModalPanel = function (id, opts) { - var panel = $(id + "Container"); - if (!panel) { - panel = Richfaces.findModalPanel(id); - } - panel.modalPanel.hide(opts); -} +if (!window.DW) { + window.DW = {}; +} + +if (!window.Richfaces) { + window.Richfaces = {}; +} + +sizeA = 4; +sizeB = 40; + +ModalPanel = Class.create(); + +{ + var searchString = "MSIE"; + var agent = navigator.userAgent; + var idx = agent.indexOf(searchString); + if (idx != -1) { + var versIdx = agent.indexOf(";", idx); + var versString; + + if (versIdx != -1) { + versString = agent.substring(idx + searchString.length, versIdx); + } else { + versString = agent.substring(idx + searchString.length); + } + + if (parseFloat(versString) < 7) { + ModalPanel.disableSelects = true; + } + } +} + +ModalPanel.panels = new Array(); + +A4J.AJAX.AddListener({ + onafterajax: function(req, event, data) { + var i = 0; + while (i < ModalPanel.panels.length) { + var panel = ModalPanel.panels[i]; + + var elt = panel.markerId; + + if (!Richfaces.isNodeInDOMTree(elt)) { + panel.destroy(); + + ModalPanel.panels.splice(i, 1); + //check all panels again. maybe we've removed parent of any panel just now + i = 0; + } else { + i++; + } + } + } +}); + +ModalPanel.Context = Class.create(); +ModalPanel.Context.prototype = { + initialize: function(modalPanel) { + this.cdiv = modalPanel.contentDiv; + this.isPositionFixed = Richfaces.getComputedStyle(this.cdiv, "position") == "fixed"; + }, + + left: function(offset) { + return offset; + }, + + top: function(offset) { + return offset; + }, + + width: function() { + return this.cdiv.offsetWidth; + }, + + height: function() { + return this.cdiv.offsetHeight; + } +} + + function getSizeElement() { + var element; + if (document.compatMode=='CSS1Compat') { + element = document.documentElement; + } else { + element = document.body; + } + + return element; + } + + +ModalPanel.prototype = { + initialize: function(id, options) { + this.markerId = $(id); + + this.id = $(id + "Container"); + + this.options = options; + + this.baseZIndex = this.options.zindex ? this.options.zindex : 100; + + this.minWidth = Math.max(this.options.minWidth, 2*sizeA + 2); + this.minHeight = Math.max(this.options.minHeight, 2*sizeA + 2); + + this.div = $(id + "Div"); + this.cursorDiv = $(id + "CursorDiv"); + this.cdiv = $(id + "CDiv"); + this.contentDiv = $(id + "ContentDiv"); + this.shadowDiv = $(id + "ShadowDiv"); + + this.context = new ModalPanel.Context(this); + + this.borders = new Array(); + + if (this.options.resizeable) { + this.borders.push(new ModalPanel.Border(id + "ResizerNWU", this, "NW-resize", ModalPanel.Sizer.NWU)); + this.borders.push(new ModalPanel.Border(id + "ResizerN", this, "N-resize", ModalPanel.Sizer.N)); + this.borders.push(new ModalPanel.Border(id + "ResizerNEU", this, "NE-resize", ModalPanel.Sizer.NEU)); + this.borders.push(new ModalPanel.Border(id + "ResizerNEL", this, "NE-resize", ModalPanel.Sizer.NEL)); + this.borders.push(new ModalPanel.Border(id + "ResizerE", this, "E-resize", ModalPanel.Sizer.E)); + this.borders.push(new ModalPanel.Border(id + "ResizerSEU", this, "SE-resize", ModalPanel.Sizer.SEU)); + this.borders.push(new ModalPanel.Border(id + "ResizerSEL", this, "SE-resize", ModalPanel.Sizer.SEL)); + this.borders.push(new ModalPanel.Border(id + "ResizerS", this, "S-resize", ModalPanel.Sizer.S)); + this.borders.push(new ModalPanel.Border(id + "ResizerSWL", this, "SW-resize", ModalPanel.Sizer.SWL)); + this.borders.push(new ModalPanel.Border(id + "ResizerSWU", this, "SW-resize", ModalPanel.Sizer.SWU)); + this.borders.push(new ModalPanel.Border(id + "ResizerW", this, "W-resize", ModalPanel.Sizer.W)); + this.borders.push(new ModalPanel.Border(id + "ResizerNWL", this, "NW-resize", ModalPanel.Sizer.NWL)); + } + + if (this.options.moveable && $(id + "Header")) { + this.header = new ModalPanel.Border(id + "Header", this, "move", ModalPanel.Header); + } + + this.id.modalPanel = this; + + if (this.div.style.setExpression) + if (ModalPanel.disableSelects /* IE 6 */ || Richfaces.getComputedStyle(this.div, "position") != "fixed" /* IE again, not in strict mode*/) + + { + this.div.style.position = "absolute"; + this.cursorDiv.style.position = "absolute"; + + //that is to apply filter + this.div.style.width = "1px"; + this.div.style.height = "1px"; + this.cursorDiv.style.width = "1px"; + this.cursorDiv.style.height = "1px"; + + this.cdiv.style.position = "absolute"; + + this.cdiv.mpUseExpr = true; + } + + if (this.options.onshow && this.options.onshow != ""){ + this.eventOnShow = new Function("event",this.options.onshow).bindAsEventListener(this); + } + if (this.options.onhide && this.options.onhide != ""){ + this.eventOnHide = new Function("event",this.options.onhide).bindAsEventListener(this); + } + + + ModalPanel.panels.push(this); + + this.eventFirstOnfocus = this.firstOnfocus.bindAsEventListener(this); + this.eventLastOnfocus = this.lastOnfocus.bindAsEventListener(this); + + this.firstHref = $(this.markerId.id + "FirstHref"); + this.lastHref = $(this.markerId.id + "LastHref"); + }, + + destroy: function() { + + this.traverseSelects(true); + + if (this.floatedToBody) { + var parent = this.id.parentNode; + if (parent) { + parent.removeChild(this.id); + } + } + }, + + initIframe : function() { + if (this.contentWindow) { + Element.setStyle(this.contentWindow.document.body, { "margin" : "0px 0px 0px 0px" }); + } else { + //TODO opera etc. + + } + + if("transparent" == Element.getStyle(document.body, "background-color")) { + this.allowTransparency = true; + } + + //this.style.opacity = "0.5"; + //this.style.filter='progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=50)'; + //var iframeBodyStyle = this.contentWindow.document.body.style; + //iframeBodyStyle.backgroundColor = "#d0d0d0"; + //iframeBodyStyle.filter = "alpha(opacity=50)"; + //iframeBodyStyle.opacity = "0.5"; + //iframeBodyStyle.zIndex = "99"; + }, + + traverseSelects: function(enable) { + if (!ModalPanel.disableSelects) { + return ; + } + + var children = document.body.childNodes; + for (var k = 0; k < children.length; k++) { + var child = children[k]; + if (child != this.id && child.getElementsByTagName) { + + var selects = child.getElementsByTagName("SELECT"); + + for (var i = 0; i < selects.length; i++) { + var elt = selects[i]; + + if (enable) { + if (elt._mdwCount) { + elt._mdwCount -= 1; + + if (elt._mdwCount == 0) { + if (elt._mdwDisabled) { + elt._mdwDisabled = undefined; + } else { + elt.disabled = false; + } + + elt._mdwCount = undefined; + } + } + } else { + if (elt._mdwCount) { + elt._mdwCount += 1; + } else { + if (elt.disabled) { + elt._mdwDisabled = true; + } else { + elt.disabled = true; + } + + elt._mdwCount = 1; + } + } + } + } + } + }, + + setLeft: function(pos) { + if (this.cdiv.mpUseExpr) { + this.cdiv.mpLeft = pos; + } else { + this.cdiv.style.left = pos + "px"; + } + }, + + setTop: function(pos) { + if (this.cdiv.mpUseExpr) { + this.cdiv.mpTop = pos; + } else { + this.cdiv.style.top = pos + "px"; + } + }, + + firstOnfocus: function(event) { + if (this.firstHref) { + this.firstHref.focus(); + } + }, + + lastOnfocus: function(event) { + if (this.lastHref) { + this.lastHref.focus(); + } + }, + + processAllFocusElements: function(root) { + if (root.focus && + // Many not visible elements have focus method, we is had to avoid processing them. + /^a|input|select|button|textarea$/i.test(root.tagName) && + !root.disabled && !/^hidden$/.test(root.type) && + !/^none$/.test(root.style.display)) { + this.execute(root); + } else { + if (root == this.cdiv) + this.inModalPanel = true; + var child = root.firstChild; + while (child) { + this.processAllFocusElements(child); + child = child.nextSibling; + } + if (root == this.cdiv) + this.inModalPanel = false; + } + }, + + processTabindexes: function(input) { + if (!this.inModalPanel) { + if (!this.firstOutside) + this.firstOutside = input; + this.lastOutside = input; + if (input.tabIndex) { + input.prevTabIndex = input.tabIndex; + } + input.tabIndex = undefined; + if (input.accesskey) { + input.prevAccesskey = input.accesskey; + } + input.accesskey = undefined; + } + }, + + restoreTabindexes: function(input) { + if (!this.inModalPanel) { + if (input.prevTabIndex) + input.tabIndex = input.prevTabIndex; + if (input.prevAccesskey) + input.accesskey = input.prevAccesskey; + } + }, + + preventFocus: function() { + this.execute = this.processTabindexes; + this.processAllFocusElements(document); + + if (this.firstOutside) { + Event.observe(this.firstOutside, "focus", this.eventFirstOnfocus); + } + if (this.lastOutside && this.lastOutside != this.firstOutside) { + Event.observe(this.lastOutside, "focus", this.eventLastOnfocus); + } + }, + + restoreFocus: function() { + this.execute = this.restoreTabindexes; + this.processAllFocusElements(document); + + if (this.firstOutside) { + Event.stopObserving(this.firstOutside, "focus", this.eventFirstOnfocus); + this.firstOutside = null; + } + if (this.lastOutside) { + Event.stopObserving(this.lastOutside, "focus", this.eventLastOnfocus); + this.lastOutside = null; + } + }, + + show: function(opts) { + this.preventFocus(); + + if (!this.floatedToBody) { + this.parent = this.id.parentNode; + document.body.insertBefore(this.parent.removeChild(this.id), null); + this.floatedToBody = true; + } + + var forms = this.cdiv.getElementsByTagName("form"); + if (forms) { + this.formOnload = this.setStateInput.bindAsEventListener(this); + for (var i = 0; i < forms.length; i++) { + Event.observe(forms[i], "submit", this.formOnload); + } + } + + if (ModalPanel.disableSelects && !this.iframe) { + new Insertion.Top(this.cdiv, + "<iframe src=\"javascript:''\" frameborder=\"0\" scrolling=\"no\" id=\"" + this.markerId.id + "IFrame\"" + + "style=\"position: absolute; width: 1px; height: 1px; background-color: white; overflow-y: hidden; z-index: 1;\">" + + "</iframe>"); + + this.iframe = $(this.markerId.id + "IFrame"); + + //alert("IFrame:" + this.iframe + "created!"); + + this.iframe.onload = this.initIframe.bind(this.iframe); + } + + var options = {}; + + if (!this.cdiv.mpSet) { + Object.extend(options, this.options); + } + + if (opts) { + Object.extend(options, opts); + } + + if (options.width) { + if (this.minWidth > options.width) { + options.width = this.minWidth; + } + + if (this.iframe) { + this.iframe.style.width = options.width + 'px'; + } + this.contentDiv.style.width = options.width + 'px'; + this.shadowDiv.style.width = options.width + 'px'; + } + + if (options.height) { + if (this.minHeight > options.height) { + options.height = this.minHeight; + } + + if (this.iframe) { + this.iframe.style.height = options.height + 'px'; + } + this.contentDiv.style.height = options.height + 'px'; + this.shadowDiv.style.height = options.height + 'px'; + } + + if (options.left) { + var _left; + if (options.left != "auto") { + _left = parseInt(options.left, 10); + } else { + var cw = getSizeElement().clientWidth; + if (RichFaces.navigatorType() == "OPERA") + _left = (cw - this.contentDiv.style.width.replace("px", "")) / 2; + else + _left = (cw - Richfaces.getComputedStyleSize(this.contentDiv, "width")) / 2; + + } + + this.setLeft(_left); + } + + if (options.top) { + var _top; + if (options.top != "auto") { + _top = parseInt(options.top, 10); + } else { + var cw = getSizeElement().clientHeight; + _top = (cw - Richfaces.getComputedStyleSize(this.contentDiv, "height")) / 2; + } + + this.setTop(_top); + } + + this.cdiv.mpSet = true; + + //Element.setStyle(this.dialogWindow.document.body, { "margin" : "0px 0px 0px 0px" }); + //if("transparent" == Element.getStyle(document.body, "background-color")) { + // this.iframe.allowTransparency = true; + //} + + + this.traverseSelects(); + + //this.shape.init(this.cdiv, this.options); + + if (this.div.style.position == "absolute") + { + var we = "getSizeElement().clientWidth + \"px\""; + var he = "getSizeElement().clientHeight + \"px\""; + this.div.style.setExpression("width", we); + this.div.style.setExpression("height", he); + + this.cursorDiv.style.setExpression("width", we); + this.cursorDiv.style.setExpression("height", he); + + var le = "-Position.cumulativeOffset(this.parentNode)[0] + getSizeElement().scrollLeft + \"px\""; + var te = "-Position.cumulativeOffset(this.parentNode)[1] + getSizeElement().scrollTop + \"px\""; + + this.div.style.setExpression("left", le); + this.div.style.setExpression("top", te); + + this.cursorDiv.style.setExpression("left", le); + this.cursorDiv.style.setExpression("top", te); + + + var leftExpr = "(this.mpLeft || 0) + -Position.cumulativeOffset(this.parentNode)[0] + getSizeElement().scrollLeft + \"px\""; + var topExpr = "(this.mpTop || 0) + -Position.cumulativeOffset(this.parentNode)[1] + getSizeElement().scrollTop + \"px\""; + + this.cdiv.style.setExpression("left", leftExpr); + this.cdiv.style.setExpression("top", topExpr); + + + /* That's how we output debug info - DOM inspector rulez */ + /* + document.body.setExpression("_clientLeft", "getSizeElement().clientLeft"); + document.body.setExpression("_clientTop", "getSizeElement().clientTop"); + document.body.setExpression("_scrollLeft", "getSizeElement().scrollLeft"); + document.body.setExpression("_scrollTop", "getSizeElement().scrollTop"); + */ + /* */ + } + + this.id.style.visibility = "hidden"; + + Element.show(this.id); + + this.doResizeOrMove(ModalPanel.Sizer.Diff.EMPTY); + + for (var k = 0; k < this.borders.length; k++ ) { + this.borders[k].doPosition(); + } + + if (this.header) { + this.header.doPosition(); + } + + this.id.style.visibility = ""; + + var event = {}; + event.parameters = opts || {}; + if (this.eventOnShow) this.eventOnShow(event); + + this.lastOnfocus(); + + this.shown = true; + }, + + startDrag: function(border) { + for (var k = 0; k < this.borders.length; k++ ) { + //this.borders[k].hide(); + } + }, + + endDrag: function(border) { + for (var k = 0; k < this.borders.length; k++ ) { + //this.borders[k].show(); + this.borders[k].doPosition(); + } + }, + + hide: function(opts) { + this.restoreFocus(); + + this.traverseSelects(true); + + if (this.div.style.removeExpression) { + this.div.style.removeExpression("width"); + this.div.style.removeExpression("height"); + + this.div.style.removeExpression("left"); + this.div.style.removeExpression("top"); + + this.cursorDiv.style.removeExpression("width"); + this.cursorDiv.style.removeExpression("height"); + + this.cursorDiv.style.removeExpression("left"); + this.cursorDiv.style.removeExpression("top"); + + this.cdiv.style.removeExpression("left"); + this.cdiv.style.removeExpression("top"); + } + + Element.hide(this.id); + + if (this.floatedToBody && this.parent && this.parent.firstChild) { + document.body.removeChild(this.id); + this.parent.appendChild(this.id); + this.floatedToBody = false; + } + + var event = {}; + event.parameters = opts || {}; + if (this.eventOnHide) this.eventOnHide(event); + + this.shown = false; + }, + + doResizeOrMove: function(diff) { + var vetoes = {}; + var cssHash = {}; + var cssHashWH = {}; + + var vetoeChange = false; + var newSize; + // Avoid currentStyle bug in opera + if (RichFaces.navigatorType() != "OPERA") + newSize = Richfaces.getComputedStyleSize(this.contentDiv, "width"); + else + newSize = parseInt(this.contentDiv.style.width.replace("px", ""), 10); + + var oldSize = newSize; + newSize += diff.deltaWidth || 0; + + if (newSize >= this.minWidth) { + if (diff.deltaWidth) { + cssHashWH.width = newSize + 'px'; + } + } else { + if (diff.deltaWidth) { + cssHashWH.width = this.minWidth + 'px'; + + vetoes.vx = oldSize - this.minWidth; + } + + vetoes.x = true; + } + + if (vetoes.vx && diff.deltaX) { + diff.deltaX = -vetoes.vx; + } + + if (diff.deltaX && (vetoes.vx || !vetoes.x)) { + if (vetoes.vx) { + diff.deltaX = vetoes.vx; + } + var newPos; + if (this.cdiv.mpUseExpr) { + newPos = this.cdiv.mpLeft || 0; + newPos += diff.deltaX; + + this.cdiv.mpLeft = newPos; + } else { + newPos = Richfaces.getComputedStyleSize(this.cdiv, "left"); + newPos += diff.deltaX; + cssHash.left = newPos + 'px'; + } + } + + var newSize = Richfaces.getComputedStyleSize(this.contentDiv, "height"); + var oldSize = newSize; + newSize += diff.deltaHeight || 0; + + if (newSize >= this.minHeight) { + if (diff.deltaHeight) { + cssHashWH.height = newSize + 'px'; + } + } else { + if (diff.deltaHeight) { + cssHashWH.height = this.minHeight + 'px'; + + vetoes.vy = oldSize - this.minHeight; + } + + vetoes.y = true; + } + + if (vetoes.vy && diff.deltaY) { + diff.deltaY = -vetoes.vy; + } + + if (diff.deltaY && (vetoes.vy || !vetoes.y)) { + if (vetoes.vy) { + diff.deltaY = vetoes.vy; + } + + var newPos; + if (this.cdiv.mpUseExpr) { + newPos = this.cdiv.mpTop || 0; + newPos += diff.deltaY; + + this.cdiv.mpTop = newPos; + } else { + newPos = Richfaces.getComputedStyleSize(this.cdiv, "top"); + newPos += diff.deltaY; + cssHash.top = newPos + 'px'; + } + } + + Element.setStyle(this.cdiv, cssHash); + + Element.setStyle(this.contentDiv, cssHashWH); + Element.setStyle(this.shadowDiv, cssHashWH); + if (this.iframe) { + Element.setStyle(this.iframe, cssHashWH); + } + + var w = this.context.width(); + var h = this.context.height(); + + this.context.reduced = null; + + if (w <= 2*sizeB) { + this.context.reduced = {}; + this.context.reduced.w = w; + } + + if (h <= 2*sizeB) { + if (!this.context.reduced) { + this.context.reduced = {}; + } + + this.context.reduced.h = h; + } + + if (this.header) { + this.header.doPosition(); + } + + return vetoes; + }, + + setStateInput: function(e) { + if (e && e.target) { + var input = document.createElement("input"); + input.type = "hidden"; + input.id = this.markerId.id + "OpenedState"; + input.name = this.markerId.id + "OpenedState"; + input.value = this.shown ? "true" : "false"; + + e.target.appendChild(input); + return true; + } + } +} + +Richfaces.findModalPanel = function (id) { + if (id) { + var prefId = (id.charAt(0) == ':' ? id : ':' + id); + + for (var i = 0; i < ModalPanel.panels.length; i++ ) { + var pnl = ModalPanel.panels[i]; + if (pnl && pnl.markerId) { + var pnlId = pnl.markerId.id; + + if (pnlId) { + //try to match ids + if (pnlId.length >= prefId.length) { + var substr = pnlId.substring(pnlId.length - prefId.length, pnlId.length); + if (substr == prefId) { + return pnl.id; + } + } + } + } + } + } +} + +Richfaces.showModalPanel = function (id, opts) { + var panel = $(id + "Container"); + if (!panel) { + panel = Richfaces.findModalPanel(id); + } + panel.modalPanel.show(opts); +} + +Richfaces.hideModalPanel = function (id, opts) { + var panel = $(id + "Container"); + if (!panel) { + panel = Richfaces.findModalPanel(id); + } + panel.modalPanel.hide(opts); +} Modified: branches/3.0.2/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- branches/3.0.2/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-07-04 13:13:57 UTC (rev 1463) +++ branches/3.0.2/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-07-04 14:40:56 UTC (rev 1464) @@ -1,139 +1,146 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template - xmlns:f="http:/jsf.exadel.com/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://ajax4jsf.org/cdk/ui" - xmlns:u=" http://ajax4jsf.org/cdk/u" - xmlns:x=" http://ajax4jsf.org/cdk/x" - xmlns:h=" http://ajax4jsf.org/cdk/headers" - xmlns:vcp=" http://ajax4jsf.org/cdk/vcp" - class="org.richfaces.renderkit.html.ModalPanelRenderer" - baseclass="org.richfaces.renderkit.ModalPanelRendererBase" - component="org.richfaces.component.UIModalPanel" - > - - <h:styles> - /org/richfaces/renderkit/html/css/modalPanel.xcss - </h:styles> - <h:scripts> - new org.ajax4jsf.framework.resource.PrototypeScript(), - /org/richfaces/renderkit/html/scripts/utils.js, - /org/richfaces/renderkit/html/scripts/modalPanel.js, - /org/richfaces/renderkit/html/scripts/modalPanelBorders.js, - /org/richfaces/renderkit/html/scripts/browser_info.js - </h:scripts> - - <f:clientid var="clientId"/> - - <div id="#{clientId}" - style="display: none;" - > - - <f:call name="checkOptions" /> - <f:call name="initializeResources" /> - - <div id="#{clientId}Container" - style="position: absolute; display: none; z-index: #{component.zindex}; background-color: inherit;" - class="rich-modalpanel" - x:passThruWithExclusions="id,style,class" - > - <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}Div" - style="z-index: 1;"></div> - <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}CursorDiv" - style="filter: alpha(opacity=1); opacity: 0.01; z-index: -200"></div> - - <div id="#{clientId}CDiv" class="dr-mpnl-panel rich-mpnl_panel" style="width: 1px; height: 1px; z-index: 2;"> - - <jsp:scriptlet> - <![CDATA[ - if (component.isResizeable()) { - for (int i = 0; i < RESIZERS.length; i++) { - variables.setVariable("resizer", RESIZERS[i]); - - boolean isHor = i / 3 % 2 == 0; - String style = isHor ? "width: 40px; height: 4px;" : "height: 40px; width: 4px;"; - - //higher z-index for corner elements - style += "z-index: " + (i % 3 == 1 ? 0 : 1) + 3 + ";"; - variables.setVariable("resizerStyle", style); - ]]> - </jsp:scriptlet> - <div id="#{clientId}Resizer#{resizer}" class="dr-mpnl-resizer rich-mpnl-resizer" style="#{resizerStyle}"> - </div> - <jsp:scriptlet> - <![CDATA[ - } - } - ]]> - </jsp:scriptlet> - - <div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow" - style="#{component.shadowStyle}" > - </div> - - <div style="position: absolute; overflow: hidden; z-index: 2;" +<?xml version="1.0" encoding="UTF-8"?> +<f:template + xmlns:f="http:/jsf.exadel.com/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + xmlns:h=" http://ajax4jsf.org/cdk/headers" + xmlns:vcp=" http://ajax4jsf.org/cdk/vcp" + class="org.richfaces.renderkit.html.ModalPanelRenderer" + baseclass="org.richfaces.renderkit.ModalPanelRendererBase" + component="org.richfaces.component.UIModalPanel" + > + + <h:styles> + /org/richfaces/renderkit/html/css/modalPanel.xcss + </h:styles> + <h:scripts> + new org.ajax4jsf.framework.resource.PrototypeScript(), + /org/richfaces/renderkit/html/scripts/utils.js, + /org/richfaces/renderkit/html/scripts/modalPanel.js, + /org/richfaces/renderkit/html/scripts/modalPanelBorders.js, + /org/richfaces/renderkit/html/scripts/browser_info.js + </h:scripts> + + <f:clientid var="clientId"/> + + <div id="#{clientId}" + style="display: none;" + > + + <f:call name="checkOptions" /> + <f:call name="initializeResources" /> + + <input type="hidden" id="#{clientId}OpenedState" name="#{clientId}OpenedState" /> + + <div id="#{clientId}Container" + style="position: absolute; display: none; z-index: #{component.zindex}; background-color: inherit;" + class="rich-modalpanel" + x:passThruWithExclusions="id,style,class" + > + <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}Div" + style="z-index: 1;"></div> + <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}CursorDiv" + style="filter: alpha(opacity=1); opacity: 0.01; z-index: -200"></div> + + <div id="#{clientId}CDiv" class="dr-mpnl-panel rich-mpnl_panel" style="width: 1px; height: 1px; z-index: 2;"> + + <jsp:scriptlet> + <![CDATA[ + if (component.isResizeable()) { + for (int i = 0; i < RESIZERS.length; i++) { + variables.setVariable("resizer", RESIZERS[i]); + + boolean isHor = i / 3 % 2 == 0; + String style = isHor ? "width: 40px; height: 4px;" : "height: 40px; width: 4px;"; + + //higher z-index for corner elements + style += "z-index: " + (i % 3 == 1 ? 0 : 1) + 3 + ";"; + variables.setVariable("resizerStyle", style); + ]]> + </jsp:scriptlet> + <div id="#{clientId}Resizer#{resizer}" class="dr-mpnl-resizer rich-mpnl-resizer" style="#{resizerStyle}"> + </div> + <jsp:scriptlet> + <![CDATA[ + } + } + ]]> + </jsp:scriptlet> + + <div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow" + style="#{component.shadowStyle}" > + </div> + + <div style="position: absolute; overflow: hidden; z-index: 2;" class="dr-mpnl-pnl" id="#{clientId}ContentDiv"> - <a href="#" style="position: absolute; left: -32000" id="#{clientId}FirstHref" >_</a> - <table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0"> - <jsp:scriptlet> - <![CDATA[if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) {]]> - </jsp:scriptlet> - <tr style="height: 1%;"> - <td class="dr-mpnl-header rich-mpnl-header-cell" style="position: relative; vertical-align: middle; z-index: 5;" width="100%"> - <div id="#{clientId}Header" style="position: relative; white-space: nowrap;" class="dr-mpnl-pnl-text dr-mpnl-pnl-h rich-mpnl-text rich-mpnl-header #{component.attributes['headerClass']}"> - <u:insertFacet name="header" /> - </div> - - <jsp:scriptlet> - <![CDATA[if(component.getFacet("controls")!=null && component.getFacet("controls").isRendered()) {]]> - </jsp:scriptlet> - <div style="position: absolute; top: 3px; right: 3px;" class="dr-mpnl-pnl-text rich-mpnl-text rich-mpnl-controls #{component.attributes['controlsClass']}"> - <u:insertFacet name="controls" /> - </div> - <jsp:scriptlet> - <![CDATA[}]]> - </jsp:scriptlet> - </td> - </tr> - <jsp:scriptlet> - <![CDATA[}]]> - </jsp:scriptlet> - <tr> - <td class="dr-mpnl-pnl-b rich-mpnl-body" valign="top"> - <vcp:body> - <f:call name="renderChildren" /> + <a href="#" style="position: absolute; left: -32000" id="#{clientId}FirstHref" >_</a> + <table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0"> + <jsp:scriptlet> + <![CDATA[if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) {]]> + </jsp:scriptlet> + <tr style="height: 1%;"> + <td class="dr-mpnl-header rich-mpnl-header-cell" style="position: relative; vertical-align: middle; z-index: 5;" width="100%"> + <div id="#{clientId}Header" style="position: relative; white-space: nowrap;" class="dr-mpnl-pnl-text dr-mpnl-pnl-h rich-mpnl-text rich-mpnl-header #{component.attributes['headerClass']}"> + <u:insertFacet name="header" /> + </div> + + <jsp:scriptlet> + <![CDATA[if(component.getFacet("controls")!=null && component.getFacet("controls").isRendered()) {]]> + </jsp:scriptlet> + <div style="position: absolute; top: 3px; right: 3px;" class="dr-mpnl-pnl-text rich-mpnl-text rich-mpnl-controls #{component.attributes['controlsClass']}"> + <u:insertFacet name="controls" /> + </div> + <jsp:scriptlet> + <![CDATA[}]]> + </jsp:scriptlet> + </td> + </tr> + <jsp:scriptlet> + <![CDATA[}]]> + </jsp:scriptlet> + <tr> + <td class="dr-mpnl-pnl-b rich-mpnl-body" valign="top"> + <vcp:body> + <f:call name="renderChildren" /> </vcp:body> <f:clientid var="clientId"/> - <a href="#" style="position: absolute; left: -32001" id="#{clientId}LastHref" >_</a> - </td> - </tr> - </table> - </div> - </div> - - <script type="text/javascript"> - new ModalPanel('#{clientId}', - { - width: #{component.width}, - height: #{component.height}, - - minWidth: #{component.minWidth}, - minHeight: #{component.minHeight}, - - resizeable: #{component.resizeable}, - moveable: #{component.moveable}, - - left: "#{component.left}", - top: "#{component.top}", - - zindex: #{component.zindex}, - - onshow: #{onshow}, - onhide: #{onhide} - }); - </script> - </div> - </div> - + <a href="#" style="position: absolute; left: -32001" id="#{clientId}LastHref" >_</a> + </td> + </tr> + </table> + </div> + </div> + + <script type="text/javascript"> + new ModalPanel('#{clientId}', + { + width: #{component.width}, + height: #{component.height}, + + minWidth: #{component.minWidth}, + minHeight: #{component.minHeight}, + + resizeable: #{component.resizeable}, + moveable: #{component.moveable}, + + left: "#{component.left}", + top: "#{component.top}", + + zindex: #{component.zindex}, + + onshow: #{onshow}, + onhide: #{onhide}, + + keepState: #{component.keepState}, + showWhenRendered: #{component.showWhenRendered} + }); + </script> + </div> + </div> + <script type="text/javascript" > + #{this:getShowScript(context, component)} + </script> </f:template> \ No newline at end of file

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1463 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2007-07-04 09:13:57 -0400 (Wed, 04 Jul 2007) New Revision: 1463 Modified: trunk/docs/userguide/en/src/main/docbook/included/column.desc.xml trunk/docs/userguide/en/src/main/docbook/included/column.xml trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml trunk/docs/userguide/en/src/main/docbook/included/dataList.xml trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml trunk/docs/userguide/en/src/main/docbook/included/dragIndicator1.xml trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml trunk/docs/userguide/en/src/main/docbook/included/draggable.xml trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml trunk/docs/userguide/en/src/main/docbook/included/dropZone.xml trunk/docs/userguide/en/src/main/docbook/included/gmap.xml trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml trunk/docs/userguide/en/src/main/docbook/included/panel.xml trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml trunk/docs/userguide/en/src/main/docbook/included/panelBarItem.xml trunk/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml trunk/docs/userguide/en/src/main/docbook/included/separator.desc.xml trunk/docs/userguide/en/src/main/docbook/included/separator.xml trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml trunk/docs/userguide/en/src/main/docbook/included/spacer.xml trunk/docs/userguide/en/src/main/docbook/included/subTable.xml trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.desc.xml trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml trunk/docs/userguide/en/src/main/docbook/included/tab.xml trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml trunk/docs/userguide/en/src/main/docbook/included/toggleControl.desc.xml trunk/docs/userguide/en/src/main/docbook/included/toggleControl.xml trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml trunk/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml trunk/docs/userguide/en/src/main/docbook/included/tree.xml trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml Log: http://jira.jboss.org/jira/browse/EXIN-373 italic font style is added Modified: trunk/docs/userguide/en/src/main/docbook/included/column.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/column.desc.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/column.desc.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -21,8 +21,8 @@ <title>Key Features</title> <itemizedlist> <listitem>Completely skinned table rows and child elements</listitem> - <listitem>Possibility to combine columns with the help of <emphasis role="italic"><property>"colspan"</property></emphasis></listitem> - <listitem>Possibility to combine rows with the help of <emphasis role="italic"><property>"rowspan"</property></emphasis> and <emphasis role="italic"><property>"breakBefore"</property></emphasis></listitem> + <listitem>Possibility to combine columns with the help of <emphasis ><property>"colspan"</property></emphasis></listitem> + <listitem>Possibility to combine rows with the help of <emphasis ><property>"rowspan"</property></emphasis> and <emphasis ><property>"breakBefore"</property></emphasis></listitem> </itemizedlist> </section> </section> \ No newline at end of file Modified: trunk/docs/userguide/en/src/main/docbook/included/column.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/column.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/column.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -97,9 +97,9 @@ </mediaobject> </figure> <para>Now, in order to group columns with text information into one row in one column with a flag, use - the <emphasis role="italic"><property>"colspan"</property></emphasis> attribute, which is similar to an HTML one, specifying that the first column contains 3 columns. + the <emphasis ><property>"colspan"</property></emphasis> attribute, which is similar to an HTML one, specifying that the first column contains 3 columns. In addition, it's necessary to specify that the next column begins from the first row with the help of the - <emphasis role="italic"><property>"breakBefore"</property></emphasis> attribute = true.</para> + <emphasis ><property>"breakBefore"</property></emphasis> attribute = true.</para> <programlisting role="XML"><![CDATA[... <rich:dataTable value="#{capitalsBean.capitals}" var="cap" rows="5"> <rich:column colspan="3"> @@ -126,7 +126,7 @@ </imageobject> </mediaobject> </figure> - <para>The same way is used for <property>columns</property> grouping with the <emphasis role="italic"><property>"rowspan"</property></emphasis> + <para>The same way is used for <property>columns</property> grouping with the <emphasis ><property>"rowspan"</property></emphasis> attribute that is similar to an HTML one responsible for rows quantity definition occupied with the current one. The only thing to add in the example is an instruction to move onto the next row for each next after the second column.</para> <programlisting role="XML"><![CDATA[... @@ -165,14 +165,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all columns at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis - role="italic"><property>style classes</property></emphasis> used by the column to your page style sheets</listitem> + ><property>style classes</property></emphasis> used by the column to your page style sheets</listitem> </itemizedlist> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -68,7 +68,7 @@ <section> <title>Details of Usage</title> <para>The <emphasis role="bold"><property><rich:columnGroup></property></emphasis> component combines columns set wrapping them into the <emphasis role="bold"><property><tr></property></emphasis> element and outputting them - into one row. Columns are combined in a group the same way as when the <emphasis role="italic"><property>"breakBefore"</property></emphasis> attribute is used for + into one row. Columns are combined in a group the same way as when the <emphasis ><property>"breakBefore"</property></emphasis> attribute is used for columns to add a moving to the next rows, but the first variant is clearer from a source code. Hence, the following simple examples are very same.</para> <programlisting role="XML"><![CDATA[... @@ -150,14 +150,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all columnGroups at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis - role="italic"><property>style classes</property></emphasis> used by the columnGroup to your page style sheets</listitem> + ><property>style classes</property></emphasis> used by the columnGroup to your page style sheets</listitem> </itemizedlist> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -67,7 +67,7 @@ similar to ordinary UIData components output ways:</para> <itemizedlist> <listitem>A header and footer output</listitem> -<listitem>Limitation of the output elements (the <emphasis role="italic"><property>"elements"</property></emphasis> attribute) and definition of the first +<listitem>Limitation of the output elements (the <emphasis ><property>"elements"</property></emphasis> attribute) and definition of the first element</listitem> <listitem>Binding to scrolling components of list pages</listitem> </itemizedlist> @@ -89,14 +89,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all dataDefinitionList at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis - role="italic"><property>style classes</property></emphasis> used by the dataDefinitionList to your page style sheets</listitem> + ><property>style classes</property></emphasis> used by the dataDefinitionList to your page style sheets</listitem> </itemizedlist> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -59,7 +59,7 @@ <section> <title>Details of Usage</title> <para>The <property>dataFilterSlider</property> component is bound to some UIData component using a - <emphasis role="italic"><property>"for"</property></emphasis> attribute and + <emphasis ><property>"for"</property></emphasis> attribute and filters data in this table. </para> <para><emphasis role="bold">Example:</emphasis></para> <programlisting role="XML"><![CDATA[... @@ -81,27 +81,27 @@ <para>In this example other two attributes are used for filtering:</para> <itemizedlist> <listitem> - <emphasis role="italic"><property>"forValRef"</property></emphasis> is a string + <emphasis ><property>"forValRef"</property></emphasis> is a string which is used in a value attribute of the target UIData component. It's designed for resetting the UIData component back to the original list provided by a backing bean. </listitem> <listitem> - <emphasis role="italic"><property>"filterBy"</property></emphasis> is a getter of + <emphasis ><property>"filterBy"</property></emphasis> is a getter of an object member that is to be compared to a slider value. It's a value that is used in results filtering. </listitem> </itemizedlist> -<para><emphasis role="italic"><property>"handleValue"</property></emphasis> is an attribute +<para><emphasis ><property>"handleValue"</property></emphasis> is an attribute for keeping the current handler position on the <property>dataFilterSlider</property> component. Based on the current value, appropriate values obtained from a getter method defined in - <emphasis role="italic"><property>"filterBy"</property></emphasis> are + <emphasis ><property>"filterBy"</property></emphasis> are filtered.</para> <para>One more important attribute is a -<emphasis role="italic"><property>"storeResults"</property></emphasis> one that allows the +<emphasis ><property>"storeResults"</property></emphasis> one that allows the <property>dataFilterSlider</property> component to keep UIData target object in session.</para> <para>If it's necessary the component submits a form on event of a handler state changing, use -the <emphasis role="italic"><property>"onSlide"</property></emphasis> attribute -(<emphasis role="italic"><property>"onChange"</property></emphasis> is its alias). When +the <emphasis ><property>"onSlide"</property></emphasis> attribute +(<emphasis ><property>"onChange"</property></emphasis> is its alias). When the attribute definition = true, submission on this event is defined.</para> <para> <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataFilterSlider.jsf?...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dataFilterSlider></emphasis> usage and sources for the given example. Modified: trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -67,7 +67,7 @@ The component also has similar to ordinary UIData components output ways.</para> <itemizedlist> <listitem>A header and footer output</listitem> -<listitem>Limitation of the output elements (the <emphasis role="italic"><property>"elements"</property></emphasis> attribute) and definition of the first +<listitem>Limitation of the output elements (the <emphasis ><property>"elements"</property></emphasis> attribute) and definition of the first element</listitem> <listitem>Binding to scrolling components of list pages</listitem> </itemizedlist> @@ -93,14 +93,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all dataGrids at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis - role="italic"><property>style classes</property></emphasis> used by the dataGrid to your page style sheets</listitem> + ><property>style classes</property></emphasis> used by the dataGrid to your page style sheets</listitem> </itemizedlist> </section> @@ -111,7 +111,7 @@ <para>To redefine an appearance of all <property>dataGrids</property> on a page, redefine the corresponding class in the CSS file used with the page.</para> - <para>To redefine a style of a particular table, use <emphasis role="italic"><property>"component class"</property></emphasis> attributes which list is the same + <para>To redefine a style of a particular table, use <emphasis ><property>"component class"</property></emphasis> attributes which list is the same as the <property>dataTable</property> one and is known to you.</para> </section> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dataList.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dataList.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dataList.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -67,11 +67,11 @@ similar to ordinary UIData components output ways:</para> <itemizedlist> <listitem>A header and footer output</listitem> -<listitem>Limitation of the output elements (the <emphasis role="italic"><property>"elements"</property></emphasis> attribute) and definition of the first +<listitem>Limitation of the output elements (the <emphasis ><property>"elements"</property></emphasis> attribute) and definition of the first element</listitem> <listitem>Binding to scrolling components of list pages</listitem> </itemizedlist> - <para>The component has the <emphasis role="italic"><property>"type"</property></emphasis> attribute corresponding to the "ul" HTML element.</para> + <para>The component has the <emphasis ><property>"type"</property></emphasis> attribute corresponding to the "ul" HTML element.</para> <para>The component is created basing on the <emphasis role="bold"><property><a4j:repeat></property></emphasis> component and as a result the component could be partially updated with AJAX.</para> <programlisting role="XML"><![CDATA[... @@ -89,14 +89,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all dataLists at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis - role="italic"><property>style classes</property></emphasis> used by the dataList to your page style sheets</listitem> + ><property>style classes</property></emphasis> used by the dataList to your page style sheets</listitem> </itemizedlist> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -66,11 +66,11 @@ similar to ordinary UIData components output ways:</para> <itemizedlist> <listitem>Header and footer output</listitem> -<listitem>Limitation of the output elements (the <emphasis role="italic"><property>"elements"</property></emphasis> attribute) and definition of the first +<listitem>Limitation of the output elements (the <emphasis ><property>"elements"</property></emphasis> attribute) and definition of the first element</listitem> <listitem>Binding to scrolling components of list pages</listitem> </itemizedlist> - <para>The component has the <emphasis role="italic"><property>"type"</property></emphasis> attribute corresponding to the "ul" HTML element.</para> + <para>The component has the <emphasis ><property>"type"</property></emphasis> attribute corresponding to the "ul" HTML element.</para> <para>The component is created basing on the <emphasis role="bold"><property><a4j:repeat></property></emphasis> component and as a result the component could be partially updated with AJAX.</para> <programlisting role="XML"><![CDATA[... @@ -88,14 +88,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all dataOrderedLists at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis - role="italic"><property>style classes</property></emphasis> used by the dataOrderedList to your page style sheets</listitem> + ><property>style classes</property></emphasis> used by the dataOrderedList to your page style sheets</listitem> </itemizedlist> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -72,7 +72,7 @@ <para>Skins support is described in the <link linkend="ArchitectureOverview">corresponding section</link>. AJAX support is possible because the component is created basing on the <emphasis role="bold"><property><a4j:repeat></property></emphasis> component and as a result the component has its possibilities of AJAX updates for a limited set of strings. - The component is implemented with the <emphasis role="italic"><property>"ajaxKeys"</property></emphasis> attribute for a <property>table</property> and in contrast to + The component is implemented with the <emphasis ><property>"ajaxKeys"</property></emphasis> attribute for a <property>table</property> and in contrast to the <emphasis role="bold"><property><a4j:repeat></property></emphasis> outputs the standard HTML structure for table rendering.</para> <programlisting role="XML"><![CDATA[... <rich:dataTable value="#{capitalsBean.capitals}" var="capitals" @@ -94,14 +94,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all dataTables at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the dataTable to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the dataTable to your page style sheets</listitem> </itemizedlist> </section> <section> @@ -179,7 +179,7 @@ </table> <para>To redefine an appearance of all <property>tables</property> on a page, redefine the corresponding class in the CSS file used with the page.</para> - <para>To redefine a style of a particular page, use <emphasis role="italic"><property>"component class"</property></emphasis> attributes which list is the same + <para>To redefine a style of a particular page, use <emphasis ><property>"component class"</property></emphasis> attributes which list is the same as the <property>dataTable</property> one and is known to you.</para> </section> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -68,11 +68,11 @@ <para>The <emphasis role="bold"><property><rich:Datascroller></property></emphasis> component provides table scrolling functionality the same as tomahawk scroller but with AJAX requests usage.</para> <para>The component should be placed into footer of the parent table or be bound to it with the - <emphasis role="italic"><property>"for"</property></emphasis> attribute.</para> - <para>The table should also have the defined <emphasis role="italic"><property>"rows"</property></emphasis> attribute limiting the quantity of inputted + <emphasis ><property>"for"</property></emphasis> attribute.</para> + <para>The table should also have the defined <emphasis ><property>"rows"</property></emphasis> attribute limiting the quantity of inputted table rows.</para> <para>The scroller could limit the maximum quantity of rendered links on the table pages with the - help of the <emphasis role="italic"><property>"maxPages"</property></emphasis> attribute.</para> + help of the <emphasis ><property>"maxPages"</property></emphasis> attribute.</para> <para>Component provides two controllers groups for switching:</para> <itemizedlist> <listitem>Page numbers for switching onto a particular page</listitem> @@ -104,7 +104,7 @@ </mediaobject> </figure> <para>The screenshot shows one controller from each group.</para> - <para>For the <property>"fastforward"</property>/<property>"rewind"</property> controls customization the additional <emphasis role="italic"><property>"fastStep"</property></emphasis> attribute is used. + <para>For the <property>"fastforward"</property>/<property>"rewind"</property> controls customization the additional <emphasis ><property>"fastStep"</property></emphasis> attribute is used. The attribute indicates pages quantity to switch onto when fast scrolling is used. </para> <para> <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTableScroller.jsf...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dataScroller></emphasis> usage and sources for the given example. @@ -113,14 +113,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property>.</emphasis></para> +><property>style class redefinition method</property>.</emphasis></para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all dataScrollers at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the dataScroller to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the dataScroller to your page style sheets</listitem> </itemizedlist> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -92,14 +92,14 @@ <section> <title>Indicator icon element</title> <para>Inside the component there also could be definitions for three faces with - <emphasis role="italic"><property>"accept"</property>,</emphasis> - <emphasis role="italic"><property>"reject"</property></emphasis> and - <emphasis role="italic"><property>"default"</property></emphasis> names that specify icons on the left side according to states when an + <emphasis ><property>"accept"</property>,</emphasis> + <emphasis ><property>"reject"</property></emphasis> and + <emphasis ><property>"default"</property></emphasis> names that specify icons on the left side according to states when an <property>indicator</property> is above:</para> <itemizedlist> <listitem> a drop zone that processes the facets written in the - <emphasis role="italic"><property>"acceptedTypes"</property></emphasis> attribute + <emphasis ><property>"acceptedTypes"</property></emphasis> attribute of this drop zone </listitem> <listitem> @@ -119,7 +119,7 @@ <para>Each of these three facets have a default structure for icons rendering on the left side.</para> <para>When it's necessary to define individual icons for dragged above elements of a <property>drop zone</property> from each particular drag area, use a <property>drop zone</property> - <emphasis role="italic"><property>"typeMapping"</property></emphasis> attribute for the + <emphasis ><property>"typeMapping"</property></emphasis> attribute for the corresponding icons.</para> <programlisting role="XML"><![CDATA[... <rich:dropSupport acceptedTypes="[iconsDragged, textDragged]" typeMapping="{iconsDragged: DropIcon}"> @@ -131,7 +131,7 @@ ]]></programlisting> <para>Here, drag areas that are to be processed with this drop zone are of iconsDragged and textDragged type. An icon is redefined for iconsDragged with the help of the drop zone - <emphasis role="italic"><property>"typeMapping"</property></emphasis> attribute + <emphasis ><property>"typeMapping"</property></emphasis> attribute defined with the <emphasis role="bold"><property><rich:dndParam></property></emphasis>component.</para> <para> <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dra...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dragIndicator></emphasis> usage and sources for the given example. Modified: trunk/docs/userguide/en/src/main/docbook/included/dragIndicator1.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dragIndicator1.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dragIndicator1.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -90,14 +90,14 @@ <section> <title>Indicator icon element</title> <para>Inside the component there also could be definitions for three faces with - <emphasis role="italic"><property>"accept"</property>,</emphasis> - <emphasis role="italic"><property>"reject"</property></emphasis> and - <emphasis role="italic"><property>"default"</property></emphasis> names that specify icons on the left side according to states when an + <emphasis ><property>"accept"</property>,</emphasis> + <emphasis ><property>"reject"</property></emphasis> and + <emphasis ><property>"default"</property></emphasis> names that specify icons on the left side according to states when an <property>indicator</property> is above:</para> <itemizedlist> <listitem> a drop zone that processes the facets written in the - <emphasis role="italic"><property>"acceptedTypes"</property></emphasis> attribute + <emphasis ><property>"acceptedTypes"</property></emphasis> attribute of this drop zone </listitem> <listitem> @@ -116,7 +116,7 @@ <para>Each of these three facets have a default structure for icons rendering on the left side.</para> <para>When it's necessary to define individual icons for dragged above elements of a <property>drop zone</property> from each particular drag area, use the <property>drop zone</property> - <emphasis role="italic"><property>"typeMapping"</property></emphasis> attribute for the + <emphasis ><property>"typeMapping"</property></emphasis> attribute for the corresponding icons.</para> <programlisting role="XML"><![CDATA[<rich:dropSupport acceptedTypes="[iconsDragged, textDragged]" typeMapping="{iconsDragged: DropIcon}"> @@ -128,7 +128,7 @@ ]]></programlisting> <para>Here, drag areas that are to be processed with this drop zone are of iconsDragged and textDragged type. An icon is redefined for iconsDragged with the help of the drop zone - <emphasis role="italic"><property>"typeMapping"</property></emphasis> attribute + <emphasis ><property>"typeMapping"</property></emphasis> attribute defined with the <emphasis role="bold"><property><rich:dndParam></property></emphasis>component.</para> </section> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -121,7 +121,7 @@ <para>This code makes all rows of this column draggable.</para> <para>One of the main attributes for <property>dragSupport</property> is - <emphasis role="italic"><property>"dragType"</property>,</emphasis> which + <emphasis ><property>"dragType"</property>,</emphasis> which associates a name with the drag zone. Only drop zones with this name as an acceptable type can be used in drag-and-drop operations. Here is an example:</para> @@ -153,14 +153,14 @@ drop.</para> <para>The <property>dragSupport</property> component also has a <emphasis - role="italic"> + > <property>"value"</property> </emphasis> attribute for passing data into the processing after a drop event.</para> <para>One more important attribute for <emphasis role="bold"> <property><rich:dragSupport></property> - </emphasis> is the <emphasis role="italic"> + </emphasis> is the <emphasis > <property>"dragIndicator"</property> </emphasis> attribute that point to the component id of the <emphasis role="bold"> Modified: trunk/docs/userguide/en/src/main/docbook/included/draggable.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/draggable.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/draggable.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -64,7 +64,7 @@ </section> <section> <title>Details of Usage</title> - <para>As it shown in the example, a key attribute is <emphasis role="italic"><property>"dragType"</property></emphasis>, where a name for an obtaining Drag-area is defined. Basing on this name, Drop-zones on a page decide whether to accept Drag-area content or not (with the help of Drag-areas lists accepted for processing that are defined in Drop-zones).</para> + <para>As it shown in the example, a key attribute is <emphasis ><property>"dragType"</property></emphasis>, where a name for an obtaining Drag-area is defined. Basing on this name, Drop-zones on a page decide whether to accept Drag-area content or not (with the help of Drag-areas lists accepted for processing that are defined in Drop-zones).</para> <para><emphasis role="bold">Example:</emphasis></para> <programlisting role="XML"><![CDATA[... <rich:draggable dragType="dragTextBlocks"> @@ -82,7 +82,7 @@ <para>The example shows that Drop zone calls the corresponding drop event processing in it, only if a drop is generated from the second drop zone. </para> <para>Another important attribute for - <emphasis role="bold"><property><rich:draggable></property></emphasis> is <emphasis role="italic"><property>"dragIndicator"</property></emphasis> where the + <emphasis role="bold"><property><rich:draggable></property></emphasis> is <emphasis ><property>"dragIndicator"</property></emphasis> where the <emphasis role="bold"><property><rich:dragIndicator></property></emphasis> component id is defined for this drag area. If it isn't defined drag area creates a default indicator for drag operation. Additional information on <emphasis role="bold"> <property><rich:dragIndicator></property> @@ -106,7 +106,7 @@ <para>As it has been mention above, the component defines components wrapper for drag areas, i.e. it doesn't has its own representation. Therefore, for customization of a wrapper <emphasis role="bold"><property><div></property></emphasis> element of the component it's - possible to use a component attribute <emphasis role="italic"><property>"styleClass"</property></emphasis> or + possible to use a component attribute <emphasis ><property>"styleClass"</property></emphasis> or redefine rich-draggable class in your own CSS files that is added to all <property>draggable</property> components style on default.</para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -86,14 +86,14 @@ <para>As shown in the example, the key attribute for <emphasis role="bold"> <property><rich:dropSupport></property> - </emphasis> is <emphasis role="italic"> + </emphasis> is <emphasis > <property>"acceptedTypes"</property> </emphasis>. This attribute defines the types of draggable items that can be dropped onto the designated drop zone.</para> <para>The second most important attribute for <emphasis role="bold"> <property><rich:dropSupport></property> - </emphasis> is <emphasis role="italic"> + </emphasis> is <emphasis > <property>"typeMapping"</property> </emphasis>. This attribute maps a specific type among the acceptable types for draggable items to a specific <emphasis role="bold"> @@ -195,9 +195,9 @@ <para>As with every AJAX action component, <emphasis role="bold"> <property><rich:dropSupport></property> </emphasis> has all the common attributes (<emphasis - role="italic"><property>"timeout"</property>,</emphasis> <emphasis - role="italic"><property>"limitToList"</property>,</emphasis> <emphasis - role="italic"><property>"reRender"</property>,</emphasis> etc.) for AJAX + ><property>"timeout"</property>,</emphasis> <emphasis + ><property>"limitToList"</property>,</emphasis> <emphasis + ><property>"reRender"</property>,</emphasis> etc.) for AJAX request customization. To get detailed information on these attributes, read the <ulink url="http://labs.jboss.com/file-access/default/members/jbossajax4jsf/freezone/...">Ajax4jsf Modified: trunk/docs/userguide/en/src/main/docbook/included/dropZone.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dropZone.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/dropZone.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -69,14 +69,14 @@ <section> <title>Details of Usage</title> <para>As it's shown in the example, a key attribute is - <emphasis role="italic"><property>"acceptedTypes"</property></emphasis>, where some + <emphasis ><property>"acceptedTypes"</property></emphasis>, where some Drag-zones names of drop elements responsible for drop-zone processing are defined, i.e. in the example of component creation on a page, drop zone calls the corresponding drop event processing, only if a drop comes from the above mentioned drag zone of the corresponding type. All zones of another type are ignored.</para> <para>Another important attribute for <emphasis role="bold"><property><rich:dropZone></property></emphasis> is - <emphasis role="italic"><property>"typeMapping"</property></emphasis>, where + <emphasis ><property>"typeMapping"</property></emphasis>, where corresponding order of <emphasis role="bold"><property><rich:dndParam></property></emphasis> wrapping is defined for a drop from each drag-zone type</para> <para><emphasis role="bold">Example:</emphasis></para> @@ -93,19 +93,19 @@ <para>Thus, here is a drag zone indicator of iconsDragged type that obtains DropIcon parameter the same one as richParam gets. </para> <para>As any AJAX action, <property>dropZone</property> has all custom attributes of AJAX requests - customization (<emphasis role="italic"><property>"timeout"</property></emphasis>, - <emphasis role="italic"><property>"limitToList"</property></emphasis>, - <emphasis role="italic"><property>"reRender"</property></emphasis>, etc). To read more + customization (<emphasis ><property>"timeout"</property></emphasis>, + <emphasis ><property>"limitToList"</property></emphasis>, + <emphasis ><property>"reRender"</property></emphasis>, etc). To read more about the attributes, follow <ulink url="https://ajax4jsf.dev.java.net/nonav/documentation/ajax-documentation/">Ajax4jsf Developer Guide </ulink>link.</para> <para>For <property>dropZone</property> layout could be defined with a - <emphasis role="italic"><property>"layout"</property></emphasis> attribute with inline + <emphasis ><property>"layout"</property></emphasis> attribute with inline (default) and block values.</para> <para>As any action component <emphasis role="bold"><property><rich:dropZone></property></emphasis> has server-side action Listener defined with - <emphasis role="italic"><property>"dropListener"</property></emphasis> attribute as + <emphasis ><property>"dropListener"</property></emphasis> attribute as well as a definition of attributes for all required events processing on the client:</para> <itemizedlist> <listitem> @@ -124,7 +124,7 @@ <para>As it has been mention above, the component defines a components wrapper for drag areas, i.e. it doesn't have its own representation. Therefore, for a wrapper <emphasis role="bold"><property><div></property></emphasis> element customization it's - possible to use a component attribute <emphasis role="italic"><property>"styleClass"</property></emphasis> or + possible to use a component attribute <emphasis ><property>"styleClass"</property></emphasis> or redefine a rich-dropzone class in your own CSS files that is added to all <property>dropZone</property> components style on default.</para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -60,33 +60,33 @@ </section> <section> <title>Details of Usage</title> - <para>To use <emphasis role="italic"><property>Google Map</property></emphasis> in your + <para>To use <emphasis ><property>Google Map</property></emphasis> in your application, generate a key on <ulink url="http://google.com/apis/maps">Google Map official resource</ulink>. One key could be used for one directory on the server.</para> <para>Here are the main settings of initial rendering performed with a component <property>map</property> that are accessible with the following attributes:</para> <itemizedlist> <listitem> - <emphasis role="italic"><property>"zoom"</property></emphasis> defines an + <emphasis ><property>"zoom"</property></emphasis> defines an approximation size (boundary values 1-18) </listitem> <listitem> - <emphasis role="italic"><property>"lat"</property></emphasis> specifies an initial + <emphasis ><property>"lat"</property></emphasis> specifies an initial latitude coordinate in degrees, as a number between -90 and +90 </listitem> <listitem> - <emphasis role="italic"><property>"lng"</property></emphasis> specifies an initial + <emphasis ><property>"lng"</property></emphasis> specifies an initial longitude coordinate in degrees, as a number between -180 and +180 </listitem> <listitem> - <emphasis role="italic"><property>"mapType"</property></emphasis> specifies a type + <emphasis ><property>"mapType"</property></emphasis> specifies a type of a rendered map (G_NORMAL_MAP, G_SATELLITE_MAP (DEFAULT), G_HYBRID_MAP) </listitem> </itemizedlist> <para>For example, the city of Paris is shown after rendering with the following - initial settings: <emphasis role="italic"><property>"lat"</property></emphasis>= 48.44, - <emphasis role="italic"><property>"lng"</property></emphasis>= 2.24 and - <emphasis role="italic"><property>"zoom"</property></emphasis>= 5.</para> + initial settings: <emphasis ><property>"lat"</property></emphasis>= 48.44, + <emphasis ><property>"lng"</property></emphasis>= 2.24 and + <emphasis ><property>"zoom"</property></emphasis>= 5.</para> <figure> <title>Gmap initial rendering</title> <mediaobject> @@ -100,15 +100,15 @@ of the attributes:</para> <itemizedlist> <listitem> - <emphasis role="italic"><property>"showGMapTypeControl"</property></emphasis> + <emphasis ><property>"showGMapTypeControl"</property></emphasis> determines whether the controls for a map type definition are switched on </listitem> <listitem> - <emphasis role="italic"><property>"showGScaleControl"</property></emphasis> + <emphasis ><property>"showGScaleControl"</property></emphasis> determines whether the controls for scaling are switched on </listitem> <listitem> - <emphasis role="italic"><property>"showGLargeMapControl"</property></emphasis> + <emphasis ><property>"showGLargeMapControl"</property></emphasis> determines whether the control for <property>map</property> scale rendering is rendered </listitem> </itemizedlist> @@ -122,11 +122,11 @@ </figure> <para>To set all these parameters and perform some activity (Zoom In/Out etc.) is possible with your JavaScript, i.e. declare a name of an object on a <property>map</property> in the -<emphasis role="italic"><property>"gmapVar"</property></emphasis> attribute +<emphasis ><property>"gmapVar"</property></emphasis> attribute and then call the object directly with API -<emphasis role="italic"><property>Google Map</property>.</emphasis></para> +<emphasis ><property>Google Map</property>.</emphasis></para> <para>For example, to approximate a map for - <emphasis role="italic"><property>"gmapVar"</property></emphasis>= <property>"map"</property> + <emphasis ><property>"gmapVar"</property></emphasis>= <property>"map"</property> declared inside the component, call map.zoomIn() on an event.</para> <para>Moreover, to add e.g. some JavaScript effects, events defined on it are used.</para> <itemizedlist> @@ -151,7 +151,7 @@ <title>Look-and-Feel Customization</title> <para><property>Gmap</property> component isn't tied to skin parameters, as there is no additional elements on it, except the ones provided with - <emphasis role="italic"><property>Google Map</property>.</emphasis></para> + <emphasis ><property>Google Map</property>.</emphasis></para> </section> <section> <title>Definition custom style classes:</title> Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -63,11 +63,11 @@ used to facilitate user data input with rich UI Controls.</para> <para>Here is the simplest variant of a slider definition with <emphasis -role="italic"><property>"minValue"</property>,</emphasis> <emphasis +><property>"minValue"</property>,</emphasis> <emphasis -role="italic"><property>"maxValue"</property></emphasis> and <emphasis +><property>"maxValue"</property></emphasis> and <emphasis -role="italic"><property>"step"</property></emphasis> (on default = "1") attributes, +><property>"step"</property></emphasis> (on default = "1") attributes, which define the beginning and the end of a numerical area and a <property>slider</property> property step.</para> @@ -83,11 +83,11 @@ </mediaobject> </figure> <para> - Using <emphasis role="italic"><property>"showInput"</property></emphasis> (default is true) and - <emphasis role="italic"><property>"enableManualInput"</property></emphasis> (default value is + Using <emphasis ><property>"showInput"</property></emphasis> (default is true) and + <emphasis ><property>"enableManualInput"</property></emphasis> (default value is true) attributes, it's possible to output the input area near the slider, and make it read-only or editable.</para> - <para>To remove input area use <emphasis role="italic"><property>"showInput="false"</property></emphasis>:</para> + <para>To remove input area use <emphasis ><property>"showInput="false"</property></emphasis>:</para> <programlisting role="XML"><![CDATA[<rich:inputNumberSlider minValue="1" maxValue="100" showInput="false"/>]]></programlisting> <para>It looks at page like:</para> <figure> @@ -100,8 +100,8 @@ </figure> <para>It's also possible to switch off displaying of "boundary values" and a tooltip showing on a handle drawing. This could be performed with the help of the component defined - attributes: <emphasis role="italic"><property>"showBoundaryValues"</property></emphasis> which is responsible for -"boundary values" displaying (default is true) and <emphasis role="italic"><property>"showToolTip"</property></emphasis> which is responsible for + attributes: <emphasis ><property>"showBoundaryValues"</property></emphasis> which is responsible for +"boundary values" displaying (default is true) and <emphasis ><property>"showToolTip"</property></emphasis> which is responsible for tooltip displaying (default is true).</para> <para>Moreover, to add e.g. some JavaScript effects, events defined on it are used.</para> @@ -132,14 +132,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all inputNumberSliders at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the inputNumberSlider to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the inputNumberSlider to your page style sheets</listitem> </itemizedlist> <table> <title>Skin parameters redefinition:</title> Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -10,7 +10,7 @@ <para>A single line input field that lets selecting a number using controls near a text field. It's possible to change a value using "Up/Down" keyboard keys. The keyboard input in a field is possible if it isn't locked by the - <emphasis role="italic"><property>"manualInput"</property></emphasis> + <emphasis ><property>"manualInput"</property></emphasis> attribute. When arrow controls are pressed, the cursor can be moved in any way without losing a dragged state.</para> <figure> Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -63,12 +63,12 @@ <para><emphasis role="bold"><property><rich:inputNumberSpinner></property></emphasis> is used to facilitate user data input with rich UI Controls.</para> <para>Here is the simplest variant of <property>spinner</property> definition with <emphasis -role="italic"><property>"minValue"</property>,</emphasis> <emphasis +><property>"minValue"</property>,</emphasis> <emphasis -role="italic"><property>"maxValue"</property></emphasis> +><property>"maxValue"</property></emphasis> and <emphasis -role="italic"><property>"step"</property></emphasis> (on default = "1") attributes, which define the beginning and the end of numerical area +><property>"step"</property></emphasis> (on default = "1") attributes, which define the beginning and the end of numerical area and a <property>spinner</property> step.</para> <para><emphasis role="bold">Example:</emphasis></para> <programlisting role="XML"><![CDATA[... @@ -87,13 +87,13 @@ <para>There are also several attributes to define functional peculiarities:</para> <itemizedlist> <listitem> - <emphasis role="italic"><property>"cycled"</property></emphasis> if the attribute is "true" after the current value reaches the border value it's be reversed to another border value after next increasing/decreasing. In other case possibilities of next increasing/decreasing are locked + <emphasis ><property>"cycled"</property></emphasis> if the attribute is "true" after the current value reaches the border value it's be reversed to another border value after next increasing/decreasing. In other case possibilities of next increasing/decreasing are locked </listitem> <listitem> - <emphasis role="italic"><property>"disabled"</property></emphasis> is an attribute that defines whether a component is active on a page + <emphasis ><property>"disabled"</property></emphasis> is an attribute that defines whether a component is active on a page </listitem> <listitem> - <emphasis role="italic"><property>"manualInput"</property></emphasis> is an attribute that defines whether a keyboard input is possible or only UI controls could be used</listitem> + <emphasis ><property>"manualInput"</property></emphasis> is an attribute that defines whether a keyboard input is possible or only UI controls could be used</listitem> </itemizedlist> <para>Moreover, to add e.g. some JavaScript effects, events defined on it are used</para> <itemizedlist> @@ -123,14 +123,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all inputNumberSpinners at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the inputNumberSpinner to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the inputNumberSpinner to your page style sheets</listitem> </itemizedlist> <table> <title>Skin parameters redefinition:</title> @@ -233,7 +233,7 @@ <para>To redefine appearance of the particular <property>spinner</property>, it's possible to define your own CSS class. Then it's necessary just to define it in one of the <emphasis -role="italic"><property>"components class"</property></emphasis> +><property>"components class"</property></emphasis> attributes modifying component style properties.</para> <para><emphasis role="bold">Example:</emphasis></para> <para>CSS code piece used on the page:</para> Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -183,27 +183,27 @@ </mediaobject> </figure> - <para>To manage the placement of inserted windows, use the <emphasis role="italic"> + <para>To manage the placement of inserted windows, use the <emphasis > <property>"zindex"</property> </emphasis> attribute that is similar to the standard HTML attribute and can specify window placement relative to the content.</para> - <para>To manage window placement relative to the component, there are <emphasis role="italic"> + <para>To manage window placement relative to the component, there are <emphasis > <property>"left"</property> - </emphasis> and <emphasis role="italic"> + </emphasis> and <emphasis > <property>"top"</property> </emphasis> attributes defining a window shifting relative to the top-left corner of the window.</para> <para>Modal windows can also support resize and move operations on the client side. To allow or - disallow these operations, set the <emphasis role="italic"> + disallow these operations, set the <emphasis > <property>"resizeable"</property> - </emphasis> and <emphasis role="italic"> + </emphasis> and <emphasis > <property>"moveable"</property> </emphasis> attributes to "true" or "false" values. Window - resizing is also limited by <emphasis role="italic"> + resizing is also limited by <emphasis > <property>"minWidth"</property> - </emphasis> and <emphasis role="italic"> + </emphasis> and <emphasis > <property>"minHeight"</property> </emphasis> attributes specifying the minimal window sizes.</para> <para> You can pass your parameters during modalPanel opening or closing. This passing could be @@ -225,9 +225,9 @@ <section> <title>Look-and-Feel Customization</title> - <para>For implementing skinnability the components use a <emphasis role="italic"> + <para>For implementing skinnability the components use a <emphasis > <property>style class redefinition method</property> -</emphasis>. Default style classes are mapped on <emphasis role="italic"><property>skin +</emphasis>. Default style classes are mapped on <emphasis ><property>skin parameters</property>.</emphasis></para> <para>There are two ways to redefine the appearance of all modal panels at once:</para> @@ -235,7 +235,7 @@ <itemizedlist> <listitem>Redefine the corresponding skin parameters</listitem> - <listitem>Add <emphasis role="italic"> + <listitem>Add <emphasis > <property>style classes</property> </emphasis> used by modalPanel to your page style sheets</listitem> </itemizedlist> Modified: trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -51,10 +51,10 @@ ]]></programlisting> <para>Here <emphasis -role="italic"><property>"paint"</property></emphasis> specifies the method performing +><property>"paint"</property></emphasis> specifies the method performing drawing and <emphasis -role="italic"><property>"data"</property></emphasis> specifies Managed Bean property keeping the data used by the method.</para> +><property>"data"</property></emphasis> specifies Managed Bean property keeping the data used by the method.</para> </section> <section> <title>Creating the Component Dynamically Using Java</title> @@ -69,11 +69,11 @@ <para>The example shows two main attributes of the component:</para> <itemizedlist> <listitem> - <para><emphasis role="italic"><property>"paint"</property></emphasis></para> + <para><emphasis ><property>"paint"</property></emphasis></para> <para>Specify a method receiving an object specified in data as a parameter and sending graphical information into the stream</para> </listitem> <listitem> - <para><emphasis role="italic"><property>"data"</property></emphasis></para> + <para><emphasis ><property>"data"</property></emphasis></para> <para>Specifies a bean class keeping user's data for rendering</para> </listitem> </itemizedlist> @@ -82,18 +82,18 @@ <title>Note:</title>data object should implement serializable interface </note> </para> - <para>The <emphasis role="italic"><property>"format"</property></emphasis> attribute of + <para>The <emphasis ><property>"format"</property></emphasis> attribute of the component defines a format of visual data passing to the server.</para> <para>Generated data can be used as a cacheable or non-cacheable resource. It's defined with <emphasis -role="italic"><property>"cacheable"</property></emphasis> attribute. +><property>"cacheable"</property></emphasis> attribute. If cache support is turned on, a key is created in URI with a mix of size (width/height), <emphasis -role="italic"><property>"paint"</property></emphasis> method, <emphasis +><property>"paint"</property></emphasis> method, <emphasis -role="italic"><property>"format"</property></emphasis> and <emphasis +><property>"format"</property></emphasis> and <emphasis -role="italic"><property>"data"</property></emphasis> attributes.</para> +><property>"data"</property></emphasis> attributes.</para> <para>Example:</para> <programlisting role="JAVA"><![CDATA[paintBean.java: @@ -129,13 +129,13 @@ <section> <title>Look-and-Feel Customization</title> <para><property>Paint2D</property> has no skin parameters and special - <emphasis role="italic"><property>style classes</property>, </emphasis> as it consists + <emphasis ><property>style classes</property>, </emphasis> as it consists of one element generated with a user's method on the server.</para> <para>To define some style properties such as an indent or a border, it's possible to use <emphasis -role="italic"><property>"style"</property></emphasis> - and <emphasis role="italic"><property>"styleClass"</property></emphasis> attributes +><property>"style"</property></emphasis> + and <emphasis ><property>"styleClass"</property></emphasis> attributes on the component.</para> </section> </section> \ No newline at end of file Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -147,14 +147,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property>.</emphasis></para> +><property>style class redefinition method</property>.</emphasis></para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all panels at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the panel to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the panel to your page style sheets</listitem> </itemizedlist> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -72,9 +72,9 @@ thus its customization deals only with specification of sizes and styles for rendering.</para> <para><emphasis -role="italic"><property>"width"</property></emphasis> and <emphasis +><property>"width"</property></emphasis> and <emphasis -role="italic"><property>"height"</property></emphasis> (both are 100% on default) attributes stand apart.</para> +><property>"height"</property></emphasis> (both are 100% on default) attributes stand apart.</para> <para>Style attributes are described further.</para> <para><property>panelBar</property> could contain any number of child <property>panelBarItem</property> components inside, which content is uploaded onto the client and headers are controls to open the corresponding child element.</para> <para> @@ -84,14 +84,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property>.</emphasis></para> +><property>style class redefinition method</property>.</emphasis></para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all panelBars at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the panelBar to your page style sheets (<property>PanelBar</property> +><property>style classes</property></emphasis> used by the panelBar to your page style sheets (<property>PanelBar</property> itself has no properties mapped on a skin, it's described for its children).</listitem> </itemizedlist> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/panelBarItem.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panelBarItem.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/panelBarItem.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -72,21 +72,21 @@ <para>The only attribute to describe here is <emphasis -role="italic"><property>"label"</property></emphasis> that specifies a text string in a component header.</para> +><property>"label"</property></emphasis> that specifies a text string in a component header.</para> <para><property>panelBar</property> could contain any number of child <property>panelBarItem</property> components inside, which content is uploaded onto the client and headers are controls to open the corresponding child element.</para> </section> <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all panelBarItem at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the panelBarItem to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the panelBarItem to your page style sheets</listitem> </itemizedlist> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -7,8 +7,8 @@ </sectioninfo> <section> <para>A collapsible vertical menu. The color scheme is based on skin parameters, but might differ - from a skin basing on the values of the <emphasis role="italic"><property>"backgpoundType"</property></emphasis> and - <emphasis role="italic"><property>"backgroundTypeTopLevel"</property></emphasis> attributes. + from a skin basing on the values of the <emphasis ><property>"backgpoundType"</property></emphasis> and + <emphasis ><property>"backgroundTypeTopLevel"</property></emphasis> attributes. The component can include two types of child components: panelMenuNode and PanelMenuItem.</para> <mediaobject> <imageobject> Modified: trunk/docs/userguide/en/src/main/docbook/included/separator.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/separator.desc.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/separator.desc.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -8,7 +8,7 @@ <section> <title>Description</title> <para>A horizontal line to use as a <property>separator</property> in a layout. The line type - can be customized with the <emphasis role="italic"><property>"lineType"</property></emphasis> parameter.</para> + can be customized with the <emphasis ><property>"lineType"</property></emphasis> parameter.</para> <figure> <title>Separator component</title> <mediaobject> Modified: trunk/docs/userguide/en/src/main/docbook/included/separator.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -65,11 +65,11 @@ </emphasis> is a simple layout component which represents a <property>separator</property> stylized as a skin. Thus, the main attributes that define its style are <emphasis -role="italic"><property>"style"</property></emphasis> and <emphasis +><property>"style"</property></emphasis> and <emphasis - role="italic"><property>"styleClass".</property></emphasis> In addition there are <emphasis role="italic"><property>width</property></emphasis> and <emphasis role="italic"><property>height</property></emphasis> attributes that should be specified in pixels.</para> -<para>The line type can be customized with the <emphasis role="italic"><property>"lineType"</property></emphasis> parameter. - For example, different line types are shown after rendering with the following initial settings <emphasis role="italic"><property>lineType="double"</property></emphasis>and <emphasis role="italic"><property>"lineType="solid".</property></emphasis> + ><property>"styleClass".</property></emphasis> In addition there are <emphasis ><property>width</property></emphasis> and <emphasis ><property>height</property></emphasis> attributes that should be specified in pixels.</para> +<para>The line type can be customized with the <emphasis ><property>"lineType"</property></emphasis> parameter. + For example, different line types are shown after rendering with the following initial settings <emphasis ><property>lineType="double"</property></emphasis>and <emphasis ><property>"lineType="solid".</property></emphasis> </para> <figure> <title>Different line types of separator</title> @@ -108,6 +108,6 @@ <para>To define appearance of a particular <property>separators</property>, it's possible to write your own CSS classes and properties in the component style attributes - (<emphasis role="italic"><property>"style"</property>,</emphasis> <emphasis role="italic"><property>"styleClass"</property></emphasis>) modifying component property.</para> + (<emphasis ><property>"style"</property>,</emphasis> <emphasis ><property>"styleClass"</property></emphasis>) modifying component property.</para> </section> </chapter> \ No newline at end of file Modified: trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -69,7 +69,7 @@ <para>Switching mode could be defined with the <emphasis -role="italic"><property>"switchType"</property></emphasis> attribute with three possible parameters.</para> +><property>"switchType"</property></emphasis> attribute with three possible parameters.</para> <itemizedlist> <listitem> Server (DEFAULT)<para>The common submission is performed around <property>simpleTogglePanel</property> and a page is completely rendered on a called panel. Only one at a time panel is uploaded onto the client side.</para> @@ -77,7 +77,7 @@ <listitem> Ajax<para>AJAX form submission is performed around the panel, content of the called panel is uploaded on AJAX request and additionally specified elements in the <emphasis -role="italic"><property>"reRender"</property></emphasis> attribute are rendered. Only one at a time panel is uploaded on the client side.</para> +><property>"reRender"</property></emphasis> attribute are rendered. Only one at a time panel is uploaded on the client side.</para> </listitem> <listitem> Client<para> @@ -87,7 +87,7 @@ </itemizedlist> <para>The component could also have an <emphasis -role="italic"><property>"expanded"</property></emphasis> (true/false) attribute responsible for keeping a panel state. It gives an opportunity to manage a <property>simpleTogglePanel</property> state from a model.</para> +><property>"expanded"</property></emphasis> (true/false) attribute responsible for keeping a panel state. It gives an opportunity to manage a <property>simpleTogglePanel</property> state from a model.</para> <itemizedlist> <listitem> onmouseover @@ -117,14 +117,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all simpleTogglePanels at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the simpleTogglePanel to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the simpleTogglePanel to your page style sheets</listitem> </itemizedlist> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/spacer.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/spacer.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/spacer.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -62,8 +62,8 @@ <para><emphasis role="bold"> <property><rich:spacer></property> </emphasis> is a simple layout component which represents a transparent <property>spacer</property>. Thus, the main -attributes that define its style are <emphasis role="italic"><property>style</property></emphasis> and <emphasis role="italic"><property>styleClass</property>.</emphasis></para> -<para>In addition, the attributes are responsible for the component size: <emphasis role="italic"><property>"width"</property></emphasis> and <emphasis role="italic"><property>"height"</property>.</emphasis></para> +attributes that define its style are <emphasis ><property>style</property></emphasis> and <emphasis ><property>styleClass</property>.</emphasis></para> +<para>In addition, the attributes are responsible for the component size: <emphasis ><property>"width"</property></emphasis> and <emphasis ><property>"height"</property>.</emphasis></para> <para>Moreover, to add e.g. some JavaScript effects, events defined on it are used.</para> <itemizedlist> <listitem> @@ -86,11 +86,11 @@ <section> <title>Look-and-Feel Customization</title> <para>On the component generation, the framework presents a default rich-spacer class in - <emphasis role="italic"><property>styleClass</property></emphasis> of a generated + <emphasis ><property>styleClass</property></emphasis> of a generated component, i.e. in order to redefine appearance of all <property>spacers</property> at once, it's necessary to redefine this class in your own CSS (replacing in the result properties defined in a skin with your own).</para> <para>To define appearance of the particular <property>spacer</property>, it's possible to write your own CSS classes - and properties in the component style attributes (<emphasis role="italic"><property>style</property>, </emphasis> <emphasis role="italic"><property>styleClass</property></emphasis>) modifying component property.</para> + and properties in the component style attributes (<emphasis ><property>style</property>, </emphasis> <emphasis ><property>styleClass</property></emphasis>) modifying component property.</para> </section> </section> \ No newline at end of file Modified: trunk/docs/userguide/en/src/main/docbook/included/subTable.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -75,7 +75,7 @@ <para>Skins support is described in the <link linkend="ArchitectureOverview">corresponding section</link>. AJAX support is possible because the component is created basing on the <emphasis role="bold"><property><a4j:repeat></property></emphasis> component and as a result the component has its possibilities of AJAX updates for a limited set of rows. The component is implemented - with the <emphasis role="italic"><property>"ajaxKeys"</property></emphasis> attribute for a table and in contrast to the <emphasis role="bold"><property><a4j:repeat></property></emphasis> outputs the standard HTML + with the <emphasis ><property>"ajaxKeys"</property></emphasis> attribute for a table and in contrast to the <emphasis role="bold"><property><a4j:repeat></property></emphasis> outputs the standard HTML structure for table rendering.</para> <programlisting role="XML"><![CDATA[... <rich:dataTable value="#{capitalsBean.capitals}" var="capitals" id="table"> @@ -96,14 +96,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all subTables at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the subTable to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the subTable to your page style sheets</listitem> </itemizedlist> <para>To redefine a style of a particular page, use component class attributes which list is the same as the <property>subTable</property> one and is known to you.</para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.desc.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.desc.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -34,9 +34,9 @@ <listitem>Setting rules that appear between cells within a table of popup values</listitem> <listitem><emphasis -role="italic"><property>"Event queue"</property></emphasis> and <emphasis +><property>"Event queue"</property></emphasis> and <emphasis -role="italic"><property>"request delay"</property></emphasis> attributes present to divide +><property>"request delay"</property></emphasis> attributes present to divide frequently requests</listitem> <listitem>Managing area of components submitted on AJAX request</listitem> <listitem>Flexible list of components to update after AJAX request managed by attributes</listitem> Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -55,7 +55,7 @@ </rich:suggestionbox> ... ]]></programlisting> -<para>Here is the <emphasis role="italic"><property>bean.autocomplete</property></emphasis> +<para>Here is the <emphasis ><property>bean.autocomplete</property></emphasis> method that returns the collection to pop up:</para> <programlisting role="JAVA"><![CDATA[public List autocomplete(Object event) { String pref = event.toString(); @@ -79,25 +79,25 @@ <itemizedlist> <listitem> <emphasis -role="italic"><property>"for"</property></emphasis><para>The attribute where there is an input component which activation causes a suggestion activation</para> +><property>"for"</property></emphasis><para>The attribute where there is an input component which activation causes a suggestion activation</para> </listitem> <listitem> <emphasis -role="italic"><property>"suggestionAction"</property></emphasis><para> is an accepting parameter of a SuggestionEvent type that returns as a result a collection for rendering in a tool tip window.</para> +><property>"suggestionAction"</property></emphasis><para> is an accepting parameter of a SuggestionEvent type that returns as a result a collection for rendering in a tool tip window.</para> </listitem> <listitem> <emphasis -role="italic"><property>"var"</property></emphasis> <para> +><property>"var"</property></emphasis> <para> a collection name that provides access for inputting into a table in a popup</para> </listitem> </itemizedlist> <para>There are also two size attributes (<emphasis -role="italic"><property>"width"</property></emphasis> and <emphasis +><property>"width"</property></emphasis> and <emphasis -role="italic"><property>"height"</property></emphasis>) that are obligatory for the suggestion component. The attributes have initial Defaults but should be specified manually in order to be changed.</para> +><property>"height"</property></emphasis>) that are obligatory for the suggestion component. The attributes have initial Defaults but should be specified manually in order to be changed.</para> <para>The <property>suggestionBox</property> component, as it is shown on the screenshot, could get any collection for an output and outputs it in a tooltip window the same as a custom dataTable (in several columns)</para> <programlisting role="XML"><![CDATA[... <rich:suggestionbox for="test" @@ -123,7 +123,7 @@ <para>When some string is chosen input receives the corresponding value from the second column containing <property>#{cit.text}</property></para> <para>There is also one more important attribute named <emphasis -role="italic"><property>"tokens"</property></emphasis> that specifies separators after which a set of some characters sequence is defined as a new prefix beginning from this separator and not from the string beginning.</para> +><property>"tokens"</property></emphasis> that specifies separators after which a set of some characters sequence is defined as a new prefix beginning from this separator and not from the string beginning.</para> <para><emphasis role="bold">Example:</emphasis></para> <programlisting role="XML"><![CDATA[... <rich:suggestiobox for="test" suggestionAction="#{bean.autocomplete}" var="cit" @@ -146,13 +146,13 @@ </figure> <para>For a multiple definition use either ",.; " syntax as a value for tokens or link a parameter to some bean property transmitting separators collection.</para> <para>The component also encompasses <emphasis -role="italic"><property>"layout"</property></emphasis> and <emphasis -role="italic"><property>"style"</property></emphasis> attributes corresponding to dataTable +><property>"layout"</property></emphasis> and <emphasis +><property>"style"</property></emphasis> attributes corresponding to dataTable ones for a table appearing in popup (for additional information, read JSF Reference) and custom attribute managing AJAX requests sending (for additional information, see <ulink url="http://www.jboss.org/projects/jbossajax4jsf">Ajax4JSF Project</ulink>).</para> <para>In addition to these attributes common for AJAX action components and limiting requests quantity and frequency, <property>suggestionBox</property> has one more its own attribute limiting - requests (the <emphasis role="italic"><property>"minChars"</property></emphasis> attribute). The attribute defines characters quantity inputted into a field after which AJAX requests are called to perform suggestion.</para> + requests (the <emphasis ><property>"minChars"</property></emphasis> attribute). The attribute defines characters quantity inputted into a field after which AJAX requests are called to perform suggestion.</para> <para> <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/suggestionBox.jsf?c=s...">Here</ulink> you can see the example of <emphasis role="bold"><rich:suggestionBox></emphasis> usage and sources for the given example. </para> Modified: trunk/docs/userguide/en/src/main/docbook/included/tab.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -65,7 +65,7 @@ <section> <title>Details of Usage</title> <para>The main component function is to define a content group that is rendered and processed when the <property>tab</property> is active, i.e. click on a <property>tab</property> causes switching onto a <property>tab</property> containing content corresponded to this <property>tab</property>.</para> -<para>A marker on a <property>tab</property> header defined with the <emphasis role="italic"><property>"label"</property></emphasis> attribute. Moreover, each <property>tab</property> could be disabled (switching on this <property>tab</property> is impossible) with the <emphasis role="italic"><property>"disable"</property></emphasis> attribute.</para> +<para>A marker on a <property>tab</property> header defined with the <emphasis ><property>"label"</property></emphasis> attribute. Moreover, each <property>tab</property> could be disabled (switching on this <property>tab</property> is impossible) with the <emphasis ><property>"disable"</property></emphasis> attribute.</para> <programlisting role="XML"><![CDATA[... <rich:tabPanel width="20%"> <rich:tab label="Tab"> @@ -94,7 +94,7 @@ performed right on the client with the corresponding JavaScript and onto another <property>tab</property> with an AJAX request on the server. <property>Tab</property> switching modes are the same as <property>tabPanel</property> ones.</para> -<para>Each <property>tab</property> also has an attribute name (alias for <emphasis role="italic"><property>"id"</property></emphasis> attribute). Using this attribute value it's possible e.g. to set an active <property>tab</property> on a model level specifying this name in the corresponding attribute of the whole <property>tab</property>.</para> +<para>Each <property>tab</property> also has an attribute name (alias for <emphasis ><property>"id"</property></emphasis> attribute). Using this attribute value it's possible e.g. to set an active <property>tab</property> on a model level specifying this name in the corresponding attribute of the whole <property>tab</property>.</para> <para>Except the specific component attributes it has all necessary attributes for JavaScript event definition.</para> <itemizedlist> <listitem> @@ -127,10 +127,10 @@ <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use <emphasis -role="italic"><property>style class redefinition method</property>.</emphasis> +><property>style class redefinition method</property>.</emphasis> Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <note><title>Note:</title> A panel appearance and content is defined with a <property>tab</property> panel i.e. on the <property>tab</property> level it's possible to define only an appearance of this <property>tab</property> header. </note> @@ -138,7 +138,7 @@ <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the tab to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the tab to your page style sheets</listitem> </itemizedlist> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -73,7 +73,7 @@ submitted inside. If a form is placed into each tab, the Action elements of Tab controls appear to be out of the form and content submission inside the panels could be performed only for Action components inside tabs.</note> <para>Switching mode could be chosen with the <property>tabPanel</property> attribute <emphasis -role="italic"><property>"mode"</property></emphasis> with three possible parameters.</para> +><property>"mode"</property></emphasis> with three possible parameters.</para> <itemizedlist> <listitem> Server (DEFAULT)<para>The common submission is performed around <property>tabPanel</property> and a page is completely rendered on a called panel. Only one at a time <property>tabPanel</property> is uploaded onto the client side.</para> @@ -82,7 +82,7 @@ Ajax<para>AJAX form submission is performed around the <property>tabPanel</property>, content of the called <property>tabPanel</property> is uploaded on AJAX request and additionally specified elements in the <emphasis -role="italic"><property>"reRender"</property></emphasis> attribute are rendered. Only one at +><property>"reRender"</property></emphasis> attribute are rendered. Only one at a time <property>tabPanel</property> is uploaded on the client.</para> </listitem> <listitem> @@ -92,12 +92,12 @@ </itemizedlist> <para>As a result, the <property>tabPanel</property> is switched to the second tab according to the action returning outcome for moving onto another page and switching from the second to the first tab is performed.</para> <para>There is also the <emphasis -role="italic"><property>"selectedTab"</property></emphasis> attribute. The attribute keeps +><property>"selectedTab"</property></emphasis> attribute. The attribute keeps an active tab name; therefore, an active <property>tabPanel</property> could be changed with setting a name of the necessary tab to this attribute.</para> <para>There is also the <emphasis -role="italic"><property>"headerAlignment"</property></emphasis> attribute responsible for +><property>"headerAlignment"</property></emphasis> attribute responsible for rendering of <property>tabPanel</property> components. The attribute has several values: left (Default), right, center, which specify Tabs components location on the top of the tabPanel.</para> @@ -144,14 +144,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all tabPanels at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the tabPanel to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the tabPanel to your page style sheets</listitem> </itemizedlist> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/toggleControl.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/toggleControl.desc.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/toggleControl.desc.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -9,11 +9,11 @@ <title>Description</title> <para>A link type <property>control</property> for switching between <property>togglePanel</property> facets. Target - Panel is specified with <emphasis role="italic"><property>"for"</property></emphasis> + Panel is specified with <emphasis ><property>"for"</property></emphasis> attribute. It can be located inside or outside the <property>togglePanel</property>. As the result of switching between facets previous facet is hidden and another one (specified with - <emphasis role="italic"><property>"switchToState"</property></emphasis> or panel - <emphasis role="italic"><property>"stateOrder"</property></emphasis> attributes) is + <emphasis ><property>"switchToState"</property></emphasis> or panel + <emphasis ><property>"stateOrder"</property></emphasis> attributes) is shown.</para> <figure> <title>ToggleControl component</title> Modified: trunk/docs/userguide/en/src/main/docbook/included/toggleControl.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/toggleControl.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/toggleControl.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -68,13 +68,13 @@ <para>As it was mentioned above, the <property>control</property> could be in any place in layout and linked to a switching panel that is managed with <emphasis -role="italic"><property>"for"</property></emphasis> attribute (in the <emphasis +><property>"for"</property></emphasis> attribute (in the <emphasis -role="italic"><property>"for"</property></emphasis> attribute the full component "id" is specified according to naming +><property>"for"</property></emphasis> attribute the full component "id" is specified according to naming containers).</para> <para>The <property>togglePanel</property> could be also switched from the side of the control instead of being strictly defined in <emphasis -role="italic"><property>"switchOrder"</property></emphasis> attribute of <emphasis role="bold"><property><rich:togglePanel></property>.</emphasis></para> +><property>"switchOrder"</property></emphasis> attribute of <emphasis role="bold"><property><rich:togglePanel></property>.</emphasis></para> <para><emphasis role="bold">Example:</emphasis></para> <programlisting role="XML"><![CDATA[... <rich:togglePanel id="panel" initialState="empty" switchType="client"> @@ -102,17 +102,17 @@ ... ]]></programlisting> <para>In this example the switching is performed on facets specified in the <emphasis -role="italic"><property>"switchToState"</property></emphasis> attribute.</para> +><property>"switchToState"</property></emphasis> attribute.</para> </section> <section> <title>Look-and-Feel Customization</title> <para>On component generation the framework substitutes the default - class <emphasis role="italic"><property>rich-toggle-control</property></emphasis> into + class <emphasis ><property>rich-toggle-control</property></emphasis> into styleClass of a generated component, i.e. to redefine at once all <property>toggle controls</property> appearance on a page, redefine this class in your CSS.</para> <para>To define a particular <property>toggle controls</property> appearance, write down your own CSS properties and classes in component style attributes (<emphasis -role="italic"><property>"style"</property>,</emphasis> <emphasis -role="italic"><property>"styleClass"</property></emphasis>)and the properties have been changed.</para> +><property>"style"</property>,</emphasis> <emphasis +><property>"styleClass"</property></emphasis>)and the properties have been changed.</para> </section> </section> \ No newline at end of file Modified: trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -75,13 +75,13 @@ (either switched on the client or send requests on the server for switching).</para> <para>The initial component state is defined with <emphasis -role="italic"><property>"initialState"</property></emphasis> attribute, where a facet name that is shown at first is defined.</para> +><property>"initialState"</property></emphasis> attribute, where a facet name that is shown at first is defined.</para> <note><title>Note:</title> It's also possible to define an <property>"empty"</property> facet to implement the functionality as drop-down panels have and make the facet active when no content is required to be rendered.</note> <para>Switching mode could be defined with the <emphasis -role="italic"><property>"switchType"</property></emphasis> attribute with three possible +><property>"switchType"</property></emphasis> attribute with three possible parameters:</para> <itemizedlist> <listitem> @@ -91,7 +91,7 @@ Ajax<para>AJAX form submission is performed around the panel, content of the called panel is uploaded on an AJAX request and additionally specified elements in the <emphasis -role="italic"><property>"reRender"</property></emphasis> attribute are rendered. Only one at a time panel is uploaded on the client side.</para> +><property>"reRender"</property></emphasis> attribute are rendered. Only one at a time panel is uploaded on the client side.</para> </listitem> <listitem> Client<para> @@ -101,7 +101,7 @@ </itemizedlist> <para>"Facets" switching order could be defined on the side of <emphasis role="bold"><property><rich:toggleControl></property></emphasis> component or on the panel. On the side of the togglePanel it's possible to define facets switching order with the <emphasis -role="italic"><property>"stateOrder"</property></emphasis> attribute. The facets names are enumerated in +><property>"stateOrder"</property></emphasis> attribute. The facets names are enumerated in such an order that they are rendered when a control is clicked, as it's not defined where to switch beforehand.</para> <programlisting role="XML"><![CDATA[... Modified: trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -69,7 +69,7 @@ functionality.</para> <para>Separators are located between components with the help of the <emphasis -role="italic"><property>"itemSeparator"</property></emphasis> attribute +><property>"itemSeparator"</property></emphasis> attribute with four predefined values:</para> <itemizedlist> <listitem> @@ -96,7 +96,7 @@ </mediaobject> </figure> <para>Moreover, for <property>toolBar</property> style - <emphasis role="italic"><property>"width"</property></emphasis> and <emphasis role="italic"><property>"height"</property></emphasis> attributes + <emphasis ><property>"width"</property></emphasis> and <emphasis ><property>"height"</property></emphasis> attributes are placed above all.</para> <para> <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/toolBar.jsf?c=toolBar">Here</ulink> you can see the example of <emphasis role="bold"><rich:toolBar></emphasis> usage and sources for the given example. @@ -105,14 +105,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all toolBars at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the toolBar to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the toolBar to your page style sheets</listitem> </itemizedlist> <table> <title>Skin parameters redefinition</title> @@ -139,11 +139,11 @@ <section> <title>Definition custom style classes</title> <para>On generating, the component substitutes the default class rich-toolbar-exterior - into <emphasis role="italic"><property>style class</property></emphasis> + into <emphasis ><property>style class</property></emphasis> of a generated component, i.e. to redefine at once all <property>toolBars</property> appearance on a page, redefine this class in your CSS.</para> - <para>The component also has the standard attributes <emphasis role="italic"><property>"style"</property></emphasis> and - <emphasis role="italic"><property>"styleClass"</property></emphasis> that could redefine an + <para>The component also has the standard attributes <emphasis ><property>"style"</property></emphasis> and + <emphasis ><property>"styleClass"</property></emphasis> that could redefine an appearance of a particular component variants.</para> </section> </section> \ No newline at end of file Modified: trunk/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -72,7 +72,7 @@ <para>A <property>toolBarGroup</property> is a wrapper component that groups <property>toolBar</property> content and facilitates creation of menu and tool bars. All components defined inside are located on a stylized bar with a possibility to group, arrange on the both bar sides, and place predefined separators between them.</para> <para>Separators are located between components with the help of the <emphasis -role="italic"><property>"itemSeparator"</property></emphasis> attribute with four +><property>"itemSeparator"</property></emphasis> attribute with four predefined values:</para> <itemizedlist> <listitem> @@ -90,7 +90,7 @@ </itemizedlist> <para>To control the group location inside, use the <emphasis -role="italic"><property>"location"</property></emphasis> attribute with left (DEFAULT) and right values.</para> +><property>"location"</property></emphasis> attribute with left (DEFAULT) and right values.</para> <para><emphasis role="bold">Example:</emphasis></para> <programlisting role="XML"><![CDATA[... <rich:toolBar itemSeparator="disc" width="500"> @@ -118,14 +118,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all toolBarGroups at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the toolBarGroup to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the toolBarGroup to your page style sheets</listitem> </itemizedlist> <table> <title>Skin parameters redefinition</title> @@ -157,11 +157,11 @@ <title>Definition custom style classes</title> <para>On generating, the component substitutes the default class rich-toolbar-interior into <emphasis -role="italic"><property>style class</property></emphasis> of a generated component, i.e. +><property>style class</property></emphasis> of a generated component, i.e. to redefine at once all <property>toolBarGroups</property> appearance on a page, redefine this class in your CSS.</para> <para>The component also has the standard attribute style and <emphasis -role="italic"><property>style class</property></emphasis> that could redefine an +><property>style class</property></emphasis> that could redefine an appearance of particular component variants. </para> <para>It's necessary to define a class according to the corresponding name, so as an Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -68,12 +68,12 @@ structure of a org.richfaces.component.TreeNode type. (You could have a look at this interface description in the API document) The default classes for lists building of a TreeNodeImpl type (it implements a TreeNode interface) for an XML structure XmlNodeData and XmlTreeDataBuilder are implemented in the tree component. Hence, in order to provide your own class for TreeNode, it's - necessary only to implement this interface, i.e. the <emphasis role="italic"><property>"var"</property></emphasis> attribute contains + necessary only to implement this interface, i.e. the <emphasis ><property>"var"</property></emphasis> attribute contains a name providing an access to data defined with value. </para> <para>For data output, named <property>tree</property> nodes elements are used. Each element, for example depending on its definition, could be rendered with markup defined in one of <property>tree</property> nodes. It's defined with the - <emphasis role="italic"><property>"nodeFace"</property></emphasis> + <emphasis ><property>"nodeFace"</property></emphasis> attribute that contains treeNode name for elements rendering. </para> <para>On the screenshot there are examples of nodes defined with different templates on the following conditions</para> @@ -89,7 +89,7 @@ </mediaobject> </figure> <para>Switching on nodes opening/closing (expanded/collapsed) could be implemented in three modes. It could be specified - in the <emphasis role="italic"><property>"switchType"</property></emphasis> attribute. </para> + in the <emphasis ><property>"switchType"</property></emphasis> attribute. </para> <itemizedlist> <listitem>AJAX - request onto the server is used for switching </listitem> <listitem>Server - custom requests onto the server are used for switching</listitem> @@ -97,21 +97,21 @@ client script</listitem> </itemizedlist> <para>Common selecting allows also to activate AJAX requests with the - <emphasis role="italic"><property>"ajaxSubmitSelection"</property></emphasis> + <emphasis ><property>"ajaxSubmitSelection"</property></emphasis> attribute (true/false).</para> <para>To set a model saving during requests, use the - <emphasis role="italic"><property>"preserveModel"</property></emphasis>attribute with + <emphasis ><property>"preserveModel"</property></emphasis>attribute with state, request (default) and none values. The attribute is used for cashing data between requests in a state or request. The - <emphasis role="italic"><property>"treeDataLocator"</property></emphasis> attribute + <emphasis ><property>"treeDataLocator"</property></emphasis> attribute defines a class providing an access to cashed data according to the ids saved in state/request on recovery or cashing data saving the Id on caching.</para> <para> - The <emphasis role="italic"><property>"icon"</property></emphasis>, - <emphasis role="italic"><property>"iconCollapsed"</property></emphasis>, - <emphasis role="italic"><property>"iconExpanded"</property></emphasis>, - <emphasis role="italic"><property>"iconLeaf"</property></emphasis> + The <emphasis ><property>"icon"</property></emphasis>, + <emphasis ><property>"iconCollapsed"</property></emphasis>, + <emphasis ><property>"iconExpanded"</property></emphasis>, + <emphasis ><property>"iconLeaf"</property></emphasis> attributes define icons for the component. Also you can define icons using facets with the same names. If the facets are defined, the corresponding attributes are ignored and facets contents are used as icons. The width of a rendered facet area is 16px. <programlisting role="JAVA"><![CDATA[... @@ -220,14 +220,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine an appearance of all trees at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the tree to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the tree to your page style sheets</listitem> </itemizedlist> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml 2007-07-04 13:06:38 UTC (rev 1462) +++ trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml 2007-07-04 13:13:57 UTC (rev 1463) @@ -65,10 +65,10 @@ <section> <title>Details of Usage</title> <para> - The <emphasis role="italic"><property>"icon"</property></emphasis>, - <emphasis role="italic"><property>"iconCollapsed"</property></emphasis>, - <emphasis role="italic"><property>"iconExpanded"</property></emphasis>, - <emphasis role="italic"><property>"iconLeaf"</property></emphasis> + The <emphasis ><property>"icon"</property></emphasis>, + <emphasis ><property>"iconCollapsed"</property></emphasis>, + <emphasis ><property>"iconExpanded"</property></emphasis>, + <emphasis ><property>"iconLeaf"</property></emphasis> attributes define icons for the component. Also you can define icons using facets with the same names. If the facets are defined, the corresponding attributes are ignored and facets contents are used as icons. The width of a rendered facet area is 16px. <programlisting role="JAVA"><![CDATA[... @@ -126,7 +126,7 @@ in <link linkend="tree">the corresponding section</link>.</para> <para>Default nodes of the tree level as well as ones defined with the <property>treeNodes</property> component could send AJAX requests when selected with the mouse, it's managed with the - <emphasis role="italic"><property>"ajaxSubmitSelection"</property></emphasis> attribute + <emphasis ><property>"ajaxSubmitSelection"</property></emphasis> attribute (true/false).</para> </section> <section> @@ -145,14 +145,14 @@ <section> <title>Look-and-Feel Customization</title> <para>For skinnability implementation the components use a <emphasis -role="italic"><property>style class redefinition method</property></emphasis>.</para> +><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis -role="italic"><property>skin parameters</property>.</emphasis></para> +><property>skin parameters</property>.</emphasis></para> <para>To redefine appearance of all treeNodes at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis -role="italic"><property>style classes</property></emphasis> used by the treeNode to your page style sheets</listitem> +><property>style classes</property></emphasis> used by the treeNode to your page style sheets</listitem> </itemizedlist> </section> <section> @@ -240,8 +240,8 @@ declare and customize the above-mentioned classes in your CSS.</para> <para>It is also possible to change look and feel of specific <property>treeNodes</property> with the help of defining for them - <emphasis role="italic"><property>"selectedClass"</property></emphasis> - and <emphasis role="italic"><property>"highlightedClass"</property></emphasis> + <emphasis ><property>"selectedClass"</property></emphasis> + and <emphasis ><property>"highlightedClass"</property></emphasis> attributes by their specific classes.</para> </section> </section>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1462 - trunk/docs/userguide/en/src/main/docbook/modules.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2007-07-04 09:06:38 -0400 (Wed, 04 Jul 2007) New Revision: 1462 Modified: trunk/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml trunk/docs/userguide/en/src/main/docbook/modules/RFCsetwebappl.xml Log: http://jira.jboss.org/jira/browse/EXIN-373 Italic font style is added to the corresponding words and phrases Modified: trunk/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml 2007-07-04 12:41:56 UTC (rev 1461) +++ trunk/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml 2007-07-04 13:06:38 UTC (rev 1462) @@ -32,9 +32,9 @@ <entry>Is an URL to an application or a container log file (if possible). If this parameter is set, content from the given URL is shown on a <emphasis - role="italic"><property>Debug</property></emphasis> error page + ><property>Debug</property></emphasis> error page in the <emphasis - role="italic"><property>iframe</property></emphasis> + ><property>iframe</property></emphasis> window</entry> </row> @@ -44,7 +44,7 @@ <entry>none</entry> <entry>Is a comma-separated list of custom <emphasis - role="italic"><property>ViewHandler</property></emphasis> + ><property>ViewHandler</property></emphasis> instances for inserting in chain. Handlers are inserted BEFORE Ajax4jsf viewhandlers in the given order. For example, in facelets application this parameter must contain @@ -61,7 +61,7 @@ special control case, such as messages bundle loader, alias bean components, etc. Is a type of component got by a reflection from the static field <emphasis - role="italic"><property>COMPONENT_TYPE</property></emphasis>. + ><property>COMPONENT_TYPE</property></emphasis>. For components with such types encode methods always are called in rendering AJAX responses, even if a component isn't in an updated part</entry> @@ -75,7 +75,7 @@ <entry>For generated resources, such as encrypt generation data, it's encoded in the resource URL. For example, URL for an image generated from the <emphasis - role="italic"><property>mediaOutput</property></emphasis> + ><property>mediaOutput</property></emphasis> component contains a name of a generation method, since for a hacker attack, it is possible to create a request for any JSF baked beans or other attributes. To prevent such attacks, set this @@ -99,9 +99,9 @@ <entry>Is a name of a skin used in an application. It can be a literal string with a skin name, or the <emphasis - role="italic"><property>EL</property></emphasis> expression + ><property>EL</property></emphasis> expression (#{...}) pointed to a <emphasis - role="italic"><property>String</property></emphasis> property + ><property>String</property></emphasis> property (skin name) or a property of a org.ajax4jsf.framework.skin type. Skin in last case, this instance is used as a current skin</entry> </row> @@ -130,7 +130,7 @@ <entry>-</entry> <entry>Is a path (relative to web application context) to the - <emphasis role="italic"><property>log4j.xml</property></emphasis> configuration file, it can be used to setup + <emphasis ><property>log4j.xml</property></emphasis> configuration file, it can be used to setup per-application custom logging</entry> </row> @@ -150,7 +150,7 @@ <entry>true</entry> <entry>Force parsing by a filter <emphasis - role="italic"><property>HTML</property></emphasis> syntax + ><property>HTML</property></emphasis> syntax checker on any JSF page. If "false", only AJAX responses are parsed to syntax check and conversion to well-formed XML. Setting to "false" improves performance, but can provide visual effects on Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-07-04 12:41:56 UTC (rev 1461) +++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-07-04 13:06:38 UTC (rev 1462) @@ -232,7 +232,7 @@ </itemizedlist> <para>To plug one in, it's necessary to specify a skin name in the - <emphasis role="italic"><property>"org.ajax4jsf.SKIN"</property></emphasis> context-param.</para> + <emphasis ><property>"org.ajax4jsf.SKIN"</property></emphasis> context-param.</para> <para>Here is an example of a table with values for one of the main skins, <property>"blueSky"</property>.</para> @@ -490,7 +490,7 @@ <para>Create a file whose name follows the format of a skin file and place it into the ClassPath for the application. (Any skin file follows the naming format, <emphasis - role="italic"><property><name.skin.properties></property></emphasis>.)</para> + ><property><name.skin.properties></property></emphasis>.)</para> </listitem> <listitem> Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCsetwebappl.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/RFCsetwebappl.xml 2007-07-04 12:41:56 UTC (rev 1461) +++ trunk/docs/userguide/en/src/main/docbook/modules/RFCsetwebappl.xml 2007-07-04 13:06:38 UTC (rev 1462) @@ -30,11 +30,11 @@ Copy the <emphasis - role="italic"><property>"richfaces-3.0.x.jar"</property></emphasis> + ><property>"richfaces-3.0.x.jar"</property></emphasis> file into the - <emphasis role="italic"> + <emphasis > <property>"WEB-INF/lib"</property> </emphasis> @@ -48,16 +48,16 @@ <listitem> Copy the - <emphasis role="italic"><property>"ajax4jsf.jar"</property></emphasis> + <emphasis ><property>"ajax4jsf.jar"</property></emphasis> and <emphasis - role="italic"><property>"oscache2.3.2.jar"</property></emphasis> + ><property>"oscache2.3.2.jar"</property></emphasis> files into the - <emphasis role="italic"> + <emphasis > <property>"WEB-INF/lib"</property> </emphasis>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1461 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2007-07-04 08:41:56 -0400 (Wed, 04 Jul 2007) New Revision: 1461 Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml Log: http://jira.jboss.com/jira/browse/RF-398 small grammar mistakes are fixed Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-07-04 12:24:26 UTC (rev 1460) +++ trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-07-04 12:41:56 UTC (rev 1461) @@ -65,7 +65,7 @@ <para>As it has been mentioned above the tree component allows to render any tree-like structure of data.</para> <para>A bean property is passed into a tree <property>value</property> attribute. The property keeps the - structure of a org.richfaces.component.TreeNode type. (You may look at this interface description in the API document) The default classes for lists building of a TreeNodeImpl type (it + structure of a org.richfaces.component.TreeNode type. (You could have a look at this interface description in the API document) The default classes for lists building of a TreeNodeImpl type (it implements a TreeNode interface) for an XML structure XmlNodeData and XmlTreeDataBuilder are implemented in the tree component. Hence, in order to provide your own class for TreeNode, it's necessary only to implement this interface, i.e. the <emphasis role="italic"><property>"var"</property></emphasis> attribute contains @@ -102,7 +102,7 @@ <para>To set a model saving during requests, use the <emphasis role="italic"><property>"preserveModel"</property></emphasis>attribute with state, request (default) and none values. The attribute is used for cashing data between requests - in state or request. The + in a state or request. The <emphasis role="italic"><property>"treeDataLocator"</property></emphasis> attribute defines a class providing an access to cashed data according to the ids saved in state/request on recovery or cashing data saving the Id on caching.</para> @@ -200,19 +200,19 @@ <title>Events handling</title> <para>Listeners classes that process events on server side are defined with the help:</para> <itemizedlist> - <listitem>nodeSelectListener is called during request sending on a node selecting event (if request sending on this + <listitem>nodeSelectListener is called during request sending on a node selecting event (if request sending on this event is defined)</listitem> <listitem>dropListener processes Drop event</listitem> <listitem>changeExpandListener processes expand/collapse event of a tree node</listitem> </itemizedlist> <para>Moreover, to add e.g. some JavaScript effects, client events defined on it are used:</para> <itemizedlist> - <listitem>onexpand - expand node event</listitem> - <listitem>oncollapse - collapse node event</listitem> - <listitem>ondragexit - element passing out from tree zone event</listitem> - <listitem>ondragstart - drag start event</listitem> - <listitem>ondragend - drag end event (drop event)</listitem> - <listitem>ondragenter - dragged element appearing on tree event</listitem> + <listitem>onexpand - expands a node event</listitem> + <listitem>oncollapse - collapses a node event</listitem> + <listitem>ondragexit - element passing out from a tree zone event</listitem> + <listitem>ondragstart - drags a start event</listitem> + <listitem>ondragend - drags an end event (a drop event)</listitem> + <listitem>ondragenter - drags an element appearing on a tree event</listitem> </itemizedlist> @@ -223,7 +223,7 @@ role="italic"><property>style class redefinition method</property></emphasis>.</para> <para>Default style classes are mapped on <emphasis role="italic"><property>skin parameters</property>.</emphasis></para> - <para>To redefine appearance of all trees at once, there are two ways:</para> + <para>To redefine an appearance of all trees at once, there are two ways:</para> <itemizedlist> <listitem>to redefine corresponding skin parameters</listitem> <listitem>to add <emphasis

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1460 - in branches/3.0.2/richfaces: drag-drop/src/main/java/org/richfaces/renderkit and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-07-04 08:24:26 -0400 (Wed, 04 Jul 2007) New Revision: 1460 Added: branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-mini.js Removed: branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json.js Modified: branches/3.0.2/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java branches/3.0.2/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java branches/3.0.2/richfaces/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java branches/3.0.2/richfaces/tree/src/test/java/org/richfaces/component/TreeComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-404 fixed: - json.js reduced to json-mini.js to get rid of extra methods causing issues with JQuery Copied: branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-mini.js (from rev 1459, branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json.js) =================================================================== --- branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-mini.js (rev 0) +++ branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-mini.js 2007-07-04 12:24:26 UTC (rev 1460) @@ -0,0 +1,71 @@ +/* + json.js + 2006-12-06 + + This file adds these methods to JavaScript: + + array.toJSONString() + boolean.toJSONString() + date.toJSONString() + number.toJSONString() + object.toJSONString() + string.toJSONString() + These methods produce a JSON text from a JavaScript value. + It must not contain any cyclical references. Illegal values + will be excluded. + + The default conversion for dates is to an ISO string. You can + add a toJSONString method to any date object to get a different + representation. + + string.parseJSON(hook) + This method parses a JSON text to produce an object or + array. It can throw a SyntaxError exception. + + The optional hook parameter is a function which can filter and + transform the results. It receives each of the values, and its + return value is used instead. If it returns what it received, then + structure is not modified. + + Example: + + // Parse the text. If it contains any "NaN" strings, replace them + // with the NaN value. All other values are left alone. + + myData = text.parseJSON(function (value) { + if (value === 'NaN') { + return NaN; + } + return value; + }); + + It is expected that these methods will formally become part of the + JavaScript Programming Language in the Fourth Edition of the + ECMAScript standard in 2007. +*/ + +if (!String.prototype.parseJSON) { + String.prototype.parseJSON = function (hook) { + try { + if (!/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(this.replace(/("(\\.|[^"\\])*")|('(\\.|[^'\\])*')/g, ''))) { + var j = eval('(' + this + ')'); + if (typeof hook === 'function') { + function walk(v) { + if (v && typeof v === 'object') { + for (var i in v) { + if (v.hasOwnProperty(i)) { + v[i] = walk(v[i]); + } + } + } + return hook(v); + } + return walk(j); + } + return j; + } + } catch (e) { + } + throw new SyntaxError("parseJSON"); + }; +} Deleted: branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json.js =================================================================== --- branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json.js 2007-07-04 01:06:39 UTC (rev 1459) +++ branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json.js 2007-07-04 12:24:26 UTC (rev 1460) @@ -1,193 +0,0 @@ -/* - json.js - 2006-12-06 - - This file adds these methods to JavaScript: - - array.toJSONString() - boolean.toJSONString() - date.toJSONString() - number.toJSONString() - object.toJSONString() - string.toJSONString() - These methods produce a JSON text from a JavaScript value. - It must not contain any cyclical references. Illegal values - will be excluded. - - The default conversion for dates is to an ISO string. You can - add a toJSONString method to any date object to get a different - representation. - - string.parseJSON(hook) - This method parses a JSON text to produce an object or - array. It can throw a SyntaxError exception. - - The optional hook parameter is a function which can filter and - transform the results. It receives each of the values, and its - return value is used instead. If it returns what it received, then - structure is not modified. - - Example: - - // Parse the text. If it contains any "NaN" strings, replace them - // with the NaN value. All other values are left alone. - - myData = text.parseJSON(function (value) { - if (value === 'NaN') { - return NaN; - } - return value; - }); - - It is expected that these methods will formally become part of the - JavaScript Programming Language in the Fourth Edition of the - ECMAScript standard in 2007. -*/ -if (!Object.prototype.toJSONString) { - Array.prototype.toJSONString = function () { - var a = ['['], b, i, l = this.length, v; - - function p(s) { - if (b) { - a.push(','); - } - a.push(s); - b = true; - } - - for (i = 0; i < l; i += 1) { - v = this[i]; - switch (typeof v) { - case 'undefined': - case 'function': - case 'unknown': - break; - case 'object': - if (v) { - if (typeof v.toJSONString === 'function') { - p(v.toJSONString()); - } - } else { - p("null"); - } - break; - default: - p(v.toJSONString()); - } - } - a.push(']'); - return a.join(''); - }; - - Boolean.prototype.toJSONString = function () { - return String(this); - }; - - Date.prototype.toJSONString = function () { - - function f(n) { - return n < 10 ? '0' + n : n; - } - - return '"' + this.getFullYear() + '-' + - f(this.getMonth() + 1) + '-' + - f(this.getDate()) + 'T' + - f(this.getHours()) + ':' + - f(this.getMinutes()) + ':' + - f(this.getSeconds()) + '"'; - }; - - Number.prototype.toJSONString = function () { - return isFinite(this) ? String(this) : "null"; - }; - - Object.prototype.toJSONString = function () { - var a = ['{'], b, i, v; - - function p(s) { - if (b) { - a.push(','); - } - a.push(i.toJSONString(), ':', s); - b = true; - } - - for (i in this) { - if (this.hasOwnProperty(i)) { - v = this[i]; - switch (typeof v) { - case 'undefined': - case 'function': - case 'unknown': - break; - case 'object': - if (v) { - if (typeof v.toJSONString === 'function') { - p(v.toJSONString()); - } - } else { - p("null"); - } - break; - default: - p(v.toJSONString()); - } - } - } - a.push('}'); - return a.join(''); - }; - - - (function (s) { - var m = { - '\b': '\\b', - '\t': '\\t', - '\n': '\\n', - '\f': '\\f', - '\r': '\\r', - '"' : '\\"', - '\\': '\\\\' - }; - - s.parseJSON = function (hook) { - try { - if (!/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(this.replace(/("(\\.|[^"\\])*")|('(\\.|[^'\\])*')/g, ''))) { - var j = eval('(' + this + ')'); - if (typeof hook === 'function') { - function walk(v) { - if (v && typeof v === 'object') { - for (var i in v) { - if (v.hasOwnProperty(i)) { - v[i] = walk(v[i]); - } - } - } - return hook(v); - } - return walk(j); - } - return j; - } - } catch (e) { - } - throw new SyntaxError("parseJSON"); - }; - - s.toJSONString = function () { - if (/["\\\x00-\x1f]/.test(this)) { - return '"' + this.replace(/([\x00-\x1f\\"])/g, function(a, b) { - var c = m[b]; - if (c) { - return c; - } - c = b.charCodeAt(); - return '\\u00' + - Math.floor(c / 16).toString(16) + - (c % 16).toString(16); - }) + '"'; - } - return '"' + this + '"'; - }; - })(String.prototype); -} \ No newline at end of file Modified: branches/3.0.2/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java =================================================================== --- branches/3.0.2/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-07-04 01:06:39 UTC (rev 1459) +++ branches/3.0.2/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-07-04 12:24:26 UTC (rev 1460) @@ -112,7 +112,7 @@ public String[] getScriptDependencies() { return new String[] { PrototypeScript.class.getName(), - "/org/richfaces/renderkit/html/scripts/json/json.js", + "/org/richfaces/renderkit/html/scripts/json/json-mini.js", DnDScript.class.getName(), "/org/richfaces/renderkit/html/scripts/utils.js", "/org/richfaces/renderkit/html/scripts/json/json-dom.js", Modified: branches/3.0.2/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java =================================================================== --- branches/3.0.2/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-04 01:06:39 UTC (rev 1459) +++ branches/3.0.2/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-04 12:24:26 UTC (rev 1460) @@ -188,7 +188,7 @@ public String[] getScriptDependencies() { return new String[] { PrototypeScript.class.getName(), - "/org/richfaces/renderkit/html/scripts/json/json.js", + "/org/richfaces/renderkit/html/scripts/json/json-mini.js", DnDScript.class.getName(), "/org/richfaces/renderkit/html/scripts/utils.js", "/org/richfaces/renderkit/html/scripts/json/json-dom.js", Modified: branches/3.0.2/richfaces/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java =================================================================== --- branches/3.0.2/richfaces/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-04 01:06:39 UTC (rev 1459) +++ branches/3.0.2/richfaces/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-04 12:24:26 UTC (rev 1460) @@ -50,7 +50,7 @@ .add("scripts/simple-draggable.js"); javaScripts .add("scripts/simple-dropzone.js"); - javaScripts.add("scripts/json/json.js"); + javaScripts.add("scripts/json/json-mini.js"); javaScripts .add("scripts/dnd/dnd-common.js"); javaScripts Modified: branches/3.0.2/richfaces/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- branches/3.0.2/richfaces/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-04 01:06:39 UTC (rev 1459) +++ branches/3.0.2/richfaces/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-04 12:24:26 UTC (rev 1460) @@ -71,7 +71,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json.js"); + javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json-mini.js"); javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); javaScripts.add("scripts/AJAX.js");

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1459 - in trunk: framework/api/src/main/java/org/richfaces/component and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-07-03 21:06:39 -0400 (Tue, 03 Jul 2007) New Revision: 1459 Added: trunk/framework/api/src/main/java/org/richfaces/model/state/ Removed: trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/ trunk/framework/api/src/main/java/org/richfaces/component/events/ trunk/framework/api/src/main/java/org/richfaces/component/state/ Modified: trunk/ui/tree/src/test/java/org/richfaces/component/state/events/CollapseAllCommandEventTest.java trunk/ui/tree/src/test/java/org/richfaces/component/state/events/CollapseNodeCommandEventTest.java trunk/ui/tree/src/test/java/org/richfaces/component/state/events/ExpandAllCommandEventTest.java trunk/ui/tree/src/test/java/org/richfaces/component/state/events/ExpandNodeCommandEventTest.java Log: packages and classes refactor Copied: trunk/framework/api/src/main/java/org/richfaces/model/state (from rev 1454, trunk/framework/api/src/main/java/org/richfaces/component/state) Modified: trunk/ui/tree/src/test/java/org/richfaces/component/state/events/CollapseAllCommandEventTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/state/events/CollapseAllCommandEventTest.java 2007-07-04 00:30:26 UTC (rev 1458) +++ trunk/ui/tree/src/test/java/org/richfaces/component/state/events/CollapseAllCommandEventTest.java 2007-07-04 01:06:39 UTC (rev 1459) @@ -64,7 +64,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#isAppropriateListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#isAppropriateListener(javax.faces.event.FacesListener)}. */ public final void testIsAppropriateListenerFacesListener() { assertTrue((event.isAppropriateListener(new MockTreeStateCommandsListener()))); @@ -74,7 +74,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. */ public final void testProcessListenerFacesListener() { MockTreeStateCommandsListener listener = new MockTreeStateCommandsListener(); @@ -87,7 +87,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. */ public final void testProcessListenerExceptionHandle() { MockTreeStateCommandsListener listener = new MockExceptionTreeStateCommandsListener(); Modified: trunk/ui/tree/src/test/java/org/richfaces/component/state/events/CollapseNodeCommandEventTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/state/events/CollapseNodeCommandEventTest.java 2007-07-04 00:30:26 UTC (rev 1458) +++ trunk/ui/tree/src/test/java/org/richfaces/component/state/events/CollapseNodeCommandEventTest.java 2007-07-04 01:06:39 UTC (rev 1459) @@ -77,7 +77,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#isAppropriateListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#isAppropriateListener(javax.faces.event.FacesListener)}. */ public final void testIsAppropriateListenerFacesListener() { assertTrue((event.isAppropriateListener(new MockTreeStateCommandsListener()))); @@ -87,7 +87,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. */ public final void testProcessListenerFacesListener() { MockTreeStateCommandsListener listener = new MockTreeStateCommandsListener(); @@ -100,7 +100,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. */ public final void testProcessListenerExceptionHandle() { MockTreeStateCommandsListener listener = new MockExceptionTreeStateCommandsListener(); Modified: trunk/ui/tree/src/test/java/org/richfaces/component/state/events/ExpandAllCommandEventTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/state/events/ExpandAllCommandEventTest.java 2007-07-04 00:30:26 UTC (rev 1458) +++ trunk/ui/tree/src/test/java/org/richfaces/component/state/events/ExpandAllCommandEventTest.java 2007-07-04 01:06:39 UTC (rev 1459) @@ -64,7 +64,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#isAppropriateListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#isAppropriateListener(javax.faces.event.FacesListener)}. */ public final void testIsAppropriateListenerFacesListener() { assertTrue((event.isAppropriateListener(new MockTreeStateCommandsListener()))); @@ -74,7 +74,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. */ public final void testProcessListenerFacesListener() { MockTreeStateCommandsListener listener = new MockTreeStateCommandsListener(); @@ -87,7 +87,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. */ public final void testProcessListenerExceptionHandle() { MockTreeStateCommandsListener listener = new MockExceptionTreeStateCommandsListener(); Modified: trunk/ui/tree/src/test/java/org/richfaces/component/state/events/ExpandNodeCommandEventTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/state/events/ExpandNodeCommandEventTest.java 2007-07-04 00:30:26 UTC (rev 1458) +++ trunk/ui/tree/src/test/java/org/richfaces/component/state/events/ExpandNodeCommandEventTest.java 2007-07-04 01:06:39 UTC (rev 1459) @@ -77,7 +77,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#isAppropriateListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#isAppropriateListener(javax.faces.event.FacesListener)}. */ public final void testIsAppropriateListenerFacesListener() { assertTrue((event.isAppropriateListener(new MockTreeStateCommandsListener()))); @@ -87,7 +87,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. */ public final void testProcessListenerFacesListener() { MockTreeStateCommandsListener listener = new MockTreeStateCommandsListener(); @@ -100,7 +100,7 @@ } /** - * Test method for {@link org.richfaces.component.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. + * Test method for {@link org.richfaces.model.state.events.TreeStateCommandEvent#processListener(javax.faces.event.FacesListener)}. */ public final void testProcessListenerExceptionHandle() { MockTreeStateCommandsListener listener = new MockExceptionTreeStateCommandsListener();

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1458 - in trunk: framework/api/src/main/java/org/ajax4jsf/application and 78 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-07-03 20:30:26 -0400 (Tue, 03 Jul 2007) New Revision: 1458 Added: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ trunk/framework/api/src/main/java/org/richfaces/skin/ Removed: trunk/framework/api/src/main/java/org/ajax4jsf/framework/resource/ trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/ trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/ trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java Modified: trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunction.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSMin.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSObject.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSReference.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptString.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResource.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java trunk/framework/api/src/main/java/org/richfaces/skin/SkinConfiguration.java trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java trunk/framework/api/src/main/java/org/richfaces/skin/SkinNotFoundException.java trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/ResourceBundleMap.java trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/DnDScript.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/DebugOutputMaker.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContent.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitFactory.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ComponentUtils.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererUtils.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/HtmlCompiler.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElementCreateRule.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/WithDefaultsRulesWrapper.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/BaseResourceRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CacheKey.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CachedResourceContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ClientScript.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/FacesResourceContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/GifRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/HTMLRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ImageRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceService.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JarResource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Java2Dresource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JpegRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/LogfileRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/OneTimeRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Png8Renderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/PngRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceLifecycle.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ScriptRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ServletResourceContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/SmartPositionScript.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSResource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/UserResource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/DummySkinConfiguration.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinBean.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinFactoryImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinPropertyResolver.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinVariableResolver.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentBodyTagBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentTagBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/GifEncoder.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlColor.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlDimensions.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/SelectUtils.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/Base64.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/URL64Codec.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/DiffusionFilterOp.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageGenerator.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageInfo.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWaiter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWrapper.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/RoundGradientPaint.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/SimpleGIFEncoder.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/imageio/gif/GIFImageWriter.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Configuration.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java trunk/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java trunk/framework/impl/src/main/resources/META-INF/faces-config.xml trunk/framework/impl/src/test/java/org/ajax4jsf/framework/util/javascript/ScriptUtilsTest.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java trunk/framework/test/src/test/java/DnDScriptTest.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml trunk/ui/core/src/main/config/resources/resources-config.xml trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIActionParameter.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/resource/UIMediaOutput.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxStatusRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/ActionParamHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/FacetHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/KeepAliveHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/ActionParamTag.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxSupportTag.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.java trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImage.java trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerButtonGradient.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerFieldGradient.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonDown.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonUp.java trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DRenderer.java trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientA.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientB.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/DotSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/GridSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/LineSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/SquareSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java Log: packages and classes refactor Copied: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -0,0 +1,312 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf; + +import java.text.MessageFormat; +import java.util.ResourceBundle; + +public class Messages { + private static final String BUNDLE_NAME = "org.ajax4jsf.framework.util.message.messages"; + static ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME); + + public static final String getMessage(String name) { + String value = bundle.getString(name); + return value == null ? "%" + name + "%" : bundle.getString(name); + } + + public static final String getMessage(String name, Object param) { + String pattern = bundle.getString(name); + if(pattern == null) return "%" + name + "%"; + return MessageFormat.format(pattern, new Object[]{param}); + } + + public static final String getMessage(String name, Object param1, Object param2) { + String pattern = bundle.getString(name); + if(pattern == null) return "%" + name + "%"; + return MessageFormat.format(pattern, new Object[]{param1, param2}); + } + + public static final String getMessage(String name, Object[] params) { + String pattern = bundle.getString(name); + if(pattern == null) return "%" + name + "%"; + return MessageFormat.format(pattern, params); + } + + public static final String BUNDLE_MAP_NO_PUT_VALUE = "BUNDLE_MAP_NO_PUT_VALUE"; + public static final String BUNDLE_MAP_NO_REMOVE_VALUE = "BUNDLE_MAP_NO_REMOVE_VALUE"; + public static final String NO_CONVERTER_REGISTERED = "NO_CONVERTER_REGISTERED"; + public static final String FOR_TARGETS_NO_AJAX_CONTAINER = "FOR_TARGETS_NO_AJAX_CONTAINER"; + public static final String VAR_MUST_BE_LITERAL = "VAR_MUST_BE_LITERAL"; + public static final String EVENT_MUST_BE_LITERAL = "EVENT_MUST_BE_LITERAL"; + public static final String CREATE_JAVASCRIPT_EVENT = "CREATE_JAVASCRIPT_EVENT"; + public static final String CALLED_SET_PARENT = "CALLED_SET_PARENT"; + public static final String DETECT_NEW_COMPONENT = "DETECT_NEW_COMPONENT"; + public static final String SET_VALUE_BINDING_FOR_EVENT = "SET_VALUE_BINDING_FOR_EVENT"; + public static final String COULD_NOT_LOAD_RESOURCE_BUNDLE = "COULD_NOT_LOAD_RESOURCE_BUNDLE"; + public static final String FACES_CONTEXT_NOT_CREATED = "FACES_CONTEXT_NOT_CREATED"; + public static final String FACES_CONTEXT_HAS_NOT_EXTERNAL = "FACES_CONTEXT_HAS_NOT_EXTERNAL"; + public static final String FACES_CONTEXT_HAS_NOT_RESPONSE = "FACES_CONTEXT_HAS_NOT_RESPONSE"; + public static final String CREATE_ALTERNATE_HANDLER = "CREATE_ALTERNATE_HANDLER"; + public static final String ALTERNATE_HANDLER_CONSTRUCTOR_WARNING = "ALTERNATE_HANDLER_CONSTRUCTOR_WARNING"; + public static final String VIEW_HANDLER_INSTANTIATION_ERROR = "VIEW_HANDLER_INSTANTIATION_ERROR"; + public static final String ERROR_ON_PAGE = "ERROR_ON_PAGE"; + public static final String LIFECYCLE_ERROR = "LIFECYCLE_ERROR"; + public static final String LIFECYCLE_ERROR_AT_PHASE = "LIFECYCLE_ERROR_AT_PHASE"; + public static final String COMPONENT_TREE_NOT_CREATED = "COMPONENT_TREE_NOT_CREATED"; + public static final String SET_AJAX_LISTENER = "SET_AJAX_LISTENER"; + public static final String ADD_AJAX_AREA = "ADD_AJAX_AREA"; + public static final String ADD_AJAX_AREAS = "ADD_AJAX_AREAS"; + public static final String SET_AJAX_REQUEST = "SET_AJAX_REQUEST"; + public static final String SUBMITTED_AJAX_REQUEST = "SUBMITTED_AJAX_REQUEST"; + public static final String SEND_EVENT_TO_AJAX_LISTENER = "SEND_EVENT_TO_AJAX_LISTENER"; + public static final String RENDER_AJAX_REQUEST = "RENDER_AJAX_REQUEST"; + public static final String RENDERING_AJAX_REGION_ERROR = "RENDERING_AJAX_REGION_ERROR"; + public static final String RESTORE_AJAX_COMPONENT_STATE = "RESTORE_AJAX_COMPONENT_STATE"; + public static final String SAVE_AJAX_COMPONENT_STATE = "SAVE_AJAX_COMPONENT_STATE"; + public static final String CREATE_AJAX_AREAS_SET_TO_RENDER = "CREATE_AJAX_AREAS_SET_TO_RENDER"; + public static final String ARGUMENT_IS_NOT_AJAX_REGION_ERROR = "ARGUMENT_IS_NOT_AJAX_REGION_ERROR"; + public static final String NULL_EVENT_SUBMITTED_ERROR = "NULL_EVENT_SUBMITTED_ERROR"; + public static final String CONTENT_TYPE_ENCODING = "CONTENT_TYPE_ENCODING"; + public static final String CONTENT_TYPE_NO_ENCODING = "CONTENT_TYPE_NO_ENCODING"; + public static final String FILTER_START_INFO = "FILTER_START_INFO"; + public static final String FILTER_XML_OUTPUT = "FILTER_XML_OUTPUT"; + public static final String FILTER_NO_XML_CHAIN = "FILTER_NO_XML_CHAIN"; + public static final String FILTER_NO_XML_CHAIN_2 = "FILTER_NO_XML_CHAIN_2"; + public static final String FILTER_STOP_INFO = "FILTER_STOP_INFO"; + public static final String PARSER_NOT_INSTANTIATED_ERROR = "PARSER_NOT_INSTANTIATED_ERROR"; + public static final String PARSING_TIME_INFO = "PARSING_TIME_INFO"; + public static final String JTIDY_PARSING_ERROR = "JTIDY_PARSING_ERROR"; + public static final String COMPONENT_NOT_FOUND = "COMPONENT_NOT_FOUND"; + public static final String EVENT_IS_READ_ONLY = "EVENT_IS_READ_ONLY"; + public static final String FLUSH_BUFFERED_STREAM_ERROR = "FLUSH_BUFFERED_STREAM_ERROR"; + public static final String UNSUPPORTED_ENCODING_WARNING = "UNSUPPORTED_ENCODING_WARNING"; + public static final String UNSUPPORTED_ENCODING_WARNING_2 = "UNSUPPORTED_ENCODING_WARNING_2"; + public static final String NO_WRITER_CALLED_INFO = "NO_WRITER_CALLED_INFO"; + public static final String PARSE_XML_DOCUMENT_INFO = "PARSE_XML_DOCUMENT_INFO"; + public static final String NO_WRITER_POSSIBLE_ERROR = "NO_WRITER_POSSIBLE_ERROR"; + public static final String CREATE_WRITER_INFO = "CREATE_WRITER_INFO"; + public static final String NO_STREAM_POSSIBLE_ERROR = "NO_STREAM_POSSIBLE_ERROR"; + public static final String CREATE_STREAM_INFO = "CREATE_STREAM_INFO"; + public static final String OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR = "OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR"; + public static final String VARIABLE_SUBSTITUTION_WARNING = "VARIABLE_SUBSTITUTION_WARNING"; + public static final String START_DOCUMENT_SAX_EXCEPTION = "START_DOCUMENT_SAX_EXCEPTION"; + public static final String COMMENT_SAX_EXCEPTION = "COMMENT_SAX_EXCEPTION"; + public static final String END_ELEMENT_SAX_EXCEPTION = "END_ELEMENT_SAX_EXCEPTION"; + public static final String END_DOCUMENT_SAX_EXCEPTION = "END_DOCUMENT_SAX_EXCEPTION"; + public static final String START_ELEMENT_SAX_EXCEPTION = "START_ELEMENT_SAX_EXCEPTION"; + public static final String TEXT_SAX_EXCEPTION = "TEXT_SAX_EXCEPTION"; + public static final String MESSAGE_PARSING_INFO = "MESSAGE_PARSING_INFO"; + public static final String CREATE_JTIDY_INFO = "CREATE_JTIDY_INFO"; + public static final String READING_TIDY_PROPERTIES_ERROR = "READING_TIDY_PROPERTIES_ERROR"; + public static final String ILLEGAL_METHOD_STATE = "ILLEGAL_METHOD_STATE"; + public static final String WRAPPED_RULES_NULL_ERROR = "WRAPPED_RULES_NULL_ERROR"; + public static final String NO_NAME_ATTRIBUTE_ERROR = "NO_NAME_ATTRIBUTE_ERROR"; + public static final String ENCODE_COMPILED_TEMPLATE_INFO = "ENCODE_COMPILED_TEMPLATE_INFO"; + public static final String ENCODING_TEMPLATE_TERMINATED_INFO = "ENCODING_TEMPLATE_TERMINATED_INFO"; + public static final String ENCODE_COMPILED_TEMPLATE_INFO2 = "ENCODE_COMPILED_TEMPLATE_INFO2"; + public static final String CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR = "CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR"; + public static final String COMPONENT_CLASS_ERROR = "COMPONENT_CLASS_ERROR"; + public static final String CONTEXT_NULL_ERROR = "CONTEXT_NULL_ERROR"; + public static final String COMPONENT_NULL_ERROR = "COMPONENT_NULL_ERROR"; + public static final String START_DECODING_COMPONENT_INFO = "START_DECODING_COMPONENT_INFO"; + public static final String START_ENCODING_COMPONENT_INFO = "START_ENCODING_COMPONENT_INFO"; + public static final String CHILDREN_ENCODING_COMPONENT_INFO = "CHILDREN_ENCODING_COMPONENT_INFO"; + public static final String FINISH_ENCODING_COMPONENT_INFO = "FINISH_ENCODING_COMPONENT_INFO"; + public static final String NAMESPACE_NOT_RECOGNIZED_ERROR = "NAMESPACE_NOT_RECOGNIZED_ERROR"; + public static final String RENDERER_METHOD_NOT_SET_ERROR = "RENDERER_METHOD_NOT_SET_ERROR"; + public static final String METHOD_CALL_ERROR_1 = "METHOD_CALL_ERROR_1"; + public static final String METHOD_CALL_ERROR_2 = "METHOD_CALL_ERROR_2"; + public static final String METHOD_CALL_ERROR_3 = "METHOD_CALL_ERROR_3"; + public static final String METHOD_CALL_ERROR_4 = "METHOD_CALL_ERROR_4"; + public static final String METHOD_CALL_ERROR_5 = "METHOD_CALL_ERROR_5"; + public static final String METHOD_CALL_ERROR_6 = "METHOD_CALL_ERROR_6"; + public static final String METHOD_CALL_ERROR_1a = "METHOD_CALL_ERROR_1a"; + public static final String METHOD_CALL_ERROR_2a = "METHOD_CALL_ERROR_2a"; + public static final String METHOD_CALL_ERROR_3a = "METHOD_CALL_ERROR_3a"; + public static final String METHOD_CALL_ERROR_4a = "METHOD_CALL_ERROR_4a"; + public static final String METHOD_CALL_ERROR_5a = "METHOD_CALL_ERROR_5a"; + public static final String METHOD_CALL_ERROR_6a = "METHOD_CALL_ERROR_6a"; + public static final String PARSING_TEMPLATE_ERROR = "PARSING_TEMPLATE_ERROR"; + public static final String TEMPLATE_IO_ERROR = "TEMPLATE_IO_ERROR"; + public static final String PARSING_TEMPLATE_ERROR_2 = "PARSING_TEMPLATE_ERROR_2"; + public static final String START_COMPILE_TEMPLATE_INFO = "START_COMPILE_TEMPLATE_INFO"; + public static final String PARSING_TEMPLATE_ERROR_a = "PARSING_TEMPLATE_ERROR_a"; + public static final String TEMPLATE_IO_ERROR_a = "TEMPLATE_IO_ERROR_a"; + public static final String PARSING_TEMPLATE_ERROR_2a = "PARSING_TEMPLATE_ERROR_2a"; + public static final String FINISH_COMPILE_TEMPLATE_INFO = "FINISH_COMPILE_TEMPLATE_INFO"; + public static final String TEMPLATE_NOT_COMPILED_ERROR = "TEMPLATE_NOT_COMPILED_ERROR"; + public static final String NO_CHILD_ALLOWED = "NO_CHILD_ALLOWED"; + public static final String NO_FACET_NAME_ATTRIBUTE = "NO_FACET_NAME_ATTRIBUTE"; + public static final String BREAKPOINTS_UNSUPPORTED_ERROR = "BREAKPOINTS_UNSUPPORTED_ERROR"; + public static final String BREAKPOINT_NOT_REGISTERED_ERROR = "BREAKPOINT_NOT_REGISTERED_ERROR"; + public static final String CHILD_NOT_ALLOWED_ERROR = "CHILD_NOT_ALLOWED_ERROR"; + public static final String INVOKE_RENDERER_METHOD_ERROR = "INVOKE_RENDERER_METHOD_ERROR"; + public static final String METHOD_CALL_ERROR_2b = "METHOD_CALL_ERROR_2b"; + public static final String METHOD_CALL_ERROR_4b = "METHOD_CALL_ERROR_4b"; + public static final String METHOD_CALL_ERROR_6b = "METHOD_CALL_ERROR_6b"; + public static final String STYLE_ATTRIBUTE_ERROR = "STYLE_ATTRIBUTE_ERROR"; + public static final String BREAKPOINTS_UNSUPPORTED_ERROR_2 = "BREAKPOINTS_UNSUPPORTED_ERROR_2"; + public static final String BREAKPOINTS_UNSUPPORTED_ERROR_3 = "BREAKPOINTS_UNSUPPORTED_ERROR_3"; + public static final String REQUEST_CHAMELEON_RENDER_KIT_INFO = "REQUEST_CHAMELEON_RENDER_KIT_INFO"; + public static final String GET_DEFAULT_RENDER_KIT_ERROR = "GET_DEFAULT_RENDER_KIT_ERROR"; + public static final String DEFAULT_RENDER_KIT_INFO = "DEFAULT_RENDER_KIT_INFO"; + public static final String AJAX_RESPONSE_NOT_RENDERED_INFO = "AJAX_RESPONSE_NOT_RENDERED_INFO"; + public static final String ENTER_BEFORE_RENDER_VIEW_PHASE = "ENTER_BEFORE_RENDER_VIEW_PHASE"; + public static final String SET_RENDER_KIT_ID_INFO = "SET_RENDER_KIT_ID_INFO"; + public static final String PROCESS_AJAX_EVENTS_INFO = "PROCESS_AJAX_EVENTS_INFO"; + public static final String DELEGATE_AJAX_PROCESSING_INFO = "DELEGATE_AJAX_PROCESSING_INFO"; + public static final String BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR = "BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR"; + public static final String BUILD_ONCLICK_INFO = "BUILD_ONCLICK_INFO"; + public static final String UNNAMED_PARAMETER_ERROR = "UNNAMED_PARAMETER_ERROR"; + public static final String AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING = "AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING"; + public static final String COMPONENT_NULL_ERROR_2 = "COMPONENT_NULL_ERROR_2"; + public static final String CALCULATE_COMPONENT_ID_INFO = "CALCULATE_COMPONENT_ID_INFO"; + public static final String DETECTING_ENCODING_DISABLED_ERROR = "DETECTING_ENCODING_DISABLED_ERROR"; + public static final String OBTAIN_RESPONSE_SET_HEADER_ERROR = "OBTAIN_RESPONSE_SET_HEADER_ERROR"; + public static final String INVOKE_AJAX_REGION_LISTENER = "INVOKE_AJAX_REGION_LISTENER"; + public static final String APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING = "APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING"; + public static final String RENDER_CHILDREN_NON_AJAX_INFO = "RENDER_CHILDREN_NON_AJAX_INFO"; + public static final String RENDER_CHILDREN_AJAX_INFO = "RENDER_CHILDREN_AJAX_INFO"; + public static final String ENCODE_CHILD_AJAX_INFO = "ENCODE_CHILD_AJAX_INFO"; + public static final String RENDER_AJAX_AREA_INFO = "RENDER_AJAX_AREA_INFO"; + public static final String DECODE_AJAX_REQUEST_STATUS_INFO = "DECODE_AJAX_REQUEST_STATUS_INFO"; + public static final String REQUEST_PARAMETERS_MAP = "REQUEST_PARAMETERS_MAP"; + public static final String SET_MYFACES_SEQUENCE_INFO = "SET_MYFACES_SEQUENCE_INFO"; + public static final String SKIP_ENCODING_HTML_INFO = "SKIP_ENCODING_HTML_INFO"; + public static final String SKIP_ENCODE_BEGIN_HTML_INFO = "SKIP_ENCODE_BEGIN_HTML_INFO"; + public static final String SKIP_ENCODE_END_HTML_INFO = "SKIP_ENCODE_END_HTML_INFO"; + public static final String QUERY_STRING_BUILDING_ERROR = "QUERY_STRING_BUILDING_ERROR"; + public static final String BUILD_RESOURCE_URI_INFO = "BUILD_RESOURCE_URI_INFO"; + public static final String RESTORE_DATA_FROM_RESOURCE_URI_INFO = "RESTORE_DATA_FROM_RESOURCE_URI_INFO"; + public static final String DESERIALIZE_DATA_INPUT_ERROR = "DESERIALIZE_DATA_INPUT_ERROR"; + public static final String DATA_CLASS_NOT_FOUND_ERROR = "DATA_CLASS_NOT_FOUND_ERROR"; + public static final String METHOD_NOT_IMPLEMENTED = "METHOD_NOT_IMPLEMENTED"; + public static final String ENCODE_HTML_INFO = "ENCODE_HTML_INFO"; + public static final String ENCODE_HTML_INFO_2 = "ENCODE_HTML_INFO_2"; + public static final String ENCODE_BEGIN_HTML_INFO = "ENCODE_BEGIN_HTML_INFO"; + public static final String ENCODE_END_HTML_INFO = "ENCODE_END_HTML_INFO"; + public static final String SEND_CONTENT_INFO = "SEND_CONTENT_INFO"; + public static final String NO_INPUT_STREAM_ERROR = "NO_INPUT_STREAM_ERROR"; + public static final String SET_RESPONSE_HEADERS_INFO = "SET_RESPONSE_HEADERS_INFO"; + public static final String BUILD_RESOURCE_INFO = "BUILD_RESOURCE_INFO"; + public static final String NO_RESOURCE_REGISTERED_ERROR = "NO_RESOURCE_REGISTERED_ERROR"; + public static final String NO_RESOURCE_REGISTERED_ERROR_2 = "NO_RESOURCE_REGISTERED_ERROR_2"; + public static final String NO_RESOURCE_EXISTS_ERROR = "NO_RESOURCE_EXISTS_ERROR"; + public static final String INSTANTIATE_RESOURCE_ERROR = "INSTANTIATE_RESOURCE_ERROR"; + public static final String INSTANTIATE_CLASS_ERROR = "INSTANTIATE_CLASS_ERROR"; + public static final String STATIC_RESOURCE_NOT_FOUND_ERROR = "STATIC_RESOURCE_NOT_FOUND_ERROR"; + public static final String PARSING_IF_MODIFIED_SINCE_WARNING = "PARSING_IF_MODIFIED_SINCE_WARNING"; + public static final String GET_CONTENT_FROM_CACHE_INFO = "GET_CONTENT_FROM_CACHE_INFO"; + public static final String CONTENT_NOT_FOUND_ERROR = "CONTENT_NOT_FOUND_ERROR"; + public static final String SEND_RESOURCE_ERROR = "SEND_RESOURCE_ERROR"; + public static final String SEND_RESOURCE_ERROR_2 = "SEND_RESOURCE_ERROR_2"; + public static final String READING_PROPERTIES_ERROR = "READING_PROPERTIES_ERROR"; + public static final String SEND_IMAGE_ERROR = "SEND_IMAGE_ERROR"; + public static final String SEND_IMAGE_ERROR_2 = "SEND_IMAGE_ERROR_2"; + public static final String SKIP_ENCODE_BEGIN_HTML_INFO_2 = "SKIP_ENCODE_BEGIN_HTML_INFO_2"; + public static final String MARK_AS_RENDERED_INFO = "MARK_AS_RENDERED_INFO"; + public static final String SKIP_ENCODE_END_HTML_INFO_2 = "SKIP_ENCODE_END_HTML_INFO_2"; + public static final String VARIABLE_SUBSTITUTION_ERROR = "VARIABLE_SUBSTITUTION_ERROR"; + public static final String SET_SKIN_FACTORY_INFO = "SET_SKIN_FACTORY_INFO"; + public static final String CREATING_SKIN_FACTORY_ERROR = "CREATING_SKIN_FACTORY_ERROR"; + public static final String NULL_SKIN_NAME_ERROR = "NULL_SKIN_NAME_ERROR"; + public static final String CREATE_SKIN_INFO = "CREATE_SKIN_INFO"; + public static final String DEFAULT_PROPERTIES_NOT_FOUND_ERROR = "DEFAULT_PROPERTIES_NOT_FOUND_ERROR"; + public static final String SKIN_PROPERTIES_IO_ERROR = "SKIN_PROPERTIES_IO_ERROR"; + public static final String SKIN_NOT_FOUND_ERROR = "SKIN_NOT_FOUND_ERROR"; + public static final String ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR = "ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR"; + public static final String ACESSING_SKIN_PROPERTY_ERROR = "ACESSING_SKIN_PROPERTY_ERROR"; + public static final String SKIN_PROPERTIES_READ_ONLY_ERROR = "SKIN_PROPERTIES_READ_ONLY_ERROR"; + public static final String NO_VALUE_HOLDER_ERROR = "NO_VALUE_HOLDER_ERROR"; + public static final String NO_EDITABLE_VALUE_HOLDER_ERROR = "NO_EDITABLE_VALUE_HOLDER_ERROR"; + public static final String INVALID_VALIDATION_EXPRESSION = "INVALID_VALIDATION_EXPRESSION"; + public static final String NO_ACTION_SOURCE_ERROR = "NO_ACTION_SOURCE_ERROR"; + public static final String INVALID_ACTION_LISTENER = "INVALID_ACTION_LISTENER"; + public static final String INVALID_VALUE_CHANGE_LISTENER = "INVALID_VALUE_CHANGE_LISTENER"; + public static final String NO_VALUE_REFERENCE_ERROR = "NO_VALUE_REFERENCE_ERROR"; + public static final String NO_BYTE_ARRAY_ERROR = "NO_BYTE_ARRAY_ERROR"; + public static final String BUFFER_TYPE_ERROR = "BUFFER_TYPE_ERROR"; + public static final String IMAGE_ERROR = "IMAGE_ERROR"; + public static final String CANNOT_WRITE_RASTERS = "CANNOT_WRITE_RASTERS"; + public static final String NULL_OUTPUT_ERROR = "NULL_OUTPUT_ERROR"; + public static final String IMAGE_NOT_BUFFERED_ERROR = "IMAGE_NOT_BUFFERED_ERROR"; + public static final String NOT_DATA_OUTPUT_ERROR = "NOT_DATA_OUTPUT_ERROR"; + public static final String NULL_COLOR_PARAMETER_ERROR = "NULL_COLOR_PARAMETER_ERROR"; + public static final String DECODE_COLOR_PARAMETER_ERROR = "DECODE_COLOR_PARAMETER_ERROR"; + public static final String NULL_COLOR_PARAMETER_ERROR_2 = "NULL_COLOR_PARAMETER_ERROR_2"; + public static final String DECODE_PARAMETER_ERROR = "DECODE_PARAMETER_ERROR"; + public static final String IMAGE_GENERATOR_CLASS_NOT_FOUND = "IMAGE_GENERATOR_CLASS_NOT_FOUND"; + public static final String CREATING_IMAGE_GENERATOR_ERROR = "CREATING_IMAGE_GENERATOR_ERROR"; + public static final String INVALID_COMMENT_INDEX = "INVALID_COMMENT_INDEX"; + public static final String LOADING_IMAGE_ERROR = "LOADING_IMAGE_ERROR"; + public static final String NOT_INDEXED_IMAGE_ERROR = "NOT_INDEXED_IMAGE_ERROR"; + public static final String INVALID_RADIUS = "INVALID_RADIUS"; + public static final String INVALID_ATTRIBUTE_VALUE = "INVALID_ATTRIBUTE_VALUE"; + public static final String VALUE_BINDING_TYPE_ERROR = "VALUE_BINDING_TYPE_ERROR"; + public static final String NO_CONVERTER_FOUND_ERROR = "NO_CONVERTER_FOUND_ERROR"; + public static final String GRABBER_ERROR = "GRABBER_ERROR"; + public static final String TOOMANY_COLORS_ERROR = "TOOMANY_COLORS_ERROR"; + public static final String GET_RESOURCE_AS_STREAM_ERROR = "GET_RESOURCE_AS_STREAM_ERROR"; + public static final String PARSING_WEB_XML_IO_ERROR = "PARSING_WEB_XML_IO_ERROR"; + public static final String PARSING_WEB_XML_SAX_ERROR = "PARSING_WEB_XML_SAX_ERROR"; + public static final String NULL_FILTER_NAME_WARNING = "NULL_FILTER_NAME_WARNING"; + public static final String FILTER_NOT_FOUND_ERROR = "FILTER_NOT_FOUND_ERROR"; + public static final String FILTER_NOT_CONFIGURED_ERROR = "FILTER_NOT_CONFIGURED_ERROR"; + public static final String NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR = "NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR"; + public static final String CONFIG_INITIALIZATION_ERROR = "CONFIG_INITIALIZATION_ERROR"; + public static final String FIELD_READING_ERROR = "FIELD_READING_ERROR"; + public static final String CONFIG_INITIALIZATION_ERROR_2 = "CONFIG_INITIALIZATION_ERROR_2"; + public static final String DOM_METHOD_NOT_SUPPORTED = "DOM_METHOD_NOT_SUPPORTED"; + public static final String METHOD_NOT_SUPPORTED = "METHOD_NOT_SUPPORTED"; + public static final String NAMED_ITEM_NOT_FOUND_ERROR = "NAMED_ITEM_NOT_FOUND_ERROR"; + public static final String AJAX_SUPPORT_REQUEST_PARAMETER_INFO = "AJAX_SUPPORT_REQUEST_PARAMETER_INFO"; + public static final String COMMAND_LINK_SUBMIT_INFO = "COMMAND_LINK_SUBMIT_INFO"; + public static final String COMMAND_LINK_NOT_IN_FORM_WARNING = "COMMAND_LINK_NOT_IN_FORM_WARNING"; + public static final String MUST_BE_EXPRESSION_ERROR = "MUST_BE_EXPRESSION_ERROR"; + public static final String NOT_PARENT_AJAX_CONTAINER_ERROR = "NOT_PARENT_AJAX_CONTAINER_ERROR"; + public static final String MUST_BE_LITERAL_ERROR = "MUST_BE_LITERAL_ERROR"; + public static final String FACET_TAG_MANY_CHILDREN_ERROR = "FACET_TAG_MANY_CHILDREN_ERROR"; + public static final String NO_UI_COMPONENT_TAG_ANCESTOR_ERROR = "NO_UI_COMPONENT_TAG_ANCESTOR_ERROR"; + public static final String NO_VALUE_REFERENCE_ERROR_2 = "NO_VALUE_REFERENCE_ERROR_2"; + public static final String NULL_TYPE_ATTRIBUTE_ERROR = "NULL_TYPE_ATTRIBUTE_ERROR"; + public static final String NULL_ATTRIBUTE_ERROR = "NULL_ATTRIBUTE_ERROR"; + public static final String AJAX_VIEW_EXPIRED = "AJAX_VIEW_EXPIRED"; + public static final String SKIN_CYCLIC_REFERENCE = "SKIN_CYCLIC_REFERENCE"; + public static final String SKIN_ILLEGAL_REFERENCE = "SKIN_ILLEGAL_REFERENCE"; + public static final String NAME_MUST_BE_LITERAL = "NAME_MUST_BE_LITERAL"; + public static final String INSTANTIATE_LISTENER_ERROR = "INSTANTIATE_LISTENER_ERROR"; + public static final String NOT_AJAX_CONTAINER_ERROR = "NOT_AJAX_CONTAINER_ERROR"; + public static final String INVALID_EXPRESSION = "INVALID_EXPRESSION"; + public static final String NOT_INSTANCE_OF_ERROR = "NOT_INSTANCE_OF_ERROR"; + public static final String UNSUPPORTED_ENCODING_ERROR = "UNSUPPORTED_ENCODING_ERROR"; + public static final String UNSUPPORTED_INPUT_SOURCE_ERROR = "UNSUPPORTED_INPUT_SOURCE_ERROR"; + public static final String STRING_CONVERSION_ERROR = "STRING_CONVERSION_ERROR"; + public static final String UTF_CONVERSION_ERROR = "UTF_CONVERSION_ERROR"; + public static final String READ_ONLY_NODE_ERROR = "READ_ONLY_NODE_ERROR"; + public static final String NOT_PARENT_AJAX_COMPONENT_ERROR = "NOT_PARENT_AJAX_COMPONENT_ERROR"; + + public static void main(String[] args) { + String m = getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B"); + System.out.println(m); + } + +} Modified: trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -1,312 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework.util.message; - -import java.text.MessageFormat; -import java.util.ResourceBundle; - -public class Messages { - private static final String BUNDLE_NAME = "org.ajax4jsf.framework.util.message.messages"; - static ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME); - - public static final String getMessage(String name) { - String value = bundle.getString(name); - return value == null ? "%" + name + "%" : bundle.getString(name); - } - - public static final String getMessage(String name, Object param) { - String pattern = bundle.getString(name); - if(pattern == null) return "%" + name + "%"; - return MessageFormat.format(pattern, new Object[]{param}); - } - - public static final String getMessage(String name, Object param1, Object param2) { - String pattern = bundle.getString(name); - if(pattern == null) return "%" + name + "%"; - return MessageFormat.format(pattern, new Object[]{param1, param2}); - } - - public static final String getMessage(String name, Object[] params) { - String pattern = bundle.getString(name); - if(pattern == null) return "%" + name + "%"; - return MessageFormat.format(pattern, params); - } - - public static final String BUNDLE_MAP_NO_PUT_VALUE = "BUNDLE_MAP_NO_PUT_VALUE"; - public static final String BUNDLE_MAP_NO_REMOVE_VALUE = "BUNDLE_MAP_NO_REMOVE_VALUE"; - public static final String NO_CONVERTER_REGISTERED = "NO_CONVERTER_REGISTERED"; - public static final String FOR_TARGETS_NO_AJAX_CONTAINER = "FOR_TARGETS_NO_AJAX_CONTAINER"; - public static final String VAR_MUST_BE_LITERAL = "VAR_MUST_BE_LITERAL"; - public static final String EVENT_MUST_BE_LITERAL = "EVENT_MUST_BE_LITERAL"; - public static final String CREATE_JAVASCRIPT_EVENT = "CREATE_JAVASCRIPT_EVENT"; - public static final String CALLED_SET_PARENT = "CALLED_SET_PARENT"; - public static final String DETECT_NEW_COMPONENT = "DETECT_NEW_COMPONENT"; - public static final String SET_VALUE_BINDING_FOR_EVENT = "SET_VALUE_BINDING_FOR_EVENT"; - public static final String COULD_NOT_LOAD_RESOURCE_BUNDLE = "COULD_NOT_LOAD_RESOURCE_BUNDLE"; - public static final String FACES_CONTEXT_NOT_CREATED = "FACES_CONTEXT_NOT_CREATED"; - public static final String FACES_CONTEXT_HAS_NOT_EXTERNAL = "FACES_CONTEXT_HAS_NOT_EXTERNAL"; - public static final String FACES_CONTEXT_HAS_NOT_RESPONSE = "FACES_CONTEXT_HAS_NOT_RESPONSE"; - public static final String CREATE_ALTERNATE_HANDLER = "CREATE_ALTERNATE_HANDLER"; - public static final String ALTERNATE_HANDLER_CONSTRUCTOR_WARNING = "ALTERNATE_HANDLER_CONSTRUCTOR_WARNING"; - public static final String VIEW_HANDLER_INSTANTIATION_ERROR = "VIEW_HANDLER_INSTANTIATION_ERROR"; - public static final String ERROR_ON_PAGE = "ERROR_ON_PAGE"; - public static final String LIFECYCLE_ERROR = "LIFECYCLE_ERROR"; - public static final String LIFECYCLE_ERROR_AT_PHASE = "LIFECYCLE_ERROR_AT_PHASE"; - public static final String COMPONENT_TREE_NOT_CREATED = "COMPONENT_TREE_NOT_CREATED"; - public static final String SET_AJAX_LISTENER = "SET_AJAX_LISTENER"; - public static final String ADD_AJAX_AREA = "ADD_AJAX_AREA"; - public static final String ADD_AJAX_AREAS = "ADD_AJAX_AREAS"; - public static final String SET_AJAX_REQUEST = "SET_AJAX_REQUEST"; - public static final String SUBMITTED_AJAX_REQUEST = "SUBMITTED_AJAX_REQUEST"; - public static final String SEND_EVENT_TO_AJAX_LISTENER = "SEND_EVENT_TO_AJAX_LISTENER"; - public static final String RENDER_AJAX_REQUEST = "RENDER_AJAX_REQUEST"; - public static final String RENDERING_AJAX_REGION_ERROR = "RENDERING_AJAX_REGION_ERROR"; - public static final String RESTORE_AJAX_COMPONENT_STATE = "RESTORE_AJAX_COMPONENT_STATE"; - public static final String SAVE_AJAX_COMPONENT_STATE = "SAVE_AJAX_COMPONENT_STATE"; - public static final String CREATE_AJAX_AREAS_SET_TO_RENDER = "CREATE_AJAX_AREAS_SET_TO_RENDER"; - public static final String ARGUMENT_IS_NOT_AJAX_REGION_ERROR = "ARGUMENT_IS_NOT_AJAX_REGION_ERROR"; - public static final String NULL_EVENT_SUBMITTED_ERROR = "NULL_EVENT_SUBMITTED_ERROR"; - public static final String CONTENT_TYPE_ENCODING = "CONTENT_TYPE_ENCODING"; - public static final String CONTENT_TYPE_NO_ENCODING = "CONTENT_TYPE_NO_ENCODING"; - public static final String FILTER_START_INFO = "FILTER_START_INFO"; - public static final String FILTER_XML_OUTPUT = "FILTER_XML_OUTPUT"; - public static final String FILTER_NO_XML_CHAIN = "FILTER_NO_XML_CHAIN"; - public static final String FILTER_NO_XML_CHAIN_2 = "FILTER_NO_XML_CHAIN_2"; - public static final String FILTER_STOP_INFO = "FILTER_STOP_INFO"; - public static final String PARSER_NOT_INSTANTIATED_ERROR = "PARSER_NOT_INSTANTIATED_ERROR"; - public static final String PARSING_TIME_INFO = "PARSING_TIME_INFO"; - public static final String JTIDY_PARSING_ERROR = "JTIDY_PARSING_ERROR"; - public static final String COMPONENT_NOT_FOUND = "COMPONENT_NOT_FOUND"; - public static final String EVENT_IS_READ_ONLY = "EVENT_IS_READ_ONLY"; - public static final String FLUSH_BUFFERED_STREAM_ERROR = "FLUSH_BUFFERED_STREAM_ERROR"; - public static final String UNSUPPORTED_ENCODING_WARNING = "UNSUPPORTED_ENCODING_WARNING"; - public static final String UNSUPPORTED_ENCODING_WARNING_2 = "UNSUPPORTED_ENCODING_WARNING_2"; - public static final String NO_WRITER_CALLED_INFO = "NO_WRITER_CALLED_INFO"; - public static final String PARSE_XML_DOCUMENT_INFO = "PARSE_XML_DOCUMENT_INFO"; - public static final String NO_WRITER_POSSIBLE_ERROR = "NO_WRITER_POSSIBLE_ERROR"; - public static final String CREATE_WRITER_INFO = "CREATE_WRITER_INFO"; - public static final String NO_STREAM_POSSIBLE_ERROR = "NO_STREAM_POSSIBLE_ERROR"; - public static final String CREATE_STREAM_INFO = "CREATE_STREAM_INFO"; - public static final String OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR = "OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR"; - public static final String VARIABLE_SUBSTITUTION_WARNING = "VARIABLE_SUBSTITUTION_WARNING"; - public static final String START_DOCUMENT_SAX_EXCEPTION = "START_DOCUMENT_SAX_EXCEPTION"; - public static final String COMMENT_SAX_EXCEPTION = "COMMENT_SAX_EXCEPTION"; - public static final String END_ELEMENT_SAX_EXCEPTION = "END_ELEMENT_SAX_EXCEPTION"; - public static final String END_DOCUMENT_SAX_EXCEPTION = "END_DOCUMENT_SAX_EXCEPTION"; - public static final String START_ELEMENT_SAX_EXCEPTION = "START_ELEMENT_SAX_EXCEPTION"; - public static final String TEXT_SAX_EXCEPTION = "TEXT_SAX_EXCEPTION"; - public static final String MESSAGE_PARSING_INFO = "MESSAGE_PARSING_INFO"; - public static final String CREATE_JTIDY_INFO = "CREATE_JTIDY_INFO"; - public static final String READING_TIDY_PROPERTIES_ERROR = "READING_TIDY_PROPERTIES_ERROR"; - public static final String ILLEGAL_METHOD_STATE = "ILLEGAL_METHOD_STATE"; - public static final String WRAPPED_RULES_NULL_ERROR = "WRAPPED_RULES_NULL_ERROR"; - public static final String NO_NAME_ATTRIBUTE_ERROR = "NO_NAME_ATTRIBUTE_ERROR"; - public static final String ENCODE_COMPILED_TEMPLATE_INFO = "ENCODE_COMPILED_TEMPLATE_INFO"; - public static final String ENCODING_TEMPLATE_TERMINATED_INFO = "ENCODING_TEMPLATE_TERMINATED_INFO"; - public static final String ENCODE_COMPILED_TEMPLATE_INFO2 = "ENCODE_COMPILED_TEMPLATE_INFO2"; - public static final String CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR = "CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR"; - public static final String COMPONENT_CLASS_ERROR = "COMPONENT_CLASS_ERROR"; - public static final String CONTEXT_NULL_ERROR = "CONTEXT_NULL_ERROR"; - public static final String COMPONENT_NULL_ERROR = "COMPONENT_NULL_ERROR"; - public static final String START_DECODING_COMPONENT_INFO = "START_DECODING_COMPONENT_INFO"; - public static final String START_ENCODING_COMPONENT_INFO = "START_ENCODING_COMPONENT_INFO"; - public static final String CHILDREN_ENCODING_COMPONENT_INFO = "CHILDREN_ENCODING_COMPONENT_INFO"; - public static final String FINISH_ENCODING_COMPONENT_INFO = "FINISH_ENCODING_COMPONENT_INFO"; - public static final String NAMESPACE_NOT_RECOGNIZED_ERROR = "NAMESPACE_NOT_RECOGNIZED_ERROR"; - public static final String RENDERER_METHOD_NOT_SET_ERROR = "RENDERER_METHOD_NOT_SET_ERROR"; - public static final String METHOD_CALL_ERROR_1 = "METHOD_CALL_ERROR_1"; - public static final String METHOD_CALL_ERROR_2 = "METHOD_CALL_ERROR_2"; - public static final String METHOD_CALL_ERROR_3 = "METHOD_CALL_ERROR_3"; - public static final String METHOD_CALL_ERROR_4 = "METHOD_CALL_ERROR_4"; - public static final String METHOD_CALL_ERROR_5 = "METHOD_CALL_ERROR_5"; - public static final String METHOD_CALL_ERROR_6 = "METHOD_CALL_ERROR_6"; - public static final String METHOD_CALL_ERROR_1a = "METHOD_CALL_ERROR_1a"; - public static final String METHOD_CALL_ERROR_2a = "METHOD_CALL_ERROR_2a"; - public static final String METHOD_CALL_ERROR_3a = "METHOD_CALL_ERROR_3a"; - public static final String METHOD_CALL_ERROR_4a = "METHOD_CALL_ERROR_4a"; - public static final String METHOD_CALL_ERROR_5a = "METHOD_CALL_ERROR_5a"; - public static final String METHOD_CALL_ERROR_6a = "METHOD_CALL_ERROR_6a"; - public static final String PARSING_TEMPLATE_ERROR = "PARSING_TEMPLATE_ERROR"; - public static final String TEMPLATE_IO_ERROR = "TEMPLATE_IO_ERROR"; - public static final String PARSING_TEMPLATE_ERROR_2 = "PARSING_TEMPLATE_ERROR_2"; - public static final String START_COMPILE_TEMPLATE_INFO = "START_COMPILE_TEMPLATE_INFO"; - public static final String PARSING_TEMPLATE_ERROR_a = "PARSING_TEMPLATE_ERROR_a"; - public static final String TEMPLATE_IO_ERROR_a = "TEMPLATE_IO_ERROR_a"; - public static final String PARSING_TEMPLATE_ERROR_2a = "PARSING_TEMPLATE_ERROR_2a"; - public static final String FINISH_COMPILE_TEMPLATE_INFO = "FINISH_COMPILE_TEMPLATE_INFO"; - public static final String TEMPLATE_NOT_COMPILED_ERROR = "TEMPLATE_NOT_COMPILED_ERROR"; - public static final String NO_CHILD_ALLOWED = "NO_CHILD_ALLOWED"; - public static final String NO_FACET_NAME_ATTRIBUTE = "NO_FACET_NAME_ATTRIBUTE"; - public static final String BREAKPOINTS_UNSUPPORTED_ERROR = "BREAKPOINTS_UNSUPPORTED_ERROR"; - public static final String BREAKPOINT_NOT_REGISTERED_ERROR = "BREAKPOINT_NOT_REGISTERED_ERROR"; - public static final String CHILD_NOT_ALLOWED_ERROR = "CHILD_NOT_ALLOWED_ERROR"; - public static final String INVOKE_RENDERER_METHOD_ERROR = "INVOKE_RENDERER_METHOD_ERROR"; - public static final String METHOD_CALL_ERROR_2b = "METHOD_CALL_ERROR_2b"; - public static final String METHOD_CALL_ERROR_4b = "METHOD_CALL_ERROR_4b"; - public static final String METHOD_CALL_ERROR_6b = "METHOD_CALL_ERROR_6b"; - public static final String STYLE_ATTRIBUTE_ERROR = "STYLE_ATTRIBUTE_ERROR"; - public static final String BREAKPOINTS_UNSUPPORTED_ERROR_2 = "BREAKPOINTS_UNSUPPORTED_ERROR_2"; - public static final String BREAKPOINTS_UNSUPPORTED_ERROR_3 = "BREAKPOINTS_UNSUPPORTED_ERROR_3"; - public static final String REQUEST_CHAMELEON_RENDER_KIT_INFO = "REQUEST_CHAMELEON_RENDER_KIT_INFO"; - public static final String GET_DEFAULT_RENDER_KIT_ERROR = "GET_DEFAULT_RENDER_KIT_ERROR"; - public static final String DEFAULT_RENDER_KIT_INFO = "DEFAULT_RENDER_KIT_INFO"; - public static final String AJAX_RESPONSE_NOT_RENDERED_INFO = "AJAX_RESPONSE_NOT_RENDERED_INFO"; - public static final String ENTER_BEFORE_RENDER_VIEW_PHASE = "ENTER_BEFORE_RENDER_VIEW_PHASE"; - public static final String SET_RENDER_KIT_ID_INFO = "SET_RENDER_KIT_ID_INFO"; - public static final String PROCESS_AJAX_EVENTS_INFO = "PROCESS_AJAX_EVENTS_INFO"; - public static final String DELEGATE_AJAX_PROCESSING_INFO = "DELEGATE_AJAX_PROCESSING_INFO"; - public static final String BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR = "BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR"; - public static final String BUILD_ONCLICK_INFO = "BUILD_ONCLICK_INFO"; - public static final String UNNAMED_PARAMETER_ERROR = "UNNAMED_PARAMETER_ERROR"; - public static final String AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING = "AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING"; - public static final String COMPONENT_NULL_ERROR_2 = "COMPONENT_NULL_ERROR_2"; - public static final String CALCULATE_COMPONENT_ID_INFO = "CALCULATE_COMPONENT_ID_INFO"; - public static final String DETECTING_ENCODING_DISABLED_ERROR = "DETECTING_ENCODING_DISABLED_ERROR"; - public static final String OBTAIN_RESPONSE_SET_HEADER_ERROR = "OBTAIN_RESPONSE_SET_HEADER_ERROR"; - public static final String INVOKE_AJAX_REGION_LISTENER = "INVOKE_AJAX_REGION_LISTENER"; - public static final String APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING = "APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING"; - public static final String RENDER_CHILDREN_NON_AJAX_INFO = "RENDER_CHILDREN_NON_AJAX_INFO"; - public static final String RENDER_CHILDREN_AJAX_INFO = "RENDER_CHILDREN_AJAX_INFO"; - public static final String ENCODE_CHILD_AJAX_INFO = "ENCODE_CHILD_AJAX_INFO"; - public static final String RENDER_AJAX_AREA_INFO = "RENDER_AJAX_AREA_INFO"; - public static final String DECODE_AJAX_REQUEST_STATUS_INFO = "DECODE_AJAX_REQUEST_STATUS_INFO"; - public static final String REQUEST_PARAMETERS_MAP = "REQUEST_PARAMETERS_MAP"; - public static final String SET_MYFACES_SEQUENCE_INFO = "SET_MYFACES_SEQUENCE_INFO"; - public static final String SKIP_ENCODING_HTML_INFO = "SKIP_ENCODING_HTML_INFO"; - public static final String SKIP_ENCODE_BEGIN_HTML_INFO = "SKIP_ENCODE_BEGIN_HTML_INFO"; - public static final String SKIP_ENCODE_END_HTML_INFO = "SKIP_ENCODE_END_HTML_INFO"; - public static final String QUERY_STRING_BUILDING_ERROR = "QUERY_STRING_BUILDING_ERROR"; - public static final String BUILD_RESOURCE_URI_INFO = "BUILD_RESOURCE_URI_INFO"; - public static final String RESTORE_DATA_FROM_RESOURCE_URI_INFO = "RESTORE_DATA_FROM_RESOURCE_URI_INFO"; - public static final String DESERIALIZE_DATA_INPUT_ERROR = "DESERIALIZE_DATA_INPUT_ERROR"; - public static final String DATA_CLASS_NOT_FOUND_ERROR = "DATA_CLASS_NOT_FOUND_ERROR"; - public static final String METHOD_NOT_IMPLEMENTED = "METHOD_NOT_IMPLEMENTED"; - public static final String ENCODE_HTML_INFO = "ENCODE_HTML_INFO"; - public static final String ENCODE_HTML_INFO_2 = "ENCODE_HTML_INFO_2"; - public static final String ENCODE_BEGIN_HTML_INFO = "ENCODE_BEGIN_HTML_INFO"; - public static final String ENCODE_END_HTML_INFO = "ENCODE_END_HTML_INFO"; - public static final String SEND_CONTENT_INFO = "SEND_CONTENT_INFO"; - public static final String NO_INPUT_STREAM_ERROR = "NO_INPUT_STREAM_ERROR"; - public static final String SET_RESPONSE_HEADERS_INFO = "SET_RESPONSE_HEADERS_INFO"; - public static final String BUILD_RESOURCE_INFO = "BUILD_RESOURCE_INFO"; - public static final String NO_RESOURCE_REGISTERED_ERROR = "NO_RESOURCE_REGISTERED_ERROR"; - public static final String NO_RESOURCE_REGISTERED_ERROR_2 = "NO_RESOURCE_REGISTERED_ERROR_2"; - public static final String NO_RESOURCE_EXISTS_ERROR = "NO_RESOURCE_EXISTS_ERROR"; - public static final String INSTANTIATE_RESOURCE_ERROR = "INSTANTIATE_RESOURCE_ERROR"; - public static final String INSTANTIATE_CLASS_ERROR = "INSTANTIATE_CLASS_ERROR"; - public static final String STATIC_RESOURCE_NOT_FOUND_ERROR = "STATIC_RESOURCE_NOT_FOUND_ERROR"; - public static final String PARSING_IF_MODIFIED_SINCE_WARNING = "PARSING_IF_MODIFIED_SINCE_WARNING"; - public static final String GET_CONTENT_FROM_CACHE_INFO = "GET_CONTENT_FROM_CACHE_INFO"; - public static final String CONTENT_NOT_FOUND_ERROR = "CONTENT_NOT_FOUND_ERROR"; - public static final String SEND_RESOURCE_ERROR = "SEND_RESOURCE_ERROR"; - public static final String SEND_RESOURCE_ERROR_2 = "SEND_RESOURCE_ERROR_2"; - public static final String READING_PROPERTIES_ERROR = "READING_PROPERTIES_ERROR"; - public static final String SEND_IMAGE_ERROR = "SEND_IMAGE_ERROR"; - public static final String SEND_IMAGE_ERROR_2 = "SEND_IMAGE_ERROR_2"; - public static final String SKIP_ENCODE_BEGIN_HTML_INFO_2 = "SKIP_ENCODE_BEGIN_HTML_INFO_2"; - public static final String MARK_AS_RENDERED_INFO = "MARK_AS_RENDERED_INFO"; - public static final String SKIP_ENCODE_END_HTML_INFO_2 = "SKIP_ENCODE_END_HTML_INFO_2"; - public static final String VARIABLE_SUBSTITUTION_ERROR = "VARIABLE_SUBSTITUTION_ERROR"; - public static final String SET_SKIN_FACTORY_INFO = "SET_SKIN_FACTORY_INFO"; - public static final String CREATING_SKIN_FACTORY_ERROR = "CREATING_SKIN_FACTORY_ERROR"; - public static final String NULL_SKIN_NAME_ERROR = "NULL_SKIN_NAME_ERROR"; - public static final String CREATE_SKIN_INFO = "CREATE_SKIN_INFO"; - public static final String DEFAULT_PROPERTIES_NOT_FOUND_ERROR = "DEFAULT_PROPERTIES_NOT_FOUND_ERROR"; - public static final String SKIN_PROPERTIES_IO_ERROR = "SKIN_PROPERTIES_IO_ERROR"; - public static final String SKIN_NOT_FOUND_ERROR = "SKIN_NOT_FOUND_ERROR"; - public static final String ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR = "ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR"; - public static final String ACESSING_SKIN_PROPERTY_ERROR = "ACESSING_SKIN_PROPERTY_ERROR"; - public static final String SKIN_PROPERTIES_READ_ONLY_ERROR = "SKIN_PROPERTIES_READ_ONLY_ERROR"; - public static final String NO_VALUE_HOLDER_ERROR = "NO_VALUE_HOLDER_ERROR"; - public static final String NO_EDITABLE_VALUE_HOLDER_ERROR = "NO_EDITABLE_VALUE_HOLDER_ERROR"; - public static final String INVALID_VALIDATION_EXPRESSION = "INVALID_VALIDATION_EXPRESSION"; - public static final String NO_ACTION_SOURCE_ERROR = "NO_ACTION_SOURCE_ERROR"; - public static final String INVALID_ACTION_LISTENER = "INVALID_ACTION_LISTENER"; - public static final String INVALID_VALUE_CHANGE_LISTENER = "INVALID_VALUE_CHANGE_LISTENER"; - public static final String NO_VALUE_REFERENCE_ERROR = "NO_VALUE_REFERENCE_ERROR"; - public static final String NO_BYTE_ARRAY_ERROR = "NO_BYTE_ARRAY_ERROR"; - public static final String BUFFER_TYPE_ERROR = "BUFFER_TYPE_ERROR"; - public static final String IMAGE_ERROR = "IMAGE_ERROR"; - public static final String CANNOT_WRITE_RASTERS = "CANNOT_WRITE_RASTERS"; - public static final String NULL_OUTPUT_ERROR = "NULL_OUTPUT_ERROR"; - public static final String IMAGE_NOT_BUFFERED_ERROR = "IMAGE_NOT_BUFFERED_ERROR"; - public static final String NOT_DATA_OUTPUT_ERROR = "NOT_DATA_OUTPUT_ERROR"; - public static final String NULL_COLOR_PARAMETER_ERROR = "NULL_COLOR_PARAMETER_ERROR"; - public static final String DECODE_COLOR_PARAMETER_ERROR = "DECODE_COLOR_PARAMETER_ERROR"; - public static final String NULL_COLOR_PARAMETER_ERROR_2 = "NULL_COLOR_PARAMETER_ERROR_2"; - public static final String DECODE_PARAMETER_ERROR = "DECODE_PARAMETER_ERROR"; - public static final String IMAGE_GENERATOR_CLASS_NOT_FOUND = "IMAGE_GENERATOR_CLASS_NOT_FOUND"; - public static final String CREATING_IMAGE_GENERATOR_ERROR = "CREATING_IMAGE_GENERATOR_ERROR"; - public static final String INVALID_COMMENT_INDEX = "INVALID_COMMENT_INDEX"; - public static final String LOADING_IMAGE_ERROR = "LOADING_IMAGE_ERROR"; - public static final String NOT_INDEXED_IMAGE_ERROR = "NOT_INDEXED_IMAGE_ERROR"; - public static final String INVALID_RADIUS = "INVALID_RADIUS"; - public static final String INVALID_ATTRIBUTE_VALUE = "INVALID_ATTRIBUTE_VALUE"; - public static final String VALUE_BINDING_TYPE_ERROR = "VALUE_BINDING_TYPE_ERROR"; - public static final String NO_CONVERTER_FOUND_ERROR = "NO_CONVERTER_FOUND_ERROR"; - public static final String GRABBER_ERROR = "GRABBER_ERROR"; - public static final String TOOMANY_COLORS_ERROR = "TOOMANY_COLORS_ERROR"; - public static final String GET_RESOURCE_AS_STREAM_ERROR = "GET_RESOURCE_AS_STREAM_ERROR"; - public static final String PARSING_WEB_XML_IO_ERROR = "PARSING_WEB_XML_IO_ERROR"; - public static final String PARSING_WEB_XML_SAX_ERROR = "PARSING_WEB_XML_SAX_ERROR"; - public static final String NULL_FILTER_NAME_WARNING = "NULL_FILTER_NAME_WARNING"; - public static final String FILTER_NOT_FOUND_ERROR = "FILTER_NOT_FOUND_ERROR"; - public static final String FILTER_NOT_CONFIGURED_ERROR = "FILTER_NOT_CONFIGURED_ERROR"; - public static final String NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR = "NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR"; - public static final String CONFIG_INITIALIZATION_ERROR = "CONFIG_INITIALIZATION_ERROR"; - public static final String FIELD_READING_ERROR = "FIELD_READING_ERROR"; - public static final String CONFIG_INITIALIZATION_ERROR_2 = "CONFIG_INITIALIZATION_ERROR_2"; - public static final String DOM_METHOD_NOT_SUPPORTED = "DOM_METHOD_NOT_SUPPORTED"; - public static final String METHOD_NOT_SUPPORTED = "METHOD_NOT_SUPPORTED"; - public static final String NAMED_ITEM_NOT_FOUND_ERROR = "NAMED_ITEM_NOT_FOUND_ERROR"; - public static final String AJAX_SUPPORT_REQUEST_PARAMETER_INFO = "AJAX_SUPPORT_REQUEST_PARAMETER_INFO"; - public static final String COMMAND_LINK_SUBMIT_INFO = "COMMAND_LINK_SUBMIT_INFO"; - public static final String COMMAND_LINK_NOT_IN_FORM_WARNING = "COMMAND_LINK_NOT_IN_FORM_WARNING"; - public static final String MUST_BE_EXPRESSION_ERROR = "MUST_BE_EXPRESSION_ERROR"; - public static final String NOT_PARENT_AJAX_CONTAINER_ERROR = "NOT_PARENT_AJAX_CONTAINER_ERROR"; - public static final String MUST_BE_LITERAL_ERROR = "MUST_BE_LITERAL_ERROR"; - public static final String FACET_TAG_MANY_CHILDREN_ERROR = "FACET_TAG_MANY_CHILDREN_ERROR"; - public static final String NO_UI_COMPONENT_TAG_ANCESTOR_ERROR = "NO_UI_COMPONENT_TAG_ANCESTOR_ERROR"; - public static final String NO_VALUE_REFERENCE_ERROR_2 = "NO_VALUE_REFERENCE_ERROR_2"; - public static final String NULL_TYPE_ATTRIBUTE_ERROR = "NULL_TYPE_ATTRIBUTE_ERROR"; - public static final String NULL_ATTRIBUTE_ERROR = "NULL_ATTRIBUTE_ERROR"; - public static final String AJAX_VIEW_EXPIRED = "AJAX_VIEW_EXPIRED"; - public static final String SKIN_CYCLIC_REFERENCE = "SKIN_CYCLIC_REFERENCE"; - public static final String SKIN_ILLEGAL_REFERENCE = "SKIN_ILLEGAL_REFERENCE"; - public static final String NAME_MUST_BE_LITERAL = "NAME_MUST_BE_LITERAL"; - public static final String INSTANTIATE_LISTENER_ERROR = "INSTANTIATE_LISTENER_ERROR"; - public static final String NOT_AJAX_CONTAINER_ERROR = "NOT_AJAX_CONTAINER_ERROR"; - public static final String INVALID_EXPRESSION = "INVALID_EXPRESSION"; - public static final String NOT_INSTANCE_OF_ERROR = "NOT_INSTANCE_OF_ERROR"; - public static final String UNSUPPORTED_ENCODING_ERROR = "UNSUPPORTED_ENCODING_ERROR"; - public static final String UNSUPPORTED_INPUT_SOURCE_ERROR = "UNSUPPORTED_INPUT_SOURCE_ERROR"; - public static final String STRING_CONVERSION_ERROR = "STRING_CONVERSION_ERROR"; - public static final String UTF_CONVERSION_ERROR = "UTF_CONVERSION_ERROR"; - public static final String READ_ONLY_NODE_ERROR = "READ_ONLY_NODE_ERROR"; - public static final String NOT_PARENT_AJAX_COMPONENT_ERROR = "NOT_PARENT_AJAX_COMPONENT_ERROR"; - - public static void main(String[] args) { - String m = getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B"); - System.out.println(m); - } - -} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/javascript (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript) Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/AjaxSubmitFunction.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.util.HashMap; import java.util.Map; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSEncoder.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; /** * @author shura Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunction.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSFunction.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunction.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.util.ArrayList; import java.util.Iterator; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSFunctionDefinition.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.util.ArrayList; import java.util.Iterator; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSMin.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSMin.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSMin.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -56,7 +56,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSObject.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSObject.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSObject.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.util.List; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSReference.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSReference.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSReference.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; /** * Create reference to JavaScript variable with optional index. @@ -57,7 +57,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.util.javascript.ScriptString#appendScript(java.lang.StringBuffer) + * @see org.ajax4jsf.javascript.ScriptString#appendScript(java.lang.StringBuffer) */ public void appendScript(StringBuffer functionString) { functionString.append(name); Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptString.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/ScriptString.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptString.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; /** Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/ScriptStringBase.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; /** * @author shura (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/ScriptUtils.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.beans.PropertyDescriptor; import java.lang.reflect.Array; Copied: trunk/framework/api/src/main/java/org/ajax4jsf/resource (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/resource) Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResource.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/resource/InternetResource.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; import java.io.IOException; import java.io.InputStream; @@ -42,7 +42,7 @@ public static final String ENCODE_URI_PARAMETER = "org.ajax4jsf.ENCRYPT_RESOURCE_DATA"; public static final String ENCODE_PASS_PARAMETER = "org.ajax4jsf.ENCRYPT_PASSWORD"; - public static final String CODEC_ATTR = "org.ajax4jsf.framework.resource.CODEC"; + public static final String CODEC_ATTR = "org.ajax4jsf.resource.CODEC"; public static final String RESOURCE_PROTOCOL = "resource"; public static final String RESOURCE_URI_PREFIX = "resource://"; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBuilder.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; import java.io.BufferedReader; import java.io.InputStream; @@ -30,9 +30,7 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; -import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -118,7 +116,7 @@ /** * Get ( or create if nessesary ) instance of builder for current * loader. check content of file - * META-INF/services/org.ajax4jsf.framework.resource.InternetResourceBuilder + * META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder * for name of class to instantiate, othrthise create * {@link ResourceBuilderImpl} instance. * Copied: trunk/framework/api/src/main/java/org/richfaces/skin (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin) Modified: trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/Skin.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.skin; +package org.richfaces.skin; import javax.faces.context.FacesContext; Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinConfiguration.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/SkinConfiguration.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinConfiguration.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.skin; +package org.richfaces.skin; import javax.faces.context.FacesContext; Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/SkinFactory.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.skin; +package org.richfaces.skin; import java.io.BufferedReader; import java.io.IOException; @@ -32,7 +32,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,7 +62,7 @@ /** * Initialize skin factory. TODO - make call from init() method of any * servlet or custom faces element method ??? If exist resource - * META-INF/services/org.ajax4jsf.framework.skin.SkinFactory , create + * META-INF/services/org.richfaces.skin.SkinFactory , create * instance of class by name from first line of this file. If such class * have constructor with {@link SkinFactory} parameter, instantiate it with * instance of default factory ( as usual in JSF ). If any error occurs in Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinNotFoundException.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/SkinNotFoundException.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinNotFoundException.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.skin; +package org.richfaces.skin; import javax.faces.FacesException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/ResourceBundleMap.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/ResourceBundleMap.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/ResourceBundleMap.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,7 +27,7 @@ import java.util.ResourceBundle; import java.util.Set; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Very limited Map decorator to ResourceBundle. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -46,7 +46,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#addListener(org.ajax4jsf.framework.resource.cache.CacheListener) + * @see org.ajax4jsf.resource.cache.Cache#addListener(org.ajax4jsf.resource.cache.CacheListener) */ public void addListener(CacheListener listener) { // TODO Auto-generated method stub @@ -54,14 +54,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#clear() + * @see org.ajax4jsf.resource.cache.Cache#clear() */ public void clear() { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#containsKey(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#containsKey(java.lang.Object) */ public boolean containsKey(Object key) { // TODO Auto-generated method stub @@ -69,7 +69,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#containsValue(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#containsValue(java.lang.Object) */ public boolean containsValue(Object value) { // TODO Auto-generated method stub @@ -77,7 +77,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#entrySet() + * @see org.ajax4jsf.resource.cache.Cache#entrySet() */ public Set entrySet() { // TODO Auto-generated method stub @@ -85,7 +85,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#evict() + * @see org.ajax4jsf.resource.cache.Cache#evict() */ public void evict() { // TODO Auto-generated method stub @@ -93,7 +93,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#get(java.lang.Object, java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#get(java.lang.Object, java.lang.Object) */ public Object get(Object key, Object context) throws CacheException { String keyString = key.toString(); @@ -113,7 +113,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#getCacheEntry(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#getCacheEntry(java.lang.Object) */ public CacheEntry getCacheEntry(Object key) { // TODO Auto-generated method stub @@ -121,7 +121,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#isEmpty() + * @see org.ajax4jsf.resource.cache.Cache#isEmpty() */ public boolean isEmpty() { // TODO Auto-generated method stub @@ -129,7 +129,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#keySet() + * @see org.ajax4jsf.resource.cache.Cache#keySet() */ public Set keySet() { // TODO Auto-generated method stub @@ -137,14 +137,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#load(java.lang.Object, java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#load(java.lang.Object, java.lang.Object) */ public void load(Object key, Object context) throws CacheException { cacheLoader.load(key, context); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#peek(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#peek(java.lang.Object) */ public Object peek(Object key) { String keyString = key.toString(); @@ -159,7 +159,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#put(java.lang.Object, java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#put(java.lang.Object, java.lang.Object) */ public Object put(Object key, Object value) { cache.putInCache(key.toString(), value); @@ -167,7 +167,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#putAll(java.util.Map) + * @see org.ajax4jsf.resource.cache.Cache#putAll(java.util.Map) */ public void putAll(Map t) { // TODO Auto-generated method stub @@ -175,7 +175,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#remove(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#remove(java.lang.Object) */ public Object remove(Object key) { String keyString = key.toString(); @@ -188,7 +188,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#removeListener(org.ajax4jsf.framework.resource.cache.CacheListener) + * @see org.ajax4jsf.resource.cache.Cache#removeListener(org.ajax4jsf.resource.cache.CacheListener) */ public void removeListener(CacheListener listener) { // TODO Auto-generated method stub @@ -196,7 +196,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#size() + * @see org.ajax4jsf.resource.cache.Cache#size() */ public int size() { // TODO Auto-generated method stub @@ -204,7 +204,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#values() + * @see org.ajax4jsf.resource.cache.Cache#values() */ public Collection values() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -39,7 +39,7 @@ private static final Log log = LogFactory.getLog(OSCacheCacheFactory.class); /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.CacheFactory#createCache(java.util.Map, org.ajax4jsf.framework.resource.cache.CacheLoader) + * @see org.ajax4jsf.resource.cache.CacheFactory#createCache(java.util.Map, org.ajax4jsf.resource.cache.CacheLoader) */ public Cache createCache(Map env, CacheLoader cacheLoader, CacheConfigurationLoader cacheConfigurationloader) throws CacheException { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/DnDScript.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/DnDScript.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/DnDScript.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,14 +30,14 @@ public class DnDScript extends ClientScript { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ClientScript#getJavaScript() + * @see org.ajax4jsf.resource.ClientScript#getJavaScript() */ public String getJavaScript() { return "/org/ajax4jsf/framework/ajax/scripts/dnd.js"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ClientScript#isUsePrototype() + * @see org.ajax4jsf.resource.ClientScript#isUsePrototype() */ protected boolean isUsePrototype() { return true; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/DebugOutputMaker.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/DebugOutputMaker.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/DebugOutputMaker.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -41,9 +41,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.PropertyUtils; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -52,6 +52,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.ViewIdHolder; @@ -60,13 +61,12 @@ import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.skin.SkinNotFoundException; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.renderkit.HeaderResourceProducer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; +import org.richfaces.skin.SkinNotFoundException; /** * This class incapsulated Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,12 +31,12 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxContainerBase; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.event.AjaxRenderEvent; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,15 +32,15 @@ import javax.faces.context.ResponseWriter; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.application.ViewHandlerWrapper; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.ViewIdHolder; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,13 +32,13 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.ajax4jsf.Messages; import org.ajax4jsf.application.AjaxSingleException; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.ViewIdHolder; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.collections.Buffer; import org.apache.commons.collections.BufferUnderflowException; import org.apache.commons.collections.UnboundedFifoBuffer; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,10 +28,10 @@ import javax.faces.el.PropertyNotFoundException; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.util.message.Messages; /** * Inner class for build event string for parent component. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,10 +38,10 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.PushEventsCounter; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.resource.InternetResourceService; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,10 +38,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxViewHandler; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContent.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContent.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContent.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -149,7 +149,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setHeader(java.lang.String, * java.lang.String) */ public void setHeader(String name, String value) { @@ -159,7 +159,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setIntHeader(java.lang.String, * int) */ public void setIntHeader(String name, int value) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -73,7 +73,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.ajax4jsf.io.FastBufferInputStream; import org.ajax4jsf.io.FastBufferOutputStream; import org.ajax4jsf.io.FastBufferReader; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ import java.util.Properties; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.log4j.LogManager; import org.apache.log4j.helpers.LogLog; import org.apache.log4j.helpers.OptionConverter; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author shura Class to implement state pattern for Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,9 +30,9 @@ import java.util.Properties; import java.util.Set; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.ajax.AjaxViewHandler; import org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.org.w3c.tidy.Lexer; import org.ajax4jsf.org.w3c.tidy.Node; import org.ajax4jsf.org.w3c.tidy.Tidy; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,9 +25,9 @@ import java.io.InputStream; import java.util.Properties; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter; import org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.io.parser.FastHtmlParser; import org.apache.commons.collections.ArrayStack; import org.apache.commons.logging.Log; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.ScriptUtils; /** * @author shura Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,10 +30,10 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UILoadBundle; import org.ajax4jsf.component.AjaxChildrenEncoder; import org.ajax4jsf.component.AjaxOutput; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.renderkit.AjaxRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,8 +22,8 @@ package org.ajax4jsf.framework.renderer; import org.ajax4jsf.framework.ajax.AjaxScript; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.renderkit.HeaderResourceProducer; +import org.ajax4jsf.resource.InternetResource; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,10 +29,10 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,11 +32,11 @@ import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; +import org.ajax4jsf.Messages; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.SkinFactory; /** * Listener for act before Render phase to set RenderKit Id for current skin. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -43,6 +43,7 @@ import javax.faces.context.ResponseWriter; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UILoadBundle; import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.component.AjaxContainer; @@ -52,10 +53,9 @@ import org.ajax4jsf.framework.ajax.JavaScriptParameter; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.ServicesUtils; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSReference; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,7 +22,7 @@ package org.ajax4jsf.framework.renderer; import org.ajax4jsf.framework.ajax.AjaxViewRoot; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.resource.InternetResource; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitFactory.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitFactory.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,8 +29,8 @@ import javax.faces.render.RenderKit; import javax.faces.render.RenderKitFactory; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -21,7 +21,7 @@ package org.ajax4jsf.framework.renderer; -import org.ajax4jsf.framework.resource.ResourceProduser; +import org.ajax4jsf.resource.ResourceProduser; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ComponentUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ComponentUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ComponentUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.context.ResponseWriter; import javax.faces.el.MethodNotFoundException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.beanutils.MethodUtils; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,8 +28,8 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.renderkit.HeaderResourceProducer; +import org.ajax4jsf.resource.InternetResource; /** * Base renderer for components used JavaScripts and Styles in header. In real Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,9 +26,9 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.PrototypeScript; import org.ajax4jsf.renderkit.HeaderResourceProducer; +import org.ajax4jsf.resource.InternetResource; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,14 +30,14 @@ import javax.faces.context.ResponseWriter; import javax.faces.render.Renderer; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.resource.ResourceNotFoundException; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,11 +38,11 @@ import javax.faces.context.ResponseWriter; import javax.faces.convert.Converter; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.Java2Dresource; import org.ajax4jsf.framework.util.HtmlDimensions; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import javax.faces.FacesException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.xml.sax.SAXException; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,8 +29,8 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.util.message.Messages; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,7 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,7 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,7 @@ import javax.faces.FacesException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.util.style.CSSFormat; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -36,10 +36,10 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.beanutils.MethodUtils; +import org.richfaces.skin.SkinFactory; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,7 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/HtmlCompiler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/HtmlCompiler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/HtmlCompiler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -34,8 +34,8 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import org.apache.commons.digester.RulesBase; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -33,7 +33,7 @@ import javax.faces.FacesException; import javax.faces.el.MethodNotFoundException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElementCreateRule.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElementCreateRule.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElementCreateRule.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -21,7 +21,7 @@ package org.ajax4jsf.framework.renderer.compiler; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.digester.Rule; import org.xml.sax.Attributes; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,8 +28,8 @@ import javax.faces.FacesException; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ import java.io.IOException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ import java.io.IOException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.xml.sax.SAXException; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/WithDefaultsRulesWrapper.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/WithDefaultsRulesWrapper.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/WithDefaultsRulesWrapper.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -42,7 +42,7 @@ import java.util.Iterator; import java.util.List; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rules; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/BaseResourceRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/BaseResourceRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/BaseResourceRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,7 +31,10 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceRenderer; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) @@ -110,8 +113,8 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceRenderer#send(org.ajax4jsf.framework.resource.InternetResource, - * org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.ResourceRenderer#send(org.ajax4jsf.resource.InternetResource, + * org.ajax4jsf.resource.ResourceContext) */ public int send(InternetResource base, ResourceContext context) throws IOException { @@ -154,7 +157,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceRenderer#requireFacesContext() + * @see org.ajax4jsf.resource.ResourceRenderer#requireFacesContext() */ public boolean requireFacesContext() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CacheKey.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CacheKey.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CacheKey.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.resource.InternetResource; + /** * @author Nick - mailto:nbelaevski@exadel.com * created 01.05.2007 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CachedResourceContext.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CachedResourceContext.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CachedResourceContext.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,6 +27,7 @@ import java.io.PrintWriter; import org.ajax4jsf.framework.ajax.xmlfilter.CacheContent; +import org.ajax4jsf.resource.ResourceContext; /** @@ -48,63 +49,63 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getOutputStream() + * @see org.ajax4jsf.resource.ResourceContext#getOutputStream() */ public OutputStream getOutputStream() throws IOException { return content.getOutputStream(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getPathInfo() + * @see org.ajax4jsf.resource.ResourceContext#getPathInfo() */ public String getPathInfo() { return this.parent.getPathInfo(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getQueryString() + * @see org.ajax4jsf.resource.ResourceContext#getQueryString() */ public String getQueryString() { return this.parent.getQueryString(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getRequestParameter(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getRequestParameter(java.lang.String) */ public String getRequestParameter(String data_parameter) { return this.parent.getRequestParameter(data_parameter); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getResourceAsStream(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getResourceAsStream(java.lang.String) */ public InputStream getResourceAsStream(String path) { return this.parent.getResourceAsStream(path); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getSessionAttribute(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getSessionAttribute(java.lang.String) */ public Object getSessionAttribute(String name) { return this.parent.getSessionAttribute(name); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setDateHeader(java.lang.String, long) + * @see org.ajax4jsf.resource.ResourceContext#setDateHeader(java.lang.String, long) */ public void setDateHeader(String name, long value) { this.content.setDateHeader(name,value); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#setHeader(java.lang.String, java.lang.String) */ public void setHeader(String name, String value) { this.content.setHeader(name,value); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, int) + * @see org.ajax4jsf.resource.ResourceContext#setIntHeader(java.lang.String, int) */ public void setIntHeader(String name, int value) { this.content.setIntHeader(name,value); @@ -118,7 +119,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getWriter() + * @see org.ajax4jsf.resource.ResourceContext#getWriter() */ public PrintWriter getWriter() throws IOException { return content.getWriter(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ClientScript.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ClientScript.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ClientScript.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,7 +27,11 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -73,7 +77,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getLastModified() + * @see org.ajax4jsf.resource.InternetResourceBase#getLastModified() */ public Date getLastModified(ResourceContext resourceContext) { @@ -86,7 +90,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#isCacheable() + * @see org.ajax4jsf.resource.InternetResourceBase#isCacheable() */ public boolean isCacheable(ResourceContext resourceContext) { return true; @@ -98,7 +102,7 @@ public abstract String getJavaScript(); /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#encode(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.InternetResourceBase#encode(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encode(FacesContext context, Object data, Map attributes) throws IOException { if (isNotAjaxRequest(context)) { @@ -111,7 +115,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#encodeBegin(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.InternetResourceBase#encodeBegin(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encodeBegin(FacesContext context, Object component, Map attrs) throws IOException { if (isNotAjaxRequest(context)) { @@ -123,7 +127,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#encodeEnd(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#encodeEnd(javax.faces.context.FacesContext, java.lang.Object) */ public void encodeEnd(FacesContext context, Object component) throws IOException { if (isNotAjaxRequest(context)) { @@ -135,7 +139,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#encode(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#encode(javax.faces.context.FacesContext, java.lang.Object) */ public void encode(FacesContext context, Object data) throws IOException { if (isNotAjaxRequest(context)) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/FacesResourceContext.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/FacesResourceContext.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/FacesResourceContext.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -33,6 +33,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: nick_belaevski $) * @version $Revision: 1.1.2.2 $ $Date: 2007/01/11 16:52:14 $ @@ -62,7 +64,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setHeader(java.lang.String, * java.lang.String) */ public void setHeader(String name, String value) { @@ -75,7 +77,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setIntHeader(java.lang.String, * int) */ public void setIntHeader(String name, int value) { @@ -88,7 +90,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setDateHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setDateHeader(java.lang.String, * long) */ public void setDateHeader(String name, long value) { @@ -101,7 +103,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getOutputStream() + * @see org.ajax4jsf.resource.ResourceContext#getOutputStream() */ public OutputStream getOutputStream() throws IOException { if (null != response) { @@ -126,7 +128,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getWriter() + * @see org.ajax4jsf.resource.ResourceContext#getWriter() */ public PrintWriter getWriter() throws IOException { if (null != response) { @@ -151,7 +153,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getQueryString() + * @see org.ajax4jsf.resource.ResourceContext#getQueryString() */ public String getQueryString() { return ((HttpServletRequest) externalContext.getRequest()) @@ -161,7 +163,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getPathInfo() + * @see org.ajax4jsf.resource.ResourceContext#getPathInfo() */ public String getPathInfo() { return externalContext.getRequestPathInfo(); @@ -170,7 +172,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getSessionAttribute(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getSessionAttribute(java.lang.String) */ public Object getSessionAttribute(String name) { return externalContext.getSessionMap().get(name); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/GifRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/GifRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/GifRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,6 +27,7 @@ import java.io.IOException; import org.ajax4jsf.framework.util.image.GIFEncoder; +import org.ajax4jsf.resource.ResourceContext; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) @@ -38,7 +39,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/HTMLRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/HTMLRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/HTMLRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,6 +26,9 @@ import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:03 $ @@ -34,7 +37,7 @@ public class HTMLRenderer extends BaseResourceRenderer { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() */ protected String getTag() { // TODO Auto-generated method stub @@ -42,7 +45,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { // TODO Auto-generated method stub @@ -50,7 +53,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { // TODO Auto-generated method stub @@ -58,14 +61,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub return "text/html"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) */ protected void customEncode(InternetResource resource, FacesContext context, Object data) throws IOException { // Encode style in page - read from resource. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ImageRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ImageRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ImageRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,10 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:06 $ Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,11 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -204,7 +208,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#getUri(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#getUri(javax.faces.context.FacesContext, * java.lang.Object) */ public String getUri(final FacesContext context, Object data) { @@ -275,7 +279,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#getProperty(java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#getProperty(java.lang.Object) */ public Object getProperty(Object key) { // TODO Auto-generated method stub @@ -285,7 +289,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#setProperty(java.lang.Object, + * @see org.ajax4jsf.resource.InternetResource#setProperty(java.lang.Object, * java.lang.Object) */ public void setProperty(Object key, Object value) { @@ -296,7 +300,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#encode(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#encode(javax.faces.context.FacesContext, * javax.faces.component.UIComponent) */ public void encode(FacesContext context, Object data) throws IOException { @@ -309,7 +313,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#encode(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#encode(javax.faces.context.FacesContext, * java.lang.Object, java.util.Map) */ public void encode(FacesContext context, Object data, Map attributes) @@ -326,7 +330,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#encodeBegin(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#encodeBegin(javax.faces.context.FacesContext, * javax.faces.component.UIComponent, java.util.Map) */ public void encodeBegin(FacesContext context, Object component, Map attrs) @@ -342,7 +346,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#encodeEnd(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#encodeEnd(javax.faces.context.FacesContext, * javax.faces.component.UIComponent, java.util.Map) */ public void encodeEnd(FacesContext context, Object component) @@ -357,7 +361,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#send(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#send(javax.faces.context.FacesContext, * java.lang.Object) */ public void send(ResourceContext context) throws IOException { @@ -415,7 +419,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#requireFacesContext() + * @see org.ajax4jsf.resource.InternetResource#requireFacesContext() */ public boolean requireFacesContext() { // by default, send data in ordinary Http request. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceService.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceService.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceService.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.cache.Cache; import org.ajax4jsf.cache.CacheConfigurationLoader; import org.ajax4jsf.cache.CacheException; @@ -49,7 +50,10 @@ import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.ajax.xmlfilter.CacheContent; import org.ajax4jsf.framework.util.config.WebXml; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JarResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JarResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JarResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,9 @@ import java.io.InputStream; +import org.ajax4jsf.resource.ResourceContext; + /** * Class stoped all resources in application classpath. * TODO - set last midified & expired values. @@ -51,7 +53,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, java.lang.Object) */ public InputStream getResourceAsStream(ResourceContext context) { ClassLoader loader = Thread.currentThread().getContextClassLoader(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Java2Dresource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Java2Dresource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Java2Dresource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,7 +31,8 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.ResourceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,7 +69,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, * java.lang.Object) */ public InputStream getResourceAsStream(ResourceContext context) { @@ -79,7 +80,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResourceBase#send(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResourceBase#send(javax.faces.context.FacesContext, * java.lang.Object) */ public void send(ResourceContext context) throws IOException { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JpegRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JpegRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JpegRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,9 @@ import javax.imageio.ImageIO; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:03 $ @@ -37,7 +39,7 @@ public class JpegRenderer extends ImageRenderer { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/LogfileRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/LogfileRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/LogfileRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,6 +26,9 @@ import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:02 $ @@ -34,7 +37,7 @@ public class LogfileRenderer extends BaseResourceRenderer { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() */ protected String getTag() { // TODO Auto-generated method stub @@ -42,7 +45,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { // TODO Auto-generated method stub @@ -50,7 +53,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { // TODO Auto-generated method stub @@ -58,14 +61,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub return "text/plain"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) */ protected void customEncode(InternetResource resource, FacesContext context, Object data) throws IOException { // Encode style in page - read from resource. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/OneTimeRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/OneTimeRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/OneTimeRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,8 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ private static final Log log = LogFactory.getLog(OneTimeRenderer.class); /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#encodeBegin(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.BaseResourceRenderer#encodeBegin(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encodeBegin(InternetResource resource, FacesContext context, Object data, Map attributes) throws IOException { @@ -52,7 +53,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#encodeEnd(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.BaseResourceRenderer#encodeEnd(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) */ public void encodeEnd(InternetResource resource, FacesContext context, Object data) throws IOException { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Png8Renderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Png8Renderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Png8Renderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,6 +29,8 @@ import javax.imageio.ImageIO; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:04 $ @@ -66,7 +68,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ImageRenderer#sendImage(org.ajax4jsf.framework.resource.ResourceContext, + * @see org.ajax4jsf.resource.ImageRenderer#sendImage(org.ajax4jsf.resource.ResourceContext, * java.awt.image.RenderedImage) */ public void sendImage(ResourceContext context, RenderedImage image) @@ -92,7 +94,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ImageRenderer#getImageType() + * @see org.ajax4jsf.resource.ImageRenderer#getImageType() */ public int getImageType() { return BufferedImage.TYPE_BYTE_INDEXED; @@ -102,7 +104,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ImageRenderer#createImage(int, int) + * @see org.ajax4jsf.resource.ImageRenderer#createImage(int, int) */ public BufferedImage createImage(int width, int height) { @@ -113,7 +115,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/PngRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/PngRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/PngRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,6 +28,8 @@ import javax.imageio.ImageIO; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:05 $ Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -43,9 +43,13 @@ import javax.imageio.ImageIO; import javax.servlet.ServletContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.util.base64.Codec; import org.ajax4jsf.framework.util.config.WebXml; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceNotFoundException; +import org.ajax4jsf.resource.ResourceRenderer; import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceLifecycle.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceLifecycle.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceLifecycle.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,6 +28,9 @@ import javax.faces.event.PhaseListener; import javax.faces.lifecycle.Lifecycle; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; + /** * Lifecycle for simulate faces request processing for resource. * @author shura (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ScriptRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ScriptRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ScriptRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,8 +25,10 @@ import java.io.InputStream; import java.io.OutputStream; -import org.ajax4jsf.framework.util.javascript.JSMin; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.javascript.JSMin; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +44,7 @@ private static final Log _log = LogFactory.getLog(ScriptRenderer.class); /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() */ protected String getTag() { // TODO Auto-generated method stub @@ -50,7 +52,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { // TODO Auto-generated method stub @@ -58,7 +60,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { // TODO Auto-generated method stub @@ -66,7 +68,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO - use configurable encoding ? @@ -74,7 +76,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#send(org.ajax4jsf.framework.resource.InternetResource, org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.BaseResourceRenderer#send(org.ajax4jsf.resource.InternetResource, org.ajax4jsf.resource.ResourceContext) */ public int send(InternetResource base, ResourceContext context) throws IOException { InputStream in = base.getResourceAsStream(context); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ServletResourceContext.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ServletResourceContext.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ServletResourceContext.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:01 $ @@ -54,7 +56,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#setHeader(java.lang.String, java.lang.String) */ public void setHeader(String name, String value) { response.setHeader(name,value); @@ -62,7 +64,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, int) + * @see org.ajax4jsf.resource.ResourceContext#setIntHeader(java.lang.String, int) */ public void setIntHeader(String name, int value) { response.setIntHeader(name,value); @@ -70,7 +72,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setDateHeader(java.lang.String, long) + * @see org.ajax4jsf.resource.ResourceContext#setDateHeader(java.lang.String, long) */ public void setDateHeader(String name, long value) { response.setDateHeader(name,value); @@ -78,7 +80,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getOutputStream() + * @see org.ajax4jsf.resource.ResourceContext#getOutputStream() */ public OutputStream getOutputStream() throws IOException { // TODO Auto-generated method stub @@ -86,21 +88,21 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getQueryString() + * @see org.ajax4jsf.resource.ResourceContext#getQueryString() */ public String getQueryString() { return request.getQueryString(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getPathInfo() + * @see org.ajax4jsf.resource.ResourceContext#getPathInfo() */ public String getPathInfo() { return request.getPathInfo(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getSessionAttribute(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getSessionAttribute(java.lang.String) */ public Object getSessionAttribute(String name) { return request.getSession(false).getAttribute(name); @@ -117,7 +119,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getWriter() + * @see org.ajax4jsf.resource.ResourceContext#getWriter() */ public PrintWriter getWriter() throws IOException { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/SmartPositionScript.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/SmartPositionScript.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/SmartPositionScript.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ public class SmartPositionScript extends ClientScript { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ClientScript#getJavaScript() + * @see org.ajax4jsf.resource.ClientScript#getJavaScript() */ public String getJavaScript() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,6 +25,8 @@ import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: nick_belaevski $) * @version $Revision: 1.1.2.2 $ $Date: 2007/01/11 16:52:14 $ @@ -52,7 +54,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public InputStream getResourceAsStream(ResourceContext context) { return context.getResourceAsStream(path); @@ -61,7 +63,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#isCacheable() + * @see org.ajax4jsf.resource.InternetResourceBase#isCacheable() */ public boolean isCacheable(ResourceContext resourceContext) { return true; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,28 +32,28 @@ public class StyleRenderer extends OneTimeRenderer { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() */ protected String getTag() { return "link"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { return "href"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { return new String[][]{{"type","text/css"},{"rel","stylesheet"}}; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO use configurable encoding ? @@ -61,7 +61,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) */ /* protected void customEncode(InternetResource resource, FacesContext context, Object data) throws IOException { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,9 @@ import org.ajax4jsf.framework.renderer.compiler.HtmlCompiler; import org.ajax4jsf.framework.renderer.compiler.PreparedTemplate; import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.skin.SkinFactory; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.SkinFactory; /** * @author shura @@ -56,7 +58,7 @@ }; /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#send(org.ajax4jsf.framework.resource.InternetResource, org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.BaseResourceRenderer#send(org.ajax4jsf.resource.InternetResource, org.ajax4jsf.resource.ResourceContext) */ public int send(InternetResource base, ResourceContext context) throws IOException { PreparedTemplate template = null; @@ -108,7 +110,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#requireFacesContext() + * @see org.ajax4jsf.resource.BaseResourceRenderer#requireFacesContext() */ public boolean requireFacesContext() { return true; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,12 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceRenderer; + /** * Class for create and send resources from template ( at most, used for CSS files ) * @author shura (latest modification by $Author: nick_belaevski $) @@ -77,7 +82,7 @@ * @param data * @param attributes * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#encode(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.InternetResource#encode(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encode(FacesContext context, Object data, Map attributes) throws IOException { _resource.encode(context, data, attributes); @@ -87,7 +92,7 @@ * @param context * @param data * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#encode(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#encode(javax.faces.context.FacesContext, java.lang.Object) */ public void encode(FacesContext context, Object data) throws IOException { _resource.encode(context, data); @@ -98,7 +103,7 @@ * @param component * @param attrs * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#encodeBegin(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.InternetResource#encodeBegin(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encodeBegin(FacesContext context, Object component, Map attrs) throws IOException { _resource.encodeBegin(context, component, attrs); @@ -108,7 +113,7 @@ * @param context * @param component * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#encodeEnd(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#encodeEnd(javax.faces.context.FacesContext, java.lang.Object) */ public void encodeEnd(FacesContext context, Object component) throws IOException { _resource.encodeEnd(context, component); @@ -116,7 +121,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getContentLength(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getContentLength(ResourceContext) */ public int getContentLength(ResourceContext resourceContext) { return _resource.getContentLength(resourceContext); @@ -124,7 +129,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getContentType(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getContentType(ResourceContext) */ public String getContentType(ResourceContext resourceContext) { return _resource.getContentType(null); @@ -132,7 +137,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getExpired(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getExpired(ResourceContext) */ public Date getExpired(ResourceContext resourceContext) { return _resource.getExpired(null); @@ -140,7 +145,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getKey() + * @see org.ajax4jsf.resource.InternetResource#getKey() */ public String getKey() { return _resource.getKey(); @@ -148,7 +153,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getLastModified(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getLastModified(ResourceContext) */ public Date getLastModified(ResourceContext resourceContext) { return _resource.getLastModified(null); @@ -157,7 +162,7 @@ /** * @param key * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getProperty(java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#getProperty(java.lang.Object) */ public Object getProperty(Object key) { return _resource.getProperty(key); @@ -166,7 +171,7 @@ /** * @param context * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getResourceAsStream(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getResourceAsStream(org.ajax4jsf.resource.ResourceContext) */ public InputStream getResourceAsStream(ResourceContext context) { return _resource.getResourceAsStream(context); @@ -176,7 +181,7 @@ * @param context * @param data * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getUri(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#getUri(javax.faces.context.FacesContext, java.lang.Object) */ public String getUri(FacesContext context, Object data) { return _resource.getUri(context, data); @@ -184,7 +189,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#isCacheable(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#isCacheable(ResourceContext) */ public boolean isCacheable(ResourceContext resourceContext) { return _resource.isCacheable(null); @@ -192,7 +197,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#isSessionAware() + * @see org.ajax4jsf.resource.InternetResource#isSessionAware() */ public boolean isSessionAware() { return _resource.isSessionAware(); @@ -200,7 +205,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#requireFacesContext() + * @see org.ajax4jsf.resource.InternetResource#requireFacesContext() */ public boolean requireFacesContext() { return _resource.requireFacesContext(); @@ -209,7 +214,7 @@ /** * @param context * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#send(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#send(org.ajax4jsf.resource.ResourceContext) */ public void send(ResourceContext context) throws IOException { _resource.send(context); @@ -217,7 +222,7 @@ /** * @param response - * @see org.ajax4jsf.framework.resource.InternetResource#sendHeaders(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#sendHeaders(org.ajax4jsf.resource.ResourceContext) */ public void sendHeaders(ResourceContext response) { _resource.sendHeaders(response); @@ -225,7 +230,7 @@ /** * @param key - * @see org.ajax4jsf.framework.resource.InternetResource#setKey(java.lang.String) + * @see org.ajax4jsf.resource.InternetResource#setKey(java.lang.String) */ public void setKey(String key) { _resource.setKey(key); @@ -234,7 +239,7 @@ /** * @param key * @param value - * @see org.ajax4jsf.framework.resource.InternetResource#setProperty(java.lang.Object, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#setProperty(java.lang.Object, java.lang.Object) */ public void setProperty(Object key, Object value) { _resource.setProperty(key, value); @@ -242,7 +247,7 @@ /** * @param renderer - * @see org.ajax4jsf.framework.resource.InternetResource#setRenderer(org.ajax4jsf.framework.resource.ResourceRenderer) + * @see org.ajax4jsf.resource.InternetResource#setRenderer(org.ajax4jsf.resource.ResourceRenderer) */ public void setRenderer(ResourceRenderer renderer) { _resource.setRenderer(renderer); @@ -250,7 +255,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getRenderer(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getRenderer(ResourceContext) */ public ResourceRenderer getRenderer(ResourceContext resourceContext) { return _resource.getRenderer(null); @@ -258,7 +263,7 @@ /** * @param cacheable - * @see org.ajax4jsf.framework.resource.InternetResource#setCacheable(boolean) + * @see org.ajax4jsf.resource.InternetResource#setCacheable(boolean) */ public void setCacheable(boolean cacheable) { _resource.setCacheable(cacheable); @@ -266,7 +271,7 @@ /** * @param expired - * @see org.ajax4jsf.framework.resource.InternetResource#setExpired(java.util.Date) + * @see org.ajax4jsf.resource.InternetResource#setExpired(java.util.Date) */ public void setExpired(Date expired) { _resource.setExpired(expired); @@ -274,7 +279,7 @@ /** * @param lastModified - * @see org.ajax4jsf.framework.resource.InternetResource#setLastModified(java.util.Date) + * @see org.ajax4jsf.resource.InternetResource#setLastModified(java.util.Date) */ public void setLastModified(Date lastModified) { _resource.setLastModified(lastModified); @@ -282,7 +287,7 @@ /** * @param sessionAware - * @see org.ajax4jsf.framework.resource.InternetResource#setSessionAware(boolean) + * @see org.ajax4jsf.resource.InternetResource#setSessionAware(boolean) */ public void setSessionAware(boolean sessionAware) { _resource.setSessionAware(sessionAware); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/UserResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/UserResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/UserResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,6 +32,9 @@ import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; +import org.ajax4jsf.resource.ResourceComponent; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura * @@ -61,7 +64,7 @@ this.contentType = contentType; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) */ public Object getDataToStore(FacesContext context, Object data) { UriData dataToStore = null; @@ -85,7 +88,7 @@ return dataToStore; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#send(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResourceBase#send(org.ajax4jsf.resource.ResourceContext) */ public void send(ResourceContext context) throws IOException { UriData data = (UriData) restoreData(context); @@ -109,7 +112,7 @@ } } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#requireFacesContext() + * @see org.ajax4jsf.resource.InternetResourceBase#requireFacesContext() */ public boolean requireFacesContext() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,10 +28,15 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.Messages; +import org.ajax4jsf.framework.resource.CachedResourceBuilder; +import org.ajax4jsf.framework.resource.DualLRUMap; +import org.ajax4jsf.framework.resource.ResourceBean; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; -import org.ajax4jsf.framework.resource.ResourceNotFoundException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.framework.resource.ResourceBytesDataBean; +import org.ajax4jsf.framework.resource.ResourceDataBean; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,7 +58,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#decrypt(byte[]) + * @see org.ajax4jsf.resource.ResourceBuilderImpl#decrypt(byte[]) */ protected byte[] decrypt(byte[] data) { // dummy - data not send via internet. @@ -63,7 +68,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#encrypt(byte[]) + * @see org.ajax4jsf.resource.ResourceBuilderImpl#encrypt(byte[]) */ protected byte[] encrypt(byte[] data) { // dummy - data not send via internet. @@ -73,7 +78,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#getResourceDataForKey(java.lang.String) + * @see org.ajax4jsf.resource.ResourceBuilderImpl#getResourceDataForKey(java.lang.String) */ public Object getResourceDataForKey(String key) { ResourceBean bean = (ResourceBean) cache.get(key); @@ -87,7 +92,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#getResourceForKey(java.lang.String) + * @see org.ajax4jsf.resource.ResourceBuilderImpl#getResourceForKey(java.lang.String) */ public InternetResource getResourceForKey(String key) throws ResourceNotFoundException { @@ -102,7 +107,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#getUri(org.ajax4jsf.framework.resource.InternetResource, + * @see org.ajax4jsf.resource.ResourceBuilderImpl#getUri(org.ajax4jsf.resource.InternetResource, * javax.faces.context.FacesContext, java.lang.Object) */ public String getUri(InternetResource resource, FacesContext facesContext, @@ -145,7 +150,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#init(javax.servlet.ServletContext, + * @see org.ajax4jsf.resource.ResourceBuilderImpl#init(javax.servlet.ServletContext, * java.lang.String) */ public void init() Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/DummySkinConfiguration.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/DummySkinConfiguration.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/DummySkinConfiguration.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,6 +23,9 @@ import javax.faces.context.FacesContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinConfiguration; + /** * @author shura * @@ -40,21 +43,21 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.SkinConfiguration#containsParameter(java.lang.String) + * @see org.richfaces.skin.SkinConfiguration#containsParameter(java.lang.String) */ public boolean containsParameter(String name) { return _skin.containsProperty(name); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.SkinConfiguration#getParameter(javax.faces.context.FacesContext, java.lang.String) + * @see org.richfaces.skin.SkinConfiguration#getParameter(javax.faces.context.FacesContext, java.lang.String) */ public Object getParameter(FacesContext context, String name) { return _skin.getParameter(context, name); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.SkinConfiguration#getParameter(javax.faces.context.FacesContext, java.lang.String, java.lang.String, java.lang.Object) + * @see org.richfaces.skin.SkinConfiguration#getParameter(javax.faces.context.FacesContext, java.lang.String, java.lang.String, java.lang.Object) */ public Object getParameter(FacesContext context, String name, String skinName, Object defaultValue) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinBean.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinBean.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinBean.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,6 +28,9 @@ import javax.faces.context.FacesContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:40 $ @@ -36,7 +39,7 @@ public class SkinBean extends AbstractMap implements Skin { /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#hashCode(javax.faces.context.FacesContext) + * @see org.richfaces.skin.Skin#hashCode(javax.faces.context.FacesContext) */ public int hashCode(FacesContext context) { // TODO Auto-generated method stub @@ -95,14 +98,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getRenderKitId(javax.faces.context.FacesContext) + * @see org.richfaces.skin.Skin#getRenderKitId(javax.faces.context.FacesContext) */ public String getRenderKitId(FacesContext context) { return getSkin().getRenderKitId(context); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String) + * @see org.richfaces.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String) */ public Object getParameter(FacesContext context, String name) { return getSkin().getParameter(context,name); @@ -118,7 +121,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#containsProperty(java.lang.String) + * @see org.richfaces.skin.Skin#containsProperty(java.lang.String) */ public boolean containsProperty(String name) { return getSkin().containsProperty(name); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinFactoryImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinFactoryImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinFactoryImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,9 +38,12 @@ import javax.faces.el.ReferenceSyntaxException; import javax.faces.el.ValueBinding; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; +import org.richfaces.skin.SkinNotFoundException; /** * Implementation of {@link SkinFactory} with building skins from properties files. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,6 +28,8 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.richfaces.skin.Skin; + /** * Singleton ( in respect as collection of different skins ) for produce * instances properties for all used skins. @@ -57,21 +59,21 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getRenderKitId(javax.faces.context.FacesContext) + * @see org.richfaces.skin.Skin#getRenderKitId(javax.faces.context.FacesContext) */ public String getRenderKitId(FacesContext context) { return (String) getValueReference(context,skinParams.get(RENDER_KIT_PARAMETER)); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String) + * @see org.richfaces.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String) */ public Object getParameter(FacesContext context, String name) { return getValueReference(context,skinParams.get(name)); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String, java.lang.String, java.lang.Object) + * @see org.richfaces.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String, java.lang.String, java.lang.Object) */ public Object getParameter(FacesContext context, String name, Object defaultValue) { Object value = getValueReference(context, skinParams.get(name)); @@ -104,7 +106,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#containsProperty(java.lang.String) + * @see org.richfaces.skin.Skin#containsProperty(java.lang.String) */ public boolean containsProperty(String name) { // TODO Auto-generated method stub @@ -113,7 +115,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#hashCode(javax.faces.context.FacesContext) + * @see org.richfaces.skin.Skin#hashCode(javax.faces.context.FacesContext) */ public int hashCode(FacesContext context) { Integer requestCode = (Integer) context.getExternalContext().getRequestMap().get(REQUEST_HASH_CODE_PARAMETER); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinPropertyResolver.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinPropertyResolver.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinPropertyResolver.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,9 +26,10 @@ import javax.faces.el.PropertyNotFoundException; import javax.faces.el.PropertyResolver; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.Skin; /** * Resolve Skin propertyes. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinVariableResolver.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinVariableResolver.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinVariableResolver.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,6 +25,8 @@ import javax.faces.el.EvaluationException; import javax.faces.el.VariableResolver; +import org.richfaces.skin.SkinFactory; + /** * Resolve current skin as EL Variable. e.g. #{chameleonSkin['color'] } #{chameleonSkin.color} * must be evaluated as Skin.getProperty(context,"color"); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentBodyTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentBodyTagBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentBodyTagBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,7 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.webapp.UIComponentBodyTag; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentTagBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentTagBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,7 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.webapp.UIComponentTag; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/GifEncoder.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/GifEncoder.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/GifEncoder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** GifEncoder - writes out an image as a GIF. * Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlColor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlColor.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlColor.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author shura (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlDimensions.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlDimensions.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlDimensions.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,7 @@ import java.text.ParseException; import java.util.regex.Pattern; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; public class HtmlDimensions { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/SelectUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/SelectUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/SelectUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -41,7 +41,7 @@ import javax.faces.el.ValueBinding; import javax.faces.model.SelectItem; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/Base64.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/Base64.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/Base64.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,7 @@ package org.ajax4jsf.framework.util.base64; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/URL64Codec.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/URL64Codec.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/URL64Codec.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,7 @@ package org.ajax4jsf.framework.util.base64; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -35,7 +35,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -217,7 +217,7 @@ } /** - * Convert {@link org.ajax4jsf.framework.resource.InternetResource } key to + * Convert {@link org.ajax4jsf.resource.InternetResource } key to * real URL for handle by chameleon filter, depend of mapping in WEB.XML . * For prefix or * mapping, prepend servlet prefix and default Resource * prefix to key. For suffix mapping, prepend with resource prefix and Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/DiffusionFilterOp.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/DiffusionFilterOp.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/DiffusionFilterOp.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -57,7 +57,7 @@ import java.awt.image.DataBufferInt; import java.awt.image.IndexColorModel; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; public class DiffusionFilterOp implements BufferedImageOp { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageGenerator.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageGenerator.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageGenerator.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -46,7 +46,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Factory class for generating Image objects from various sources. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageInfo.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageInfo.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageInfo.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -44,7 +44,7 @@ import java.net.URL; import java.util.Vector; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Get file format, image resolution, number of bits per pixel and optionally Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWaiter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWaiter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWaiter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -40,7 +40,7 @@ import java.awt.Image; import java.awt.image.ImageObserver; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * The ImageWaiter will only be used like this: Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWrapper.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWrapper.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWrapper.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -70,7 +70,7 @@ import java.awt.image.IndexColorModel; import java.io.IOException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Abstract base class for Image Wrappers. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/RoundGradientPaint.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/RoundGradientPaint.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/RoundGradientPaint.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,7 +31,7 @@ import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; public class RoundGradientPaint implements Paint { protected Point2D mPoint; protected Point2D mRadius; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/SimpleGIFEncoder.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/SimpleGIFEncoder.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/SimpleGIFEncoder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,7 +27,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * GIFEncoder is a class which takes an image and saves it to a stream Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/imageio/gif/GIFImageWriter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/imageio/gif/GIFImageWriter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/imageio/gif/GIFImageWriter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -52,8 +52,8 @@ import javax.imageio.ImageWriter; import javax.imageio.metadata.IIOMetadata; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.util.image.GIFEncoder; -import org.ajax4jsf.framework.util.message.Messages; public class GIFImageWriter extends ImageWriter { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Configuration.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Configuration.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Configuration.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -88,7 +88,7 @@ import java.util.Map; import java.util.Properties; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; import org.w3c.dom.TypeInfo; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.TypeInfo; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -75,7 +75,7 @@ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; import org.w3c.dom.UserDataHandler; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; import org.w3c.dom.Text; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -78,7 +78,7 @@ import java.io.UnsupportedEncodingException; import java.io.Writer; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -78,7 +78,7 @@ import java.io.Reader; import java.io.UnsupportedEncodingException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -75,7 +75,7 @@ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Utility class with handy methods, mainly for String handling or for reproducing c behaviours. Modified: trunk/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,8 +25,8 @@ import java.io.Writer; import java.util.Arrays; -import org.ajax4jsf.framework.util.javascript.JSEncoder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.javascript.JSEncoder; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,7 +32,7 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.renderer.AjaxChildrenRenderer; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.resource.InternetResource; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,9 +38,9 @@ import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; -import org.ajax4jsf.framework.util.javascript.ScriptStringBase; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.ScriptStringBase; +import org.ajax4jsf.javascript.ScriptUtils; /** * @author Maksim Kaszynski Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -33,12 +33,12 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,9 +30,9 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; public abstract class SliderArrowBase extends Java2Dresource{ private static final Dimension dimensions = new Dimension(7, 8); Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,9 +23,9 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public class SliderArrowImage extends SliderArrowBase { protected Object getDataToStore(FacesContext context, Object data) { Modified: trunk/framework/impl/src/main/resources/META-INF/faces-config.xml =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2007-07-04 00:30:26 UTC (rev 1458) @@ -11,8 +11,8 @@ </factory> <application>  <view-handler>org.ajax4jsf.framework.ajax.AjaxViewHandler</view-handler> <state-manager>org.ajax4jsf.framework.ajax.AjaxStateManager</state-manager> @@ -23,12 +23,12 @@ </lifecycle> <managed-bean> <managed-bean-name>a4j</managed-bean-name> - <managed-bean-class>org.ajax4jsf.framework.skin.VersionBean</managed-bean-class> + <managed-bean-class>org.richfaces.skin.VersionBean</managed-bean-class> <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>a4jSkin</managed-bean-name> - <managed-bean-class>org.ajax4jsf.framework.skin.SkinBean</managed-bean-class> + <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> Modified: trunk/framework/impl/src/test/java/org/ajax4jsf/framework/util/javascript/ScriptUtilsTest.java =================================================================== --- trunk/framework/impl/src/test/java/org/ajax4jsf/framework/util/javascript/ScriptUtilsTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/test/java/org/ajax4jsf/framework/util/javascript/ScriptUtilsTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,6 +29,8 @@ import java.util.TreeMap; import java.util.TreeSet; +import org.ajax4jsf.javascript.ScriptUtils; + import junit.framework.TestCase; /** @@ -109,7 +111,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testStringToScript() { Object obj = "foo"; @@ -117,14 +119,14 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testArrayToScript() { int[] obj = {1,2,3,4,5}; assertEquals("[1,2,3,4,5] ", ScriptUtils.toScript(obj)); } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testTwoDimentionalArrayToScript() { int[][] obj = {{1,2},{3,4}}; @@ -132,7 +134,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testTwoDimentionalStringArrayToScript() { String[][] obj = {{"one","two"},{"three","four"}}; @@ -143,7 +145,7 @@ assertEquals("{'a':[['one','two'] ,['three','four'] ] ,'b':'c'} ", ScriptUtils.toScript(map)); } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testListToScript() { List obj = new ArrayList(); @@ -156,7 +158,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testSetToScript() { Set obj = new TreeSet(); @@ -168,7 +170,7 @@ assertEquals("[1,2,3,4,5] ", ScriptUtils.toScript(obj)); } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testObjectArrayToScript() { Bean[] obj = {new Bean(1,true,"foo"),new Bean(2,false,"bar")}; @@ -176,7 +178,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testObjectListToScript() { Bean[] array = {new Bean(1,true,"foo"),new Bean(2,false,"bar")}; @@ -185,7 +187,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testMapToScript() { TreeMap obj = new TreeMap(); @@ -195,7 +197,7 @@ assertEquals("{'a':'foo','b':'bar','c':'baz'} ", ScriptUtils.toScript(obj)); } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#addEncodedString(java.lang.StringBuffer, java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#addEncodedString(java.lang.StringBuffer, java.lang.Object)}. */ public void testAddEncodedString() { StringBuffer buff = new StringBuffer(); @@ -204,7 +206,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#addEncoded(java.lang.StringBuffer, java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#addEncoded(java.lang.StringBuffer, java.lang.Object)}. */ public void testAddEncoded() { StringBuffer buff = new StringBuffer(); Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -48,17 +48,17 @@ import org.ajax4jsf.framework.ajax.AjaxContextImpl; import org.ajax4jsf.framework.renderer.AjaxViewRootRenderer; import org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.skin.SkinBean; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.skin.VersionBean; import org.ajax4jsf.framework.util.config.WebXml; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.org.apache.shale.test.config.ConfigParser; import org.apache.shale.test.base.AbstractJsfTestCase; import org.apache.shale.test.mock.MockPrintWriter; import org.apache.shale.test.mock.MockResponseWriter; import org.apache.shale.test.mock.MockServletOutputStream; +import org.richfaces.skin.SkinFactory; import com.gargoylesoftware.htmlunit.MockWebConnection; import com.gargoylesoftware.htmlunit.Page; Modified: trunk/framework/test/src/test/java/DnDScriptTest.java =================================================================== --- trunk/framework/test/src/test/java/DnDScriptTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/DnDScriptTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ import org.ajax4jsf.dnd.DnDScript; import org.ajax4jsf.framework.resource.FacesResourceContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; /** @@ -58,7 +58,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceBase#send(org.ajax4jsf.framework.resource.ResourceContext)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceBase#send(org.ajax4jsf.resource.ResourceContext)}. */ public void testSend() { DnDScript resource = new DnDScript(); Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -33,7 +33,7 @@ public static Test suite() { TestSuite suite = new TestSuite( - "Test for org.ajax4jsf.framework.resource"); + "Test for org.ajax4jsf.resource"); //$JUnit-BEGIN$ suite.addTestSuite(ResourceServiceThreadsTestCase.class); suite.addTestSuite(InternetResourceServiceTestCase.class); Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,6 +26,9 @@ import org.ajax4jsf.framework.renderer.compiler.TemplateContext; import org.ajax4jsf.framework.util.config.WebXml; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockPrintWriter; @@ -97,7 +100,7 @@ methodCalled = true; } /* - * Test method for 'org.ajax4jsf.framework.resource.TemplateCSSResource.send(ResourceContext)' + * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.send(ResourceContext)' */ public void testSend() throws IOException { String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; @@ -114,7 +117,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.resource.TemplateCSSResource.TemplateCSSResource(String)' + * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.TemplateCSSResource(String)' */ public void testTemplateCSSResource() throws IOException { String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; @@ -133,14 +136,14 @@ } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.isCacheable()' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.isCacheable()' */ public void testIsCacheable() { } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getContentType()' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getContentType()' */ public void testGetContentType() { @@ -150,7 +153,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getUri(FacesContext, Object)' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getUri(FacesContext, Object)' */ public void testGetUri() { String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; @@ -162,14 +165,14 @@ } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getResourceAsStream(ResourceContext)' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getResourceAsStream(ResourceContext)' */ public void testGetResourceAsStream() { } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.sendHeaders(ResourceContext)' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.sendHeaders(ResourceContext)' */ public void testSendHeaders() { String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,6 +23,8 @@ import java.io.IOException; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockServletOutputStream; @@ -55,7 +57,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#init(javax.servlet.FilterConfig)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#init(javax.servlet.FilterConfig)}. * @throws Exception */ public void testInit() throws Exception { @@ -67,7 +69,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. * @throws IOException * @throws Exception */ @@ -89,7 +91,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. * @throws IOException * @throws Exception */ @@ -114,7 +116,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. * @throws IOException * @throws Exception */ @@ -147,7 +149,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#getProperties(java.lang.String)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#getProperties(java.lang.String)}. */ public void testGetProperties() { // fail("Not yet implemented"); Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,6 +24,8 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura * Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,6 +23,8 @@ import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; import org.apache.shale.test.mock.MockHttpServletRequest; import org.apache.shale.test.mock.MockHttpServletResponse; Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -36,6 +36,8 @@ import org.easymock.MockControl; import org.easymock.classextension.MockClassControl; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * Test for Skin/skin factory methods. @@ -83,7 +85,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getInstance()' + * Test method for 'org.richfaces.skin.SkinFactory.getInstance()' */ public void testGetInstance() { SkinFactory factory = SkinFactory.getInstance(); @@ -92,7 +94,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testGetSkin() { SkinFactory factory = SkinFactory.getInstance(); @@ -131,7 +133,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testSkinReferences() { SkinFactory factory = SkinFactory.getInstance(); @@ -167,7 +169,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testCyclicSkinReferences() { SkinFactory factory = SkinFactory.getInstance(); @@ -189,7 +191,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testBadSkinReferences() { SkinFactory factory = SkinFactory.getInstance(); @@ -210,7 +212,7 @@ assertTrue(false); } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testGetBindedSkin() { SkinFactory factory = SkinFactory.getInstance(); @@ -306,7 +308,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getDefaultProperties()' + * Test method for 'org.richfaces.skin.SkinFactory.getDefaultProperties()' */ public void testGetDefaultProperties() { SkinFactoryImpl factory = (SkinFactoryImpl) SkinFactory.getInstance(); @@ -317,7 +319,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkinName(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkinName(FacesContext)' */ public void testGetSkinName() { Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ public static Test suite() { TestSuite suite = new TestSuite( - "Test for org.ajax4jsf.framework.skin"); + "Test for org.richfaces.skin"); //$JUnit-BEGIN$ suite.addTestSuite(SkinThreadsTestCase.class); suite.addTestSuite(SkinTestCase.class); Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,6 +24,8 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) Modified: trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -11,7 +11,7 @@ import javax.faces.component.UIInput; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockResponseWriter; Modified: trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml =================================================================== --- trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml 2007-07-04 00:30:26 UTC (rev 1458) @@ -3,7 +3,7 @@ xmlns:u='http://jsf.exadel.com/template/util' xmlns="http://www.w3.org/1999/xhtml" > <u:selector name=".exadel_debug_console"> - <f:call name="org.ajax4jsf.framework.resource.CSSTemplateTestCase.contextCall" /> + <f:call name="org.ajax4jsf.resource.CSSTemplateTestCase.contextCall" /> <u:style name="margin" value="0px"/> <u:style name="font-size" skin="preferableDataSizeFont"></u:style> </u:selector> Modified: trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml =================================================================== --- trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml 2007-07-04 00:30:26 UTC (rev 1458) @@ -3,7 +3,7 @@ xmlns:u='http://jsf.exadel.com/template/util' xmlns="http://www.w3.org/1999/xhtml" > <u:selector name=".exadel_debug_console"> - <f:call name="org.ajax4jsf.framework.resource.CSSTemplateTestCase.contextCallWithParam" > + <f:call name="org.ajax4jsf.resource.CSSTemplateTestCase.contextCallWithParam" > <f:parameter value="Test" /> </f:call> <u:style name="margin" value="0px"/> Modified: trunk/ui/core/src/main/config/resources/resources-config.xml =================================================================== --- trunk/ui/core/src/main/config/resources/resources-config.xml 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/config/resources/resources-config.xml 2007-07-04 00:30:26 UTC (rev 1458) @@ -6,7 +6,7 @@ <resource class="org.ajax4jsf.framework.ajax.AjaxScript"> <name>ajax.js</name> </resource> - <resource class="org.ajax4jsf.framework.resource.PrototypeScript"> + <resource class="org.ajax4jsf.resource.PrototypeScript"> <name>prototype.js</name> </resource> <resource class="org.ajax4jsf.dnd.DnDScript"> @@ -15,11 +15,11 @@ <resource > <name>form.js</name> <path>/org/ajax4jsf/renderkit/html/scripts/form.js</path> - <renderer class="org.ajax4jsf.framework.resource.ScriptRenderer"/> + <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource > <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name> <path>/org/ajax4jsf/renderkit/html/scripts/form.js</path> - <renderer class="org.ajax4jsf.framework.resource.ScriptRenderer"/> + <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> </resource-config> Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIActionParameter.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIActionParameter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIActionParameter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,8 +31,8 @@ import javax.faces.event.ActionEvent; import javax.faces.event.ActionListener; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.ajax.JavaScriptParameter; -import org.ajax4jsf.framework.util.message.Messages; /** * @author shura (latest modification by $Author: alexsmirnov $) Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,9 +29,9 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.util.message.Messages; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,11 +28,11 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.framework.ajax.EventValueBinding; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/resource/UIMediaOutput.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/resource/UIMediaOutput.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/resource/UIMediaOutput.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,8 +22,9 @@ package org.ajax4jsf.ajax.resource; import javax.faces.component.UIOutput; -import org.ajax4jsf.framework.resource.ResourceComponent; +import org.ajax4jsf.resource.ResourceComponent; + /** * @author shura * Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,10 +31,10 @@ import org.ajax4jsf.ajax.UIAjaxFunction; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,8 +30,8 @@ import org.ajax4jsf.ajax.UIResource; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.renderkit.HeaderResourceProducer; +import org.ajax4jsf.resource.InternetResource; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -40,8 +40,8 @@ import org.ajax4jsf.framework.renderer.AjaxComponentRendererBase; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.resource.InternetResource; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,8 +31,8 @@ import org.ajax4jsf.ajax.UIPoll; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.renderkit.AjaxCommandRendererBase; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,8 +32,8 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSReference; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.renderkit.AjaxCommandRendererBase; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxStatusRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxStatusRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxStatusRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import org.ajax4jsf.ajax.UIAjaxStatus; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSFunctionDefinition; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -35,10 +35,10 @@ import javax.faces.context.ResponseWriter; import javax.faces.event.ActionEvent; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.javascript.JSFunction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,12 +32,12 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.resource.UIMediaOutput; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/ActionParamHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/ActionParamHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/ActionParamHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,8 +27,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UIActionParameter; -import org.ajax4jsf.framework.util.message.Messages; import com.sun.facelets.FaceletContext; import com.sun.facelets.el.LegacyValueBinding; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,10 +28,10 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; +import org.ajax4jsf.Messages; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.event.AjaxSource; import org.ajax4jsf.framework.ajax.AjaxListenerHelper; -import org.ajax4jsf.framework.util.message.Messages; import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/FacetHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/FacetHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/FacetHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/KeepAliveHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/KeepAliveHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/KeepAliveHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,8 +29,8 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.AjaxPhaseListener; -import org.ajax4jsf.framework.util.message.Messages; import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/ActionParamTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/ActionParamTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/ActionParamTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,9 +28,9 @@ import javax.faces.convert.Converter; import javax.faces.webapp.UIComponentTag; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UIActionParameter; import org.ajax4jsf.framework.taglib.UIComponentTagBase; -import org.ajax4jsf.framework.util.message.Messages; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,10 +30,10 @@ import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagSupport; +import org.ajax4jsf.Messages; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.event.AjaxSource; import org.ajax4jsf.framework.ajax.AjaxListenerHelper; -import org.ajax4jsf.framework.util.message.Messages; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,11 +24,11 @@ import javax.faces.component.UIComponent; import javax.faces.el.MethodBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UIAjaxRegion; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.framework.taglib.UIComponentTagBase; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.renderkit.html.AjaxRegionRenderer; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxSupportTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxSupportTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxSupportTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,11 +24,11 @@ import javax.faces.component.UIComponent; import javax.faces.webapp.UIComponentTag; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UIAjaxSupport; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.taglib.UIComponentTagBase; -import org.ajax4jsf.framework.util.message.Messages; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,8 +28,8 @@ import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagSupport; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.AjaxPhaseListener; -import org.ajax4jsf.framework.util.message.Messages; /** * @author shura Modified: trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java =================================================================== --- trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -42,11 +42,11 @@ import javax.faces.el.ValueBinding; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.event.DataFilterSliderAdapter; @@ -80,7 +80,7 @@ */ static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("scripts/scriptaculous-js-1.6.5/src/slider.js"); } Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java =================================================================== --- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -57,7 +57,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); } private UIDatascroller scroller; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,10 +31,10 @@ import org.ajax4jsf.dnd.DnDScript; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.resource.PrototypeScript; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; import org.richfaces.event.DropEvent; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,8 +30,8 @@ import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIDragSupport; import org.richfaces.renderkit.CompositeRenderer; import org.richfaces.renderkit.DnDParametersEncoder; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,8 +30,8 @@ import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIDropSupport; import org.richfaces.renderkit.CompositeRenderer; import org.richfaces.renderkit.DnDParametersEncoder; Modified: trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java =================================================================== --- trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -40,7 +40,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("scripts/browser_info.js"); javaScripts.add("org.ajax4jsf.dnd.DnDScript"); Modified: trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java =================================================================== --- trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -36,7 +36,7 @@ import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; import org.richfaces.component.UIDropDownMenu; import org.richfaces.component.UIMenuGroup; import org.richfaces.component.UIMenuItem; Modified: trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java =================================================================== --- trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,10 +27,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; @@ -50,7 +50,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("org.ajax4jsf.framework.util.command.CommandScript"); javaScripts.add("scripts/menu.js"); Modified: trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java =================================================================== --- trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -48,7 +48,7 @@ private final static String TEST_STYLE = "width:500px; height:400px"; static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("script/gmap.js"); javaScripts.add("http://maps.google.com"); Modified: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImage.java =================================================================== --- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,9 +23,9 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public class SliderArrowSelectedImage extends SliderArrowBase { protected Object getDataToStore(FacesContext context, Object data) { Modified: trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java =================================================================== --- trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,11 +24,11 @@ import com.gargoylesoftware.htmlunit.KeyValuePair; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.*; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.renderkit.html.images.SliderArrowImage; @@ -68,7 +68,7 @@ */ static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("script/SliderScript.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerButtonGradient.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerButtonGradient.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerButtonGradient.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; import org.richfaces.renderkit.html.BaseGradient; public class SpinnerButtonGradient extends BaseGradient { Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerFieldGradient.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerFieldGradient.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerFieldGradient.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; import org.richfaces.renderkit.html.BaseGradient; public class SpinnerFieldGradient extends BaseGradient { Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonDown.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonDown.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonDown.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class SpinnerButtonDown extends SpinnerButtonImage { private static final Dimension dimensions = new Dimension(14, 7); Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,11 +26,11 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public abstract class SpinnerButtonImage extends Java2Dresource { Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonUp.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonUp.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonUp.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class SpinnerButtonUp extends SpinnerButtonImage { private static final Dimension dimensions = new Dimension(14, 7); Modified: trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java =================================================================== --- trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,11 +24,11 @@ import com.gargoylesoftware.htmlunit.KeyValuePair; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.*; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.renderkit.html.images.background.SpinnerButtonGradient; @@ -59,7 +59,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("script/SpinnerScript.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java =================================================================== --- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -10,12 +10,12 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public class MenuNodeImage extends Java2Dresource { Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -40,10 +40,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -41,10 +41,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockViewRoot; Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -42,7 +42,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript()"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript()"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript()"); javaScripts.add("org.ajax4jsf.framework.util.command.CommandScript()"); } */ Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java =================================================================== --- trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,8 +24,8 @@ import javax.faces.component.UIComponentBase; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * JSF component class Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java =================================================================== --- trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,7 @@ import org.ajax4jsf.framework.renderer.AjaxComponentRendererBase; import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.UIModalPanel; import org.richfaces.component.util.ViewUtil; Modified: trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java =================================================================== --- trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -56,7 +56,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("scripts/utils.js"); javaScripts.add("scripts/modalPanel.js"); javaScripts.add("scripts/modalPanelBorders.js"); Modified: trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DRenderer.java =================================================================== --- trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,7 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIPaint2D; /** Modified: trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java =================================================================== --- trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -39,9 +39,9 @@ import org.ajax4jsf.framework.resource.InternetResourceBase; import org.ajax4jsf.framework.resource.JpegRenderer; import org.ajax4jsf.framework.resource.PngRenderer; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.resource.ResourceRenderer; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.richfaces.component.UIPaint2D; @@ -62,7 +62,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getRenderer() + * @see org.ajax4jsf.resource.InternetResourceBase#getRenderer() */ public ResourceRenderer getRenderer() { return _renderers[0]; @@ -72,14 +72,14 @@ return getRenderer(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#isCacheable() + * @see org.ajax4jsf.resource.InternetResourceBase#isCacheable() */ public boolean isCacheable() { return false; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#requireFacesContext() + * @see org.ajax4jsf.resource.InternetResourceBase#requireFacesContext() */ public boolean requireFacesContext() { // work in context @@ -88,7 +88,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) */ protected Object getDataToStore(FacesContext context, Object data) { if (data instanceof UIPaint2D) { @@ -156,7 +156,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#send(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#send(javax.faces.context.FacesContext, java.lang.Object) */ public void send(ResourceContext context) throws IOException { ImageData data = (ImageData) restoreData(context); @@ -198,7 +198,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#sendHeaders(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResourceBase#sendHeaders(org.ajax4jsf.resource.ResourceContext) */ public void sendHeaders(ResourceContext context) { ImageData data = (ImageData) restoreData(context); Modified: trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java =================================================================== --- trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,14 +22,14 @@ package org.richfaces.renderkit.html.images; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; import org.richfaces.component.UISeparator; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; import javax.faces.context.FacesContext; import java.awt.*; Modified: trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java =================================================================== --- trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,14 +22,14 @@ package org.richfaces.renderkit.html.images; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; import org.richfaces.component.UISeparator; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; Modified: trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java =================================================================== --- trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,10 +27,10 @@ import javax.faces.component.html.HtmlOutputText; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import com.gargoylesoftware.htmlunit.Page; Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -48,7 +48,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.ImageCacheScript"); javaScripts.add("org/ajax4jsf/renderkit/html/scripts/form.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,14 +29,14 @@ import org.ajax4jsf.framework.renderer.compiler.HtmlCompiler; import org.ajax4jsf.framework.renderer.compiler.PreparedTemplate; import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.TemplateCSSResource; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.AjaxSuggestionEvent; import org.richfaces.component.UISuggestionBox; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; import javax.faces.FacesException; import javax.faces.component.NamingContainer; @@ -697,7 +697,7 @@ * Gets additional scripts. * * @return array of resources - * {@link org.ajax4jsf.framework.resource.InternetResource} + * {@link org.ajax4jsf.resource.InternetResource} */ protected final InternetResource[] getAdditionalScripts() { return additionalScripts; @@ -707,7 +707,7 @@ * Gets styles. * * @return array of styles - * {@link org.ajax4jsf.framework.resource.InternetResource} + * {@link org.ajax4jsf.resource.InternetResource} */ protected final InternetResource[] getStyles() { return styles; Modified: trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java =================================================================== --- trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -44,7 +44,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("prototype.js"); - javaScripts.add("org.ajax4jsf.framework.resource.SmartPositionScript"); + javaScripts.add("org.ajax4jsf.resource.SmartPositionScript"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/scriptaculo.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/suggestionbox.js"); Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,7 +24,7 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.HtmlDimensions; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; import org.richfaces.component.UISwitchablePanel; import org.richfaces.component.UITab; import org.richfaces.component.UITabPanel; Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,8 +26,8 @@ import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.HtmlDimensions; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.UISwitchablePanel; import org.richfaces.component.UITab; import org.richfaces.component.UITabPanel; Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientA.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientA.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientA.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -21,8 +21,8 @@ package org.richfaces.renderkit.images; -import org.ajax4jsf.framework.skin.Skin; import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientB.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientB.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientB.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -21,8 +21,8 @@ package org.richfaces.renderkit.images; -import org.ajax4jsf.framework.skin.Skin; import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,12 +22,12 @@ package org.richfaces.renderkit.images; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; import javax.faces.context.FacesContext; import java.awt.*; Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java =================================================================== --- trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,10 +25,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; @@ -48,7 +48,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.ImageCacheScript"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); javaScripts.add("org/ajax4jsf/renderkit/html/scripts/form.js"); Modified: trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java =================================================================== --- trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -51,7 +51,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("scripts/togglePanel.js"); } Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/DotSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/DotSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/DotSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,7 +31,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; /** Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/GridSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/GridSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/GridSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class GridSeparatorImage extends ToolBarSeparatorImage { Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/LineSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/LineSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/LineSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; /** Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/SquareSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/SquareSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/SquareSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,7 +32,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; /** Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,14 +27,14 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.richfaces.component.UIToolBar; import org.richfaces.component.UIToolBarGroup; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * @author Maksim Kaszynski, Filip Antonov Modified: trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java =================================================================== --- trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,10 +25,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import junit.framework.Assert; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import javax.faces.component.UICommand; Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -15,8 +15,8 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; import org.richfaces.component.UITree; Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -39,9 +39,9 @@ import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; import org.ajax4jsf.framework.renderer.RendererUtils; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.model.DataVisitor; import org.richfaces.component.UITree; import org.richfaces.component.UITreeNode; Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,11 +27,11 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public abstract class TreeImageBase extends Java2Dresource { Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineCollapsedImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(32, 512); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineExpandedImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(32, 512); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(2, 1); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineLastImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(32, 512); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineNodeImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(32, 512); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeMinusImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(16, 16); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreePlusImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(16, 16); Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,10 +38,10 @@ import javax.faces.event.PhaseId; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.component.state.events.ExpandAllCommandEvent; @@ -73,7 +73,7 @@ static { javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json.js"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("scripts/AJAX.js"); javaScripts.add("org.ajax4jsf.dnd.DnDScript");

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1457 - in trunk: framework/api/src/main/java/META-INF and 17 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-07-03 20:16:11 -0400 (Tue, 03 Jul 2007) New Revision: 1457 Added: trunk/framework/api/src/main/java/META-INF/ trunk/framework/api/src/main/java/META-INF/MANIFEST.MF trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/ trunk/ui/core/src/main/java/META-INF/ trunk/ui/core/src/main/java/META-INF/MANIFEST.MF Removed: trunk/framework/api/src/main/java/org/ajax4jsf/framework/renderer/ Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/IfElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodParameterElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/TextElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ValueMethodCallElement.java trunk/framework/impl/src/main/resources/META-INF/faces-config.xml trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java trunk/samples/useCases/src/main/java/org/ajax4jsf/MessageBean.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxIncludeRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxOutputPanelRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxRegionRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/RepeatRenderer.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java Log: packages and classes refactor Added: trunk/framework/api/src/main/java/META-INF/MANIFEST.MF =================================================================== --- trunk/framework/api/src/main/java/META-INF/MANIFEST.MF (rev 0) +++ trunk/framework/api/src/main/java/META-INF/MANIFEST.MF 2007-07-04 00:16:11 UTC (rev 1457) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Copied: trunk/framework/api/src/main/java/org/ajax4jsf/renderkit (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/renderer) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -59,12 +59,12 @@ import org.ajax4jsf.framework.ajax.xmlfilter.FilterServletResponseWrapper; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.renderer.HeaderResourceProducer; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.skin.Skin; import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.skin.SkinNotFoundException; import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.renderkit.HeaderResourceProducer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -34,6 +34,7 @@ import org.ajax4jsf.component.AjaxChildrenEncoder; import org.ajax4jsf.component.AjaxOutput; import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.renderkit.AjaxRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -70,7 +71,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.AjaxRenderer#encodeAjaxChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String, java.util.Set, java.util.Set) + * @see org.ajax4jsf.renderkit.AjaxRenderer#encodeAjaxChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String, java.util.Set, java.util.Set) */ public void encodeAjaxChildren(FacesContext context, UIComponent component, String path, Set ids, Set renderedAreas) throws IOException { if (log.isDebugEnabled()) { @@ -88,7 +89,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.AjaxRenderer#encodeAjaxComponent(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String, java.util.Set, java.util.Set) + * @see org.ajax4jsf.renderkit.AjaxRenderer#encodeAjaxComponent(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String, java.util.Set, java.util.Set) */ public void encodeAjaxComponent(FacesContext context, UIComponent component, String currentPath, Set ids, Set renderedAreas) throws IOException { if (component.isRendered()) { // skip not-rendered components. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -23,6 +23,7 @@ import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.renderkit.HeaderResourceProducer; /** @@ -40,7 +41,7 @@ private InternetResource[] scripts = null; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.HeaderResourceProducer#getHeaderScripts(javax.faces.context.FacesContext) + * @see org.ajax4jsf.renderkit.HeaderResourceProducer#getHeaderScripts(javax.faces.context.FacesContext) */ // public LinkedHashSet getHeaderScripts(FacesContext context, UIComponent component) { // LinkedHashSet scripts = new LinkedHashSet() ; // Collections.singleton(ajaxScript.getUri(context, null)); @@ -58,7 +59,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase#getScripts() + * @see org.ajax4jsf.renderkit.HeaderResourcesRendererBase#getScripts() */ protected InternetResource[] getScripts() { // Lazy create Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -75,7 +75,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub @@ -139,7 +139,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doDecode(javax.faces.context.FacesContext, + * @see org.ajax4jsf.renderkit.RendererBase#doDecode(javax.faces.context.FacesContext, * javax.faces.component.UIComponent) */ protected void doDecode(FacesContext context, UIComponent component) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -36,7 +36,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.AjaxComponentRendererBase#getScripts() + * @see org.ajax4jsf.renderkit.AjaxComponentRendererBase#getScripts() */ protected InternetResource[] getScripts() { // TODO Auto-generated method stub @@ -47,7 +47,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doDecode(javax.faces.context.FacesContext, + * @see org.ajax4jsf.renderkit.RendererBase#doDecode(javax.faces.context.FacesContext, * javax.faces.component.UIComponent) */ // protected void doDecode(FacesContext context, UIComponent component) { @@ -65,7 +65,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.AjaxContainerRenderer#getComponentClass() + * @see org.ajax4jsf.renderkit.AjaxContainerRenderer#getComponentClass() */ protected Class getComponentClass() { return AjaxViewRoot.class; @@ -74,7 +74,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ // protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { @@ -90,7 +90,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ // protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -29,6 +29,7 @@ import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.renderkit.HeaderResourceProducer; /** * Base renderer for components used JavaScripts and Styles in header. In real @@ -44,7 +45,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.HeaderResourceProducer#getHeaderScripts(javax.faces.context.FacesContext) + * @see org.ajax4jsf.renderkit.HeaderResourceProducer#getHeaderScripts(javax.faces.context.FacesContext) */ public LinkedHashSet getHeaderScripts(FacesContext context, UIComponent component) { @@ -64,7 +65,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.HeaderResourceProducer#getHeaderStyles(javax.faces.context.FacesContext) + * @see org.ajax4jsf.renderkit.HeaderResourceProducer#getHeaderStyles(javax.faces.context.FacesContext) */ public LinkedHashSet getHeaderStyles(FacesContext context, UIComponent component) { @@ -105,7 +106,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#preEncodeBegin(javax.faces.context.FacesContext, + * @see org.ajax4jsf.renderkit.RendererBase#preEncodeBegin(javax.faces.context.FacesContext, * javax.faces.component.UIComponent) */ protected void preEncodeBegin(FacesContext context, UIComponent component) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -28,6 +28,7 @@ import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.PrototypeScript; +import org.ajax4jsf.renderkit.HeaderResourceProducer; /** @@ -51,7 +52,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.HeaderResourceProducer#getHeaderStyles(javax.faces.context.FacesContext) + * @see org.ajax4jsf.renderkit.HeaderResourceProducer#getHeaderStyles(javax.faces.context.FacesContext) */ public LinkedHashSet getHeaderStyles(FacesContext context, UIComponent component) { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -39,7 +39,7 @@ private boolean mandatory = true; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encode(TemplateContext context) throws IOException { String attributeValue = getString(context); @@ -50,7 +50,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { throw new FacesException(Messages.getMessage(Messages.BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR, getName(), context.getComponent().getId())); @@ -96,7 +96,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#setParent(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#setParent(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void setParent(PreparedTemplate parent) throws SAXException { super.setParent(parent); @@ -107,7 +107,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getAllowedClasses() + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getAllowedClasses() */ protected Class[] getAllowedClasses() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -61,7 +61,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#encode(org.ajax4jsf.framework.renderer.RendererBase, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#encode(org.ajax4jsf.renderkit.RendererBase, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encode(RendererBase renderer, FacesContext context, UIComponent component) throws IOException { @@ -70,7 +70,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { throw new BreakException(getName()); @@ -78,7 +78,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { @@ -97,7 +97,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#getChildren() + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#getChildren() */ public List getChildren() { // breakpoint - empty element @@ -105,7 +105,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#addChild(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#addChild(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void addChild(PreparedTemplate child) throws SAXException { child.setParent(this); @@ -113,7 +113,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#setParent(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#setParent(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void setParent(PreparedTemplate parent) throws SAXException { if (getName()==null) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -36,14 +36,14 @@ public class ChildElement extends ElementBase { /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { throw new FacesException(Messages.getMessage(Messages.BREAKPOINTS_UNSUPPORTED_ERROR_3)); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { UIComponent child = (UIComponent) context.getParameter(ChildrensElement.CURRENT_CHILD); @@ -60,7 +60,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getAllowedClasses() + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getAllowedClasses() */ protected Class[] getAllowedClasses() { // child elements not allowed Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -83,7 +83,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { UIComponent stored = (UIComponent) context.getParameter(CURRENT_CHILD); @@ -140,7 +140,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -42,7 +42,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, * java.lang.String) */ public void encode(TemplateContext context, String breakPoint) @@ -53,7 +53,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { context.getWriter().writeText(getString(context), null); @@ -77,7 +77,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getString(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getString(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public String getString(TemplateContext context) throws FacesException { if (null == getName()) { @@ -114,7 +114,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#getTag() + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#getTag() */ public String getTag() { // TODO Auto-generated method stub @@ -124,7 +124,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#setParent(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#setParent(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void setParent(PreparedTemplate parent) throws SAXException { super.setParent(parent); @@ -137,7 +137,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getAllowedClasses() + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getAllowedClasses() */ protected Class[] getAllowedClasses() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -65,7 +65,7 @@ private ValueBinding _valueBinding; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.CompiledXML#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.CompiledXML#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encode(RendererBase renderer, FacesContext context, UIComponent component) throws IOException { @@ -73,7 +73,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { if (breaks.containsKey(breakPoint)) { @@ -94,7 +94,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { // perform childrens. @@ -114,7 +114,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.CompiledXML#getChildren() + * @see org.ajax4jsf.renderkit.compiler.CompiledXML#getChildren() */ public List getChildren() { // TODO Auto-generated method stub @@ -123,7 +123,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.CompiledXML#addChild(org.ajax4jsf.framework.renderer.compiler.CompiledXML) + * @see org.ajax4jsf.renderkit.compiler.CompiledXML#addChild(org.ajax4jsf.renderkit.compiler.CompiledXML) */ public void addChild(PreparedTemplate child) throws SAXException { Class[] allowedClasses = getAllowedClasses(); @@ -146,7 +146,7 @@ return new Class[]{PreparedTemplate.class}; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#setParent(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#setParent(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void setParent(PreparedTemplate parent) throws SAXException { this.parent = parent; @@ -220,7 +220,7 @@ this.valueGetter = new ValueGetter(){ public /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ Object getValue(TemplateContext context) { // TODO Auto-generated method stub @@ -239,7 +239,7 @@ this.valueGetter = new ValueGetter(){ public /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ Object getValue(TemplateContext context) { // TODO Auto-generated method stub @@ -271,7 +271,7 @@ valueGetter = new ValueGetter(){ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ Object getValue(TemplateContext context) { Object value = context.getComponent().getAttributes().get(_property); @@ -295,7 +295,7 @@ valueGetter = new ValueGetter(){ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ Object getValue(TemplateContext context) { FacesContext facesContext = context.getFacesContext(); @@ -331,7 +331,7 @@ valueGetter = new ValueGetter(){ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ Object getValue(TemplateContext context) { // TODO Auto-generated method stub @@ -349,7 +349,7 @@ valueGetter = new ValueGetter(){ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ Object getValue(TemplateContext context) { try { @@ -386,7 +386,7 @@ // private final class ConfigurationValueGetter extends ValueGetter { // /* (non-Javadoc) -// * @see org.ajax4jsf.framework.renderer.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) +// * @see org.ajax4jsf.renderkit.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) // */ // Object getValue(TemplateContext context) { // FacesContext facesContext = context.getFacesContext(); @@ -400,7 +400,7 @@ // // private final class ConfigurationAndSkinValueGetter extends ValueGetter { // /* (non-Javadoc) -// * @see org.ajax4jsf.framework.renderer.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) +// * @see org.ajax4jsf.renderkit.compiler.RootElement.ValueGetter#getValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent) // */ // Object getValue(TemplateContext context) { // FacesContext facesContext = context.getFacesContext(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -37,7 +37,7 @@ public static final String CURRENT_FACET = "child_to_render"; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { String facetName = getValue(context).toString(); @@ -69,7 +69,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/IfElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/IfElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/IfElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -33,7 +33,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { // Condition will not contain breakpoints. @@ -41,7 +41,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { Object condition = getValue(context); @@ -57,7 +57,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#getTag() + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#getTag() */ public String getTag() { return HtmlCompiler.NS_PREFIX+HtmlCompiler.IF_TAG; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -60,14 +60,14 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.CompiledXML#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.CompiledXML#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encode(TemplateContext context ) throws IOException { getValue(context); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { // Text not contain breakpoints. @@ -160,7 +160,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#setParent(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#setParent(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void setParent(PreparedTemplate parent) throws SAXException { super.setParent(parent); @@ -171,7 +171,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getString(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getString(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public String getString(TemplateContext context) throws FacesException { Object result = getValue(context); @@ -182,7 +182,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getAllowedClasses() + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getAllowedClasses() */ protected Class[] getAllowedClasses() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodParameterElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodParameterElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodParameterElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -40,28 +40,28 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encode(RendererBase renderer, FacesContext context, UIComponent component) throws IOException { // DO Nothing ! } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { // DO Nothing ! } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { // DO Nothing ! } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#addChild(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#addChild(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void addChild(PreparedTemplate child) throws SAXException { // TODO Auto-generated method stub @@ -71,7 +71,7 @@ this.valueGetter = new ValueGetter(){ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase.ValueGetter#getValue(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase.ValueGetter#getValue(org.ajax4jsf.renderkit.compiler.TemplateContext) */ Object getValue(TemplateContext context) { return context.getRenderer().getResource(res.getValue(context).toString()); @@ -86,7 +86,7 @@ return HtmlCompiler.NS_PREFIX+HtmlCompiler.CALL_PARAM_TAG; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getAllowedClasses() + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getAllowedClasses() */ protected Class[] getAllowedClasses() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -76,7 +76,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.CompiledXML#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.CompiledXML#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encodeBegin(TemplateContext context) throws IOException { ResponseWriter writer = context.getWriter(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -55,7 +55,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encodeBegin(TemplateContext context) throws IOException { InternetResource resource = findResource(context); @@ -65,7 +65,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encodeEnd(TemplateContext context) throws IOException { InternetResource resource = findResource(context); @@ -75,7 +75,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement#getString(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement#getString(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public String getString(TemplateContext context) throws FacesException { InternetResource resource = findResource(context); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -37,7 +37,7 @@ private String templateName="unset"; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { if (log.isDebugEnabled()) { @@ -54,7 +54,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { if (log.isDebugEnabled()) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -58,7 +58,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#getTag() + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#getTag() */ public String getTag() { // TODO Auto-generated method stub @@ -66,7 +66,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#setParent(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#setParent(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void setParent(PreparedTemplate parent) throws SAXException { super.setParent(parent); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/TextElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/TextElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/TextElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -37,7 +37,7 @@ private boolean escape = false; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.compiler.RootElement#encode(javax.faces.render.Renderer, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public void encode(TemplateContext context) throws IOException { // TODO Auto-generated method stub @@ -52,7 +52,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext, java.lang.String) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#encode(org.ajax4jsf.renderkit.compiler.TemplateContext, java.lang.String) */ public void encode(TemplateContext context, String breakPoint) throws IOException { // Text not contain breakpoints. @@ -61,7 +61,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getString(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getString(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public String getString(TemplateContext context) throws FacesException { @@ -108,7 +108,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase#getAllowedClasses() + * @see org.ajax4jsf.renderkit.compiler.ElementBase#getAllowedClasses() */ protected Class[] getAllowedClasses() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ValueMethodCallElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ValueMethodCallElement.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ValueMethodCallElement.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -33,14 +33,14 @@ public class ValueMethodCallElement extends MethodCallElement { /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.MethodCallElement#encode(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.MethodCallElement#encode(org.ajax4jsf.renderkit.compiler.TemplateContext) */ public void encode(TemplateContext context) throws IOException { // do nothing } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.MethodCallElement#setParent(org.ajax4jsf.framework.renderer.compiler.PreparedTemplate) + * @see org.ajax4jsf.renderkit.compiler.MethodCallElement#setParent(org.ajax4jsf.renderkit.compiler.PreparedTemplate) */ public void setParent(PreparedTemplate parent) throws SAXException { // TODO Auto-generated method stub @@ -49,7 +49,7 @@ ElementBase base = (ElementBase) parent; base.valueGetter = new ElementBase.ValueGetter(){ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.ElementBase.ValueGetter#getValue(org.ajax4jsf.framework.renderer.compiler.TemplateContext) + * @see org.ajax4jsf.renderkit.compiler.ElementBase.ValueGetter#getValue(org.ajax4jsf.renderkit.compiler.TemplateContext) */ Object getValue(TemplateContext context) { // TODO Auto-generated method stub @@ -59,7 +59,7 @@ } } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.compiler.PreparedTemplate#getTag() + * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#getTag() */ public String getTag() { return HtmlCompiler.NS_PREFIX+HtmlCompiler.VALUE_CALL_TAG; Modified: trunk/framework/impl/src/main/resources/META-INF/faces-config.xml =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2007-07-04 00:16:11 UTC (rev 1457) @@ -6,7 +6,7 @@ <faces-config> <factory> - <render-kit-factory>org.ajax4jsf.framework.renderer.ChameleonRenderKitFactory</render-kit-factory> + <render-kit-factory>org.ajax4jsf.renderkit.ChameleonRenderKitFactory</render-kit-factory> <lifecycle-factory>org.ajax4jsf.framework.DebugLifecycleFactory</lifecycle-factory> </factory> <application> @@ -18,7 +18,7 @@ <state-manager>org.ajax4jsf.framework.ajax.AjaxStateManager</state-manager> </application> <lifecycle> - <phase-listener>org.ajax4jsf.framework.renderer.AjaxPhaseListener</phase-listener> + <phase-listener>org.ajax4jsf.renderkit.AjaxPhaseListener</phase-listener> <phase-listener>org.ajax4jsf.framework.ajax.InitPhaseListener</phase-listener> </lifecycle> <managed-bean> @@ -55,7 +55,7 @@ </description> <component-family>javax.faces.ViewRoot</component-family> <renderer-type>javax.faces.ViewRoot</renderer-type> - <renderer-class>org.ajax4jsf.framework.renderer.AjaxViewRootRenderer</renderer-class> + <renderer-class>org.ajax4jsf.renderkit.AjaxViewRootRenderer</renderer-class> </renderer> <!-- <renderer> Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -62,7 +62,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.renderer.BeforeRenderListener.afterPhase(PhaseEvent)' + * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.afterPhase(PhaseEvent)' */ public void testAfterPhase() throws Exception { PhaseListener listener = new AjaxPhaseListener(); @@ -77,14 +77,14 @@ } /* - * Test method for 'org.ajax4jsf.framework.renderer.BeforeRenderListener.beforePhase(PhaseEvent)' + * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.beforePhase(PhaseEvent)' */ public void testBeforePhase() { } /* - * Test method for 'org.ajax4jsf.framework.renderer.BeforeRenderListener.isValueReference(String)' + * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.isValueReference(String)' */ public void testIsValueReference() { Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -53,21 +53,21 @@ } /* - * Test method for 'org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl.addRenderer(String, String, Renderer)' + * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.addRenderer(String, String, Renderer)' */ public void testAddRendererStringStringRenderer() { } /* - * Test method for 'org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl.getRenderer(String, String)' + * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.getRenderer(String, String)' */ public void testGetRendererStringString() { } /* - * Test method for 'org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl.getDefaultRenderKit()' + * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.getDefaultRenderKit()' */ public void testGetDefaultRenderKit() { Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -33,7 +33,7 @@ public static Test suite() { TestSuite suite = new TestSuite( - "Test for org.ajax4jsf.framework.renderer"); + "Test for org.ajax4jsf.renderkit"); //$JUnit-BEGIN$ suite.addTestSuite(ChameleonRenderKitImplTestCase.class); suite.addTestSuite(BeforeRendererListenerTestCase.class); Modified: trunk/samples/useCases/src/main/java/org/ajax4jsf/MessageBean.java =================================================================== --- trunk/samples/useCases/src/main/java/org/ajax4jsf/MessageBean.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/samples/useCases/src/main/java/org/ajax4jsf/MessageBean.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -6,8 +6,9 @@ import java.util.EventObject; import java.util.List; -import org.ajax4jsf.ajax.PushEventListener; +import org.ajax4jsf.event.PushEventListener; + public class MessageBean implements Runnable { private String result; Added: trunk/ui/core/src/main/java/META-INF/MANIFEST.MF =================================================================== --- trunk/ui/core/src/main/java/META-INF/MANIFEST.MF (rev 0) +++ trunk/ui/core/src/main/java/META-INF/MANIFEST.MF 2007-07-04 00:16:11 UTC (rev 1457) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -45,7 +45,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -28,10 +28,10 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.ajax.UIResource; -import org.ajax4jsf.framework.renderer.HeaderResourceProducer; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.renderkit.HeaderResourceProducer; /** * @author shura @@ -43,7 +43,7 @@ private static final String STYLE_COMPONENT_FAMILY="org.ajax4jsf.LoadStyle"; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.HeaderResourceProducer#getHeaderScripts(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.HeaderResourceProducer#getHeaderScripts(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public LinkedHashSet getHeaderScripts(FacesContext context, UIComponent component) { UIResource resource = (UIResource) component; @@ -54,7 +54,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.HeaderResourceProducer#getHeaderStyles(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.HeaderResourceProducer#getHeaderStyles(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public LinkedHashSet getHeaderStyles(FacesContext context, UIComponent component) { UIResource resource = (UIResource) component; @@ -65,7 +65,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { return UIResource.class; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -79,7 +79,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doDecode(javax.faces.context.FacesContext, + * @see org.ajax4jsf.renderkit.RendererBase#doDecode(javax.faces.context.FacesContext, * javax.faces.component.UIComponent) */ protected void doDecode(FacesContext context, UIComponent component) { @@ -99,7 +99,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase#getScripts() + * @see org.ajax4jsf.renderkit.HeaderResourcesRendererBase#getScripts() */ protected InternetResource[] getAdditionalScripts() { // TODO Auto-generated method stub @@ -109,7 +109,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, @@ -159,7 +159,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, @@ -217,7 +217,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxIncludeRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxIncludeRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxIncludeRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -43,7 +43,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub @@ -53,7 +53,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, @@ -82,7 +82,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxOutputPanelRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxOutputPanelRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxOutputPanelRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -89,7 +89,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub @@ -97,7 +97,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { UIAjaxOutputPanel panel = (UIAjaxOutputPanel) component; @@ -119,7 +119,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { UIAjaxOutputPanel panel = (UIAjaxOutputPanel) component; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -213,7 +213,7 @@ /* * (non-Javadoc) For ajax requests, ViewRoot render childrens directly. * - * @see org.ajax4jsf.framework.renderer.AjaxContainerRenderer#getRendersChildren() + * @see org.ajax4jsf.renderkit.AjaxContainerRenderer#getRendersChildren() */ public boolean getRendersChildren() { FacesContext context = FacesContext.getCurrentInstance(); Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -46,7 +46,7 @@ private static final String AJAX_POLL_FUNCTION = "A4J.AJAX.Poll"; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { UIPoll poll = (UIPoll) component; @@ -83,7 +83,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // only poll component is allowed. Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -55,7 +55,7 @@ private static final String AJAX_PUSH_FUNCTION = "A4J.AJAX.Push"; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { UIPush push = (UIPush) component; @@ -101,7 +101,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // only push component is allowed. Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxRegionRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxRegionRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxRegionRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -40,14 +40,14 @@ public static final String RENDERER_TYPE = "org.ajax4jsf.components.AjaxRegionRenderer"; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { // AjaxRendererUtils.encodeClientScript(context,component); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { // if (((AjaxContainer) component).isAjaxRequest()) { Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -56,7 +56,7 @@ private static final String[] LINK_EXCLUSIONS = {"onclick","target","href"}; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doDecode(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doDecode(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doDecode(FacesContext context, UIComponent component) { UIForm form = getUtils().getNestingForm(context,component); @@ -77,7 +77,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { if(isDisabled(context,component)){ @@ -144,7 +144,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { if(isDisabled(context,component)){ @@ -177,7 +177,7 @@ return false; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -62,7 +62,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { UIMediaOutput mmedia = (UIMediaOutput) component; @@ -75,7 +75,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub @@ -84,7 +84,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { UIMediaOutput mmedia = (UIMediaOutput) component; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/RepeatRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/RepeatRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/RepeatRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -67,7 +67,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -53,7 +53,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, @@ -131,7 +131,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, @@ -189,7 +189,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -41,7 +41,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeBegin(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, @@ -74,7 +74,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, + * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter, * javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, @@ -104,7 +104,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { // TODO Auto-generated method stub Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -68,7 +68,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { return UIDragIndicator.class; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -55,7 +55,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { return UIDragSupport.class; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -55,7 +55,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { return UIDropSupport.class; Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -122,7 +122,7 @@ * @param context {@link javax.faces.context.FacesContext} * @param component {@link javax.faces.component.UIComponent} * - * @see org.ajax4jsf.framework.renderer.RendererBase#doDecode( + * @see org.ajax4jsf.renderkit.RendererBase#doDecode( * javax.faces.context.FacesContext, * javax.faces.component.UIComponent) */ @@ -152,7 +152,7 @@ * @param component {@link javax.faces.component.UIComponent} * @throws IOException * - * @see {@link org.ajax4jsf.framework.renderer.RendererBase#doEncodeBegin} + * @see {@link org.ajax4jsf.renderkit.RendererBase#doEncodeBegin} */ protected final void doEncodeBegin(final ResponseWriter writer, final FacesContext context, @@ -171,7 +171,7 @@ * @param component {@link javax.faces.component.UIComponent} * @throws IOException * - * @see {@link org.ajax4jsf.framework.renderer.RendererBase#doEncodeEnd} + * @see {@link org.ajax4jsf.renderkit.RendererBase#doEncodeEnd} */ protected void doEncodeEnd(final ResponseWriter writer, final FacesContext context, @@ -344,7 +344,7 @@ * * @param context {@link javax.faces.context.FacesContext} * @param data - * @return {@link org.ajax4jsf.framework.renderer.compiler.TemplateContext} + * @return {@link org.ajax4jsf.renderkit.compiler.TemplateContext} */ private TemplateContext getTemplateContext(final FacesContext context, final UIData data) { @@ -380,7 +380,7 @@ /** * Constructor. * - * @param renderer {@link org.ajax4jsf.framework.renderer.RendererBase} + * @param renderer {@link org.ajax4jsf.renderkit.RendererBase} * @param facesContext {@link javax.faces.context.FacesContext} * @param component {@link javax.faces.component.UIComponent} */ Modified: trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java =================================================================== --- trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -50,7 +50,7 @@ //private InternetResource[] _scripts = {new PrototypeScript(), getResource("scripts/togglePanel.js") }; /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { return UIToggleControl.class; @@ -129,7 +129,7 @@ } } else { // Server - //xxx by nick - denis - use org.ajax4jsf.framework.renderer.RendererUtils#getNestingForm(FacesContext, UIComponent) + //xxx by nick - denis - use org.ajax4jsf.renderkit.RendererUtils#getNestingForm(FacesContext, UIComponent) RendererUtils rendererUtils = new RendererUtils(); UIForm Form= rendererUtils.getNestingForm(context, component); String formId=null; Modified: trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java =================================================================== --- trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2007-07-04 00:04:48 UTC (rev 1456) +++ trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) @@ -47,7 +47,7 @@ public class TogglePanelRenderer extends RendererBase { /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ protected Class getComponentClass() { return UITogglePanel.class;

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1456 - in trunk: framework/api/src/main/java/org/ajax4jsf/event and 20 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-07-03 20:04:48 -0400 (Tue, 03 Jul 2007) New Revision: 1456 Added: trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java trunk/framework/api/src/main/java/org/richfaces/event/DragListener.java trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java trunk/framework/api/src/main/java/org/richfaces/event/DropListener.java trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java trunk/framework/api/src/main/java/org/richfaces/event/DropSource.java Removed: trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent trunk/framework/api/src/main/java/org/richfaces/component/Draggable.java trunk/framework/api/src/main/java/org/richfaces/component/Dropzone.java trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/taglib/DropSourceMetaRule.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockComponentState.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataAdaptor.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockRange.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java trunk/framework/test/src/test/java/DnDScriptTest.java trunk/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java trunk/framework/test/src/test/java/org/richfaces/component/util/FormUtilTest.java trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java trunk/framework/test/src/test/java/org/richfaces/renderkit/InputRendererBaseTest.java trunk/ui/drag-drop/src/main/config/component/dragSupport.xml trunk/ui/drag-drop/src/main/config/component/dropSupport.xml trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropListenerTag.java trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java trunk/ui/tree/src/main/config/component/commonTreeListeners.ent trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java Log: packages and classes refactor Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent 2007-07-04 00:04:48 UTC (rev 1456) @@ -3,7 +3,7 @@ <name>ajaxListener</name> <defaultvalue>null</defaultvalue> <classname>javax.faces.el.MethodBinding</classname> - <methodargs>org.ajax4jsf.framework.ajax.AjaxEvent.class</methodargs> + <methodargs>org.ajax4jsf.event.AjaxEvent.class</methodargs> <description> MethodBinding representing an action listener method that will be notified when this component is activated by the ajax Request and handle it. The expression must evaluate to a public method that takes an AjaxEvent parameter, with a return type of void</description> </property> <property hidden="true"> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2007-07-04 00:04:48 UTC (rev 1456) @@ -30,7 +30,7 @@ <description> MethodBinding representing an listener method that will be notified afrer drag operation. </description> - <methodargs>org.ajax4jsf.dnd.event.DragEvent.class</methodargs> + <methodargs>org.ajax4jsf.event.DragEvent.class</methodargs> </property> </properties> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2007-07-04 00:04:48 UTC (rev 1456) @@ -43,6 +43,6 @@ MethodBinding representing an action listener method that will be notified afrer drop operation ]]> </description> - <methodargs>org.ajax4jsf.dnd.event.DropEvent.class</methodargs> + <methodargs>org.ajax4jsf.event.DropEvent.class</methodargs> </property> </properties> Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,103 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.component.UIComponent; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; - -import org.richfaces.component.Draggable; -import org.richfaces.component.Dropzone; - -/** - * @author Nick Belaevski - nbelaevski(a)exadel.com - * created 27.12.2006 - * - */ -public class DragEvent extends FacesEvent { - - private Dropzone dropTarget; - private Object acceptedTypes; - private Object dropValue; - /** - * - */ - private static final long serialVersionUID = 6179268394391836905L; - - public DragEvent(UIComponent uiComponent) { - super(uiComponent); - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) - */ - public boolean isAppropriateListener(FacesListener faceslistener) { - return faceslistener instanceof DragListener; - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) - */ - public void processListener(FacesListener faceslistener) { - ((DragListener) faceslistener).processDrag(this); - } - - public Object getDragValue() { - return ((Draggable) this.getSource()).getDragValue(); - } - - public Dropzone getDropTarget() { - return dropTarget; - } - - /** - * @see java.util.EventObject#toString() - */ -/* public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE). - append("component", getComponent()).append("source", getSource()).append("phaseId", getPhaseId()). - append("dragValue", getDragValue()). - append("dropTarget", getDropTarget()). - append("dropValue", getDropValue()). - toString(); - } -*/ - public void setDropTarget(Dropzone dropTarget) { - this.dropTarget = dropTarget; - } - - public Object getAcceptedTypes() { - return acceptedTypes; - } - - public void setAcceptedTypes(Object acceptedTypes) { - this.acceptedTypes = acceptedTypes; - } - - public Object getDropValue() { - return dropValue; - } - - public void setDropValue(Object dropValue) { - this.dropValue = dropValue; - } -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,34 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.event.FacesListener; - -/** - * @author Nick Belaevski - nbelaevski(a)exadel.com - * created 27.12.2006 - * - */ -public interface DragListener extends FacesListener { - public void processDrag(DragEvent event); - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,113 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.component.UIComponent; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; - -import org.richfaces.component.Draggable; -import org.richfaces.component.Dropzone; - -/** - * @author shura - * - */ -public class DropEvent extends FacesEvent { - - /** - * - */ - private static final long serialVersionUID = 1660545054556302746L; - - private Draggable draggableSource; - private String dragType; - private Object dragValue; - - public DropEvent(UIComponent component) { - super(component); - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) - */ - public boolean isAppropriateListener(FacesListener listener) { - - return listener instanceof DropListener; - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) - */ - public void processListener(FacesListener listener) { - if (listener instanceof DropListener) { - DropListener dropListener = (DropListener) listener; - dropListener.processDrop(this); - } - - } - - /** - * @return the dropValue - */ - public Object getDropValue() { - return ((Dropzone) this.getSource()).getDropValue(); - } - - public Draggable getDraggableSource() { - return draggableSource; - } - - /** - * @see java.util.EventObject#toString() - */ -/* public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE). - append("component", getComponent()). - append("source", getSource()). - append("phaseId", getPhaseId()). - append("dropValue", getDropValue()). - append("draggableSource", getDraggableSource()). - append("dragValue", getDragValue()). - toString(); - } -*/ - public void setDraggableSource(Draggable draggableSource) { - this.draggableSource = draggableSource; - } - - public String getDragType() { - return dragType; - } - - public void setDragType(String dragType) { - this.dragType = dragType; - } - - public Object getDragValue() { - return dragValue; - } - - public void setDragValue(Object dragValue) { - this.dragValue = dragValue; - } -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,39 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.event.FacesListener; - -/** - * Listener for process Drop events - * @author shura - * - */ -public interface DropListener extends FacesListener { - - /** - * Process event on Drop for this component. - * @param event - */ - public void processDrop(DropEvent event); - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,104 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.component.StateHolder; -import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; - -/** - * Wrapper for bind DrolListener to EL expression. - * @author shura - * - */ -public class DropListenerBinding implements DropListener, StateHolder { - - private ValueBinding _binding; - - private String _dragType; - - private ValueBinding _dragTypeBinding; - - private boolean _transient = false; - - public DropListenerBinding() { - } - - /** - * @param binding - */ - public DropListenerBinding(ValueBinding binding) { - super(); - _binding = binding; - } - - private DropListener getHandler(FacesContext context) { - return (DropListener) _binding.getValue(context); - } - - public void processDrop(DropEvent event) { - DropListener handler = getHandler(FacesContext.getCurrentInstance()); - handler.processDrop(event); - } - - public boolean isTransient() { - // TODO Auto-generated method stub - return _transient; - } - - public void restoreState(FacesContext context, Object state) { - _binding = (ValueBinding) UIComponentBase.restoreAttachedState(context, state); - - } - - public Object saveState(FacesContext context) { - return UIComponentBase.saveAttachedState(context, _binding); - } - - public void setTransient(boolean newTransientValue) { - _transient = newTransientValue; - - } - - /** - * @return the dragType - */ - public String getDragType() { - return _dragType; - } - - /** - * @param dragType the dragType to set - */ - public void setDragType(String dragType) { - _dragType = dragType; - } - - /** - * @param dragTypeBinding the dragTypeBinding to set - */ - public void setDragTypeBinding(ValueBinding dragTypeBinding) { - _dragTypeBinding = dragTypeBinding; - } - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,54 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.el.MethodBinding; - -/** - * Interface for component applicable to process drag/drop events. - * @author shura - * - */ -public interface DropSource { - - /** - * Append drop listener to component listeners collection - * @param listener - */ - public void addDropListener(DropListener listener); - - /** - * Get array of all Drop Listeners - * @return - */ - public DropListener[] getDropListeners(); - - /** - * Remove drop listener from component listeners array. - * @param listener - */ - public void removeDropListener(DropListener listener); - - public void setDropListener(MethodBinding binding); - public MethodBinding getDropListener(); - -} Modified: trunk/framework/api/src/main/java/org/richfaces/component/Draggable.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/Draggable.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/richfaces/component/Draggable.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,7 +23,7 @@ import javax.faces.el.MethodBinding; -import org.ajax4jsf.event.DragListener; +import org.richfaces.event.DragListener; /** Modified: trunk/framework/api/src/main/java/org/richfaces/component/Dropzone.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/Dropzone.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/richfaces/component/Dropzone.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,7 +21,7 @@ package org.richfaces.component; -import org.ajax4jsf.event.DropSource; +import org.richfaces.event.DropSource; /** * Base interface for all components, accesible as drop zone. Copied: trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,103 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; + +import org.richfaces.component.Draggable; +import org.richfaces.component.Dropzone; + +/** + * @author Nick Belaevski - nbelaevski(a)exadel.com + * created 27.12.2006 + * + */ +public class DragEvent extends FacesEvent { + + private Dropzone dropTarget; + private Object acceptedTypes; + private Object dropValue; + /** + * + */ + private static final long serialVersionUID = 6179268394391836905L; + + public DragEvent(UIComponent uiComponent) { + super(uiComponent); + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) + */ + public boolean isAppropriateListener(FacesListener faceslistener) { + return faceslistener instanceof DragListener; + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) + */ + public void processListener(FacesListener faceslistener) { + ((DragListener) faceslistener).processDrag(this); + } + + public Object getDragValue() { + return ((Draggable) this.getSource()).getDragValue(); + } + + public Dropzone getDropTarget() { + return dropTarget; + } + + /** + * @see java.util.EventObject#toString() + */ +/* public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE). + append("component", getComponent()).append("source", getSource()).append("phaseId", getPhaseId()). + append("dragValue", getDragValue()). + append("dropTarget", getDropTarget()). + append("dropValue", getDropValue()). + toString(); + } +*/ + public void setDropTarget(Dropzone dropTarget) { + this.dropTarget = dropTarget; + } + + public Object getAcceptedTypes() { + return acceptedTypes; + } + + public void setAcceptedTypes(Object acceptedTypes) { + this.acceptedTypes = acceptedTypes; + } + + public Object getDropValue() { + return dropValue; + } + + public void setDropValue(Object dropValue) { + this.dropValue = dropValue; + } +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DragListener.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DragListener.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DragListener.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,34 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.event.FacesListener; + +/** + * @author Nick Belaevski - nbelaevski(a)exadel.com + * created 27.12.2006 + * + */ +public interface DragListener extends FacesListener { + public void processDrag(DragEvent event); + +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,113 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; + +import org.richfaces.component.Draggable; +import org.richfaces.component.Dropzone; + +/** + * @author shura + * + */ +public class DropEvent extends FacesEvent { + + /** + * + */ + private static final long serialVersionUID = 1660545054556302746L; + + private Draggable draggableSource; + private String dragType; + private Object dragValue; + + public DropEvent(UIComponent component) { + super(component); + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) + */ + public boolean isAppropriateListener(FacesListener listener) { + + return listener instanceof DropListener; + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) + */ + public void processListener(FacesListener listener) { + if (listener instanceof DropListener) { + DropListener dropListener = (DropListener) listener; + dropListener.processDrop(this); + } + + } + + /** + * @return the dropValue + */ + public Object getDropValue() { + return ((Dropzone) this.getSource()).getDropValue(); + } + + public Draggable getDraggableSource() { + return draggableSource; + } + + /** + * @see java.util.EventObject#toString() + */ +/* public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE). + append("component", getComponent()). + append("source", getSource()). + append("phaseId", getPhaseId()). + append("dropValue", getDropValue()). + append("draggableSource", getDraggableSource()). + append("dragValue", getDragValue()). + toString(); + } +*/ + public void setDraggableSource(Draggable draggableSource) { + this.draggableSource = draggableSource; + } + + public String getDragType() { + return dragType; + } + + public void setDragType(String dragType) { + this.dragType = dragType; + } + + public Object getDragValue() { + return dragValue; + } + + public void setDragValue(Object dragValue) { + this.dragValue = dragValue; + } +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DropListener.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DropListener.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DropListener.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,39 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.event.FacesListener; + +/** + * Listener for process Drop events + * @author shura + * + */ +public interface DropListener extends FacesListener { + + /** + * Process event on Drop for this component. + * @param event + */ + public void processDrop(DropEvent event); + +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,104 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.component.StateHolder; +import javax.faces.component.UIComponentBase; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; + +/** + * Wrapper for bind DrolListener to EL expression. + * @author shura + * + */ +public class DropListenerBinding implements DropListener, StateHolder { + + private ValueBinding _binding; + + private String _dragType; + + private ValueBinding _dragTypeBinding; + + private boolean _transient = false; + + public DropListenerBinding() { + } + + /** + * @param binding + */ + public DropListenerBinding(ValueBinding binding) { + super(); + _binding = binding; + } + + private DropListener getHandler(FacesContext context) { + return (DropListener) _binding.getValue(context); + } + + public void processDrop(DropEvent event) { + DropListener handler = getHandler(FacesContext.getCurrentInstance()); + handler.processDrop(event); + } + + public boolean isTransient() { + // TODO Auto-generated method stub + return _transient; + } + + public void restoreState(FacesContext context, Object state) { + _binding = (ValueBinding) UIComponentBase.restoreAttachedState(context, state); + + } + + public Object saveState(FacesContext context) { + return UIComponentBase.saveAttachedState(context, _binding); + } + + public void setTransient(boolean newTransientValue) { + _transient = newTransientValue; + + } + + /** + * @return the dragType + */ + public String getDragType() { + return _dragType; + } + + /** + * @param dragType the dragType to set + */ + public void setDragType(String dragType) { + _dragType = dragType; + } + + /** + * @param dragTypeBinding the dragTypeBinding to set + */ + public void setDragTypeBinding(ValueBinding dragTypeBinding) { + _dragTypeBinding = dragTypeBinding; + } + +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DropSource.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DropSource.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DropSource.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,54 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.el.MethodBinding; + +/** + * Interface for component applicable to process drag/drop events. + * @author shura + * + */ +public interface DropSource { + + /** + * Append drop listener to component listeners collection + * @param listener + */ + public void addDropListener(DropListener listener); + + /** + * Get array of all Drop Listeners + * @return + */ + public DropListener[] getDropListeners(); + + /** + * Remove drop listener from component listeners array. + * @param listener + */ + public void removeDropListener(DropListener listener); + + public void setDropListener(MethodBinding binding); + public MethodBinding getDropListener(); + +} Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -125,11 +125,11 @@ } } - protected TreeNode locateTreeNode(TreeRowKey rowKey) { + public TreeNode locateTreeNode(TreeRowKey rowKey) { return locateTreeNode(rowKey, false); } - protected TreeNode locateTreeNode(TreeRowKey rowKey, boolean allowCreate) { + public TreeNode locateTreeNode(TreeRowKey rowKey, boolean allowCreate) { boolean useCached = (rowTreeData != null && rowKey != null && rowKey.equals(this.oldRowKey)); if (!useCached) { TreeNode rootNode = (TreeNode) getWrappedData(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/taglib/DropSourceMetaRule.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/taglib/DropSourceMetaRule.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/taglib/DropSourceMetaRule.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -33,8 +33,8 @@ import javax.faces.el.MethodBinding; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropSource; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropSource; import com.sun.facelets.FaceletContext; import com.sun.facelets.tag.MetaRule; Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -26,9 +26,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintWriter; import java.net.URL; import java.util.Collections; import java.util.Enumeration; @@ -44,11 +42,9 @@ import javax.faces.context.FacesContext; import javax.faces.render.RenderKitFactory; import javax.faces.render.Renderer; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxContextImpl; import org.ajax4jsf.framework.renderer.AjaxViewRootRenderer; import org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl; Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -26,7 +26,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestResult; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxContextImpl; import org.apache.shale.test.mock.MockFacesContext; import org.apache.shale.test.mock.MockHttpServletRequest; Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockComponentState.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockComponentState.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockComponentState.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -25,8 +25,8 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataComponentState; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.Range; /** * @author shura Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataAdaptor.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataAdaptor.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataAdaptor.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,9 +23,9 @@ import java.util.Iterator; -import org.ajax4jsf.ajax.repeat.DataComponentState; -import org.ajax4jsf.ajax.repeat.ExtendedDataModel; import org.ajax4jsf.ajax.repeat.UIDataAdaptor; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.ExtendedDataModel; /** * @author shura Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -22,14 +22,13 @@ package org.ajax4jsf.tests; import java.io.IOException; -import java.util.Iterator; import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.ExtendedDataModel; -import org.ajax4jsf.ajax.repeat.Range; -import org.ajax4jsf.ajax.repeat.SequenceRange; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceRange; /** * @author shura Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockRange.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockRange.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockRange.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,7 +21,7 @@ package org.ajax4jsf.tests; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.Range; /** * @author shura Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -25,9 +25,9 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.Range; -import org.ajax4jsf.ajax.repeat.SerializableDataModel; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SerializableDataModel; /** * @author shura Modified: trunk/framework/test/src/test/java/DnDScriptTest.java =================================================================== --- trunk/framework/test/src/test/java/DnDScriptTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/DnDScriptTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -24,7 +24,6 @@ import org.ajax4jsf.dnd.DnDScript; import org.ajax4jsf.framework.resource.FacesResourceContext; import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.resource.TemplateCSSResource; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; /** Modified: trunk/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,16 +21,16 @@ package org.ajax4jsf.ajax.repeat; -import java.io.IOException; import java.util.ArrayList; import javax.faces.component.UIColumn; -import javax.faces.component.UIComponent; import javax.faces.component.UIData; import javax.faces.component.UIInput; import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.ExtendedDataModel; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockComponentState; import org.ajax4jsf.tests.MockDataAdaptor; Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,15 +21,13 @@ package org.ajax4jsf.framework.renderer; -import javax.faces.component.UIComponent; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.ajax.xmlfilter.FilterServletResponseWrapper; - import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; /** Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,10 +23,8 @@ import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.config.WebXml; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockPrintWriter; Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,13 +23,9 @@ import java.io.IOException; -import javax.servlet.ServletException; - import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockServletOutputStream; -import com.gargoylesoftware.htmlunit.Page; - /** * @author shura * Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,23 +21,9 @@ package org.ajax4jsf.framework.resource; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; -import java.util.Enumeration; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpSession; -import org.apache.shale.test.mock.MockHttpServletRequest; - /** * @author shura * Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,9 +23,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.skin.SkinThreadsTestCase.SkinTestRunnable; import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; -import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase.TestCaseRunnable; import org.apache.shale.test.mock.MockHttpServletRequest; import org.apache.shale.test.mock.MockHttpServletResponse; import org.apache.shale.test.mock.MockServletOutputStream; Modified: trunk/framework/test/src/test/java/org/richfaces/component/util/FormUtilTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/component/util/FormUtilTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/richfaces/component/util/FormUtilTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,8 +21,6 @@ package org.richfaces.component.util; -import java.util.List; - import javax.faces.component.UIComponent; import javax.faces.component.UIForm; import javax.faces.component.UIOutput; Modified: trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -3,24 +3,18 @@ import java.io.IOException; import java.io.StringWriter; import java.util.Arrays; -import java.util.List; import java.util.Map; import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; import javax.faces.component.UIForm; import javax.faces.component.UIInput; -import javax.faces.component.UIOutput; import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.apache.shale.test.mock.MockFacesContext; import org.apache.shale.test.mock.MockResponseWriter; -import junit.framework.TestCase; - public class CompositeRendererTest extends AbstractAjax4JsfTestCase { public CompositeRendererTest(String name) { Modified: trunk/framework/test/src/test/java/org/richfaces/renderkit/InputRendererBaseTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/renderkit/InputRendererBaseTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/richfaces/renderkit/InputRendererBaseTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -28,12 +28,9 @@ import javax.faces.component.UIInput; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; -import javax.faces.convert.IntegerConverter; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import junit.framework.TestCase; - /** * @author Nick - mailto:nbelaevski@exadel.com * created 12.04.2007 Modified: trunk/ui/drag-drop/src/main/config/component/dragSupport.xml =================================================================== --- trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2007-07-04 00:04:48 UTC (rev 1456) @@ -46,7 +46,7 @@ <description> MethodBinding representing an action listener method that will be notified after drag operation </description> - <methodargs>org.ajax4jsf.event.DragEvent.class</methodargs> + <methodargs>org.richfaces.event.DragEvent.class</methodargs> </property> <property> <name>disableDefault</name> @@ -69,13 +69,13 @@ <listener> <name>dragListener</name> <listenerclass> - org.ajax4jsf.event.DragListener + org.richfaces.event.DragListener </listenerclass> <componentclass> org.richfaces.component.Draggable </componentclass> <eventclass> - org.ajax4jsf.event.DragEvent + org.richfaces.event.DragEvent </eventclass> <taghandler generate="true"> <classname> Modified: trunk/ui/drag-drop/src/main/config/component/dropSupport.xml =================================================================== --- trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2007-07-04 00:04:48 UTC (rev 1456) @@ -39,7 +39,7 @@ MethodBinding representing an action listener method that will be notified after drop operation. ]]> </description> - <methodargs>org.ajax4jsf.event.DropEvent.class</methodargs> + <methodargs>org.richfaces.event.DropEvent.class</methodargs> </property> <property> <name>disableDefault</name> @@ -68,13 +68,13 @@ <listener> <name>dropListener</name> <listenerclass> - org.ajax4jsf.event.DropListener + org.richfaces.event.DropListener </listenerclass> <componentclass> - org.ajax4jsf.event.DropSource + org.richfaces.event.DropSource </componentclass> <eventclass> - org.ajax4jsf.event.DropEvent + org.richfaces.event.DropEvent </eventclass> <methodname>addDropListener</methodname> <taghandler generate="true"> Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -29,8 +29,8 @@ import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DragListener; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; /** * JSF component class Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -29,8 +29,8 @@ import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; /** * JSF component class Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -30,11 +30,11 @@ import javax.faces.event.FacesEvent; import org.ajax4jsf.dnd.DnDScript; -import org.ajax4jsf.event.DragEvent; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.resource.PrototypeScript; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; +import org.richfaces.event.DragEvent; import org.richfaces.renderkit.DnDEventsExchangeMailer.EventCallback; /** Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -29,7 +29,6 @@ import javax.faces.event.FacesEvent; import org.ajax4jsf.dnd.DnDScript; -import org.ajax4jsf.event.DropEvent; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.resource.PrototypeScript; import org.ajax4jsf.framework.util.javascript.JSFunction; @@ -38,6 +37,7 @@ import org.ajax4jsf.framework.util.javascript.ScriptUtils; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; +import org.richfaces.event.DropEvent; import org.richfaces.json.JSONCollection; import org.richfaces.json.JSONException; import org.richfaces.json.JSONMap; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -82,7 +82,7 @@ static class dragListenerMapper extends Metadata { - private static final Class[] SIGNATURE = new Class[] { org.ajax4jsf.event.DragEvent.class }; + private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DragEvent.class }; private final TagAttribute _action; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropListenerTag.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropListenerTag.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropListenerTag.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -30,9 +30,9 @@ import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagSupport; -import org.ajax4jsf.event.DropListener; -import org.ajax4jsf.event.DropListenerBinding; -import org.ajax4jsf.event.DropSource; +import org.richfaces.event.DropListener; +import org.richfaces.event.DropListenerBinding; +import org.richfaces.event.DropSource; /** Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -81,7 +81,7 @@ static class dropListenerMapper extends Metadata { - private static final Class[] SIGNATURE = new Class[] { org.ajax4jsf.event.DropEvent.class }; + private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DropEvent.class }; private final TagAttribute _action; Modified: trunk/ui/tree/src/main/config/component/commonTreeListeners.ent =================================================================== --- trunk/ui/tree/src/main/config/component/commonTreeListeners.ent 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/main/config/component/commonTreeListeners.ent 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,13 +1,13 @@ <listener> <name>dropListener</name> <listenerclass> - org.ajax4jsf.dnd.event.DropListener + org.richfaces.event.DropListener </listenerclass> <componentclass> - org.ajax4jsf.dnd.event.DropSource + org.richfaces.event.DropSource </componentclass> <eventclass> - org.ajax4jsf.dnd.event.DropEvent + org.richfaces.event.DropEvent </eventclass> <taghandler generate="false"> <classname> @@ -19,13 +19,13 @@ <listener> <name>dragListener</name> <listenerclass> - org.ajax4jsf.dnd.event.DragListener + org.richfaces.event.DragListener </listenerclass> <componentclass> - org.ajax4jsf.dnd.Draggable + org.richfaces.component.Draggable </componentclass> <eventclass> - org.ajax4jsf.dnd.event.DragEvent + org.richfaces.event.DragEvent </eventclass> <taghandler generate="false"> <classname> @@ -38,13 +38,13 @@ <listener> <name>changeExpandListener</name> <listenerclass> - org.richfaces.component.events.NodeExpandedListener + org.richfaces.event.NodeExpandedListener </listenerclass> <componentclass> - org.richfaces.component.TreeListenerEventsProducer + org.richfaces.event.TreeListenerEventsProducer </componentclass> <eventclass> - org.richfaces.component.events.NodeExpandedEvent + org.richfaces.event.NodeExpandedEvent </eventclass> <taghandler generate="true"> <classname> @@ -55,13 +55,13 @@ <listener> <name>nodeSelectListener</name> <listenerclass> - org.richfaces.component.events.NodeSelectedListener + org.richfaces.event.NodeSelectedListener </listenerclass> <componentclass> - org.richfaces.component.TreeListenerEventsProducer + org.richfaces.event.TreeListenerEventsProducer </componentclass> <eventclass> - org.richfaces.component.events.NodeSelectedEvent + org.richfaces.event.NodeSelectedEvent </eventclass> <taghandler generate="true"> <classname> Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -37,10 +37,6 @@ import org.ajax4jsf.ajax.repeat.UIDataAdaptor; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DragListener; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropListener; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.model.DataComponentState; import org.ajax4jsf.model.DataVisitor; @@ -54,6 +50,10 @@ import org.richfaces.component.state.events.ExpandAllCommandEvent; import org.richfaces.component.state.events.ExpandNodeCommandEvent; import org.richfaces.component.state.events.TreeStateCommandEvent; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeExpandedListener; import org.richfaces.event.NodeSelectedEvent; Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -13,12 +13,12 @@ import javax.faces.event.FacesEvent; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DragListener; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropListener; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.richfaces.component.events.TreeEvents; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; import org.richfaces.event.NodeExpandedListener; import org.richfaces.event.NodeSelectedListener; import org.richfaces.event.TreeListenerEventsProducer; Modified: trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -27,9 +27,9 @@ import javax.faces.event.FacesEvent; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DropEvent; import org.richfaces.event.AjaxSelectedEvent; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DropEvent; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeSelectedEvent; import org.richfaces.event.TreeListenerEventsProducer; Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -38,10 +38,6 @@ import javax.faces.event.PhaseId; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DragListener; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropListener; import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; @@ -50,6 +46,10 @@ import org.apache.commons.lang.StringUtils; import org.richfaces.component.state.events.ExpandAllCommandEvent; import org.richfaces.component.xml.XmlTreeDataBuilder; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeExpandedListener; import org.richfaces.event.NodeSelectedEvent; @@ -410,7 +410,7 @@ } /** - * Test method for {@link org.richfaces.component.UITreeNode#addDropListener(org.ajax4jsf.event.DropListener)}. + * Test method for {@link org.richfaces.component.UITreeNode#addDropListener(org.richfaces.event.DropListener)}. */ public final void testAddDropListener() { DropListener listener = new DropListener() { @@ -439,7 +439,7 @@ } /** - * Test method for {@link org.richfaces.component.UITreeNode#addDragListener(org.ajax4jsf.event.DragListener)}. + * Test method for {@link org.richfaces.component.UITreeNode#addDragListener(org.richfaces.event.DragListener)}. */ public final void testAddDragListener() { DragListener listener = new DragListener() { Modified: trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -26,8 +26,6 @@ import javax.faces.event.FacesEvent; import javax.faces.event.FacesListener; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DropEvent; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockMethodBinding; import org.ajax4jsf.tests.MockViewRoot; @@ -35,6 +33,8 @@ import org.richfaces.component.UITree; import org.richfaces.component.UITreeNode; import org.richfaces.event.AjaxSelectedEvent; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DropEvent; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeSelectedEvent;

17 years, 6 months

1
0
0 / 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits July 2007