richfaces-svn-commits
March 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 195 discussions
JBoss Rich Faces SVN: r16650 - in root/ui-sandbox/trunk/components/tables/ui/src/main: java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-03-22 14:05:51 -0400 (Mon, 22 Mar 2010)
New Revision: 16650
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
Log:
RF-8484
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-03-22 12:59:20 UTC (rev 16649)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-03-22 18:05:51 UTC (rev 16650)
@@ -22,35 +22,67 @@
package org.richfaces.component;
+import java.io.IOException;
+import java.util.Collection;
+
+import javax.faces.component.visit.VisitCallback;
+import javax.faces.component.visit.VisitContext;
+import javax.faces.render.Renderer;
+
import org.ajax4jsf.model.DataComponentState;
import org.ajax4jsf.model.RepeatState;
+import org.richfaces.renderkit.PartialEncodingRenderer;
/**
* @author Anton Belevich
*
*/
-public abstract class UIExtendedDataTable extends UIDataTableBase {
+public class UIExtendedDataTable extends UIDataTableBase implements PartiallyEncodedComponent{
+ public static final String SCROLL = "scroll";
+ public static final String SUBMITTED_CLIENT_FIRST = "submittedClientFirst";
+
+ protected enum PropertyKeys {
+ clientFirst, clientRows
+ }
+
@Override
+ public void encodePartially(VisitContext context, VisitCallback callback,
+ Collection<String> subComponentIdentifiers)
+ throws IOException {
+ if (subComponentIdentifiers.contains(SCROLL)) {
+ Integer submittedClientFirst = (Integer) getAttributes().remove(SUBMITTED_CLIENT_FIRST);
+ if (submittedClientFirst != null) {
+ setClientFirst(submittedClientFirst);
+ }
+ }
+ Renderer renderer = getRenderer(context.getFacesContext());
+ ((PartialEncodingRenderer) renderer).encodePartially(this, context, callback, subComponentIdentifiers);
+ }
+
+ @Override
protected DataComponentState createComponentState() {
return new RepeatState() {
@Override
public int getFirst() {
- return UIExtendedDataTable.this.getClientFirst();
+ return UIExtendedDataTable.this.getFirst() + UIExtendedDataTable.this.getClientFirst();
}
@Override
public int getRows() {
- return UIExtendedDataTable.this.getClientRows();
+ int rows = UIExtendedDataTable.this.getClientRows();
+ if (rows > 0) {
+ rows = Math.min(rows, UIExtendedDataTable.this.getRows());
+ } else {
+ rows = UIExtendedDataTable.this.getRows();
+ }
+
+ return rows;
}
};
}
- protected enum PropertyKeys {
- clientFirst, clientRows
- }
-
public int getClientFirst() {
return (Integer) getStateHelper().eval(PropertyKeys.clientFirst, 0);
}
@@ -62,7 +94,7 @@
@Override
public void setFirst(int first) {
super.setFirst(first);
- setClientFirst(first);
+ setClientFirst(0);
}
public int getClientRows() {
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-03-22 12:59:20 UTC (rev 16649)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-03-22 18:05:51 UTC (rev 16650)
@@ -27,6 +27,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -35,7 +36,10 @@
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
+import javax.faces.component.visit.VisitCallback;
+import javax.faces.component.visit.VisitContext;
import javax.faces.context.FacesContext;
+import javax.faces.context.PartialResponseWriter;
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.javascript.JSFunction;
@@ -49,7 +53,7 @@
@ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "jquery.position.js"),
@ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "extendedDataTable.js"),
@ResourceDependency(name = "extendedDataTable.css") })
-public class ExtendedDataTableRenderer extends AbstractRowsRenderer{
+public class ExtendedDataTableRenderer extends AbstractRowsRenderer implements PartialEncodingRenderer {
private class RendererState extends RowHolderBase {
@@ -113,6 +117,41 @@
}
@Override
+ public void encodePartially(UIComponent component, VisitContext visitContext, VisitCallback callback,
+ Collection<String> subComponentIdentifiers) throws IOException {
+ if (subComponentIdentifiers.size() == 1 && subComponentIdentifiers.contains(UIExtendedDataTable.SCROLL)) {
+ FacesContext context = visitContext.getFacesContext();
+ PartialResponseWriter writer = context.getPartialViewContext().getPartialResponseWriter();
+ UIExtendedDataTable table = (UIExtendedDataTable) component;
+ Object key = table.getRowKey();
+ table.captureOrigValue(context);
+ table.setRowKey(context, null);
+ RendererState state = createRowHolder(context, table);
+ state.setFrozen(true);
+ // TODO 1. Encode fixed children 2. Load necessary rows only
+ for (int i = 0; i < 2; i++) { // TODO 1. Replace 2 with constant 2. Empty frozen part shouldn't be rendered
+ if (i == 0) {
+ writer.startUpdate(table.getClientId(context) + ":ftb");
+ } else {
+ writer.startUpdate(table.getClientId(context) + ":ntb");
+ }
+ encodeTBody(state, i);
+ writer.endUpdate();
+ state.setFrozen(false);
+ }
+ writer.startEval();
+ writer.write("jQuery('#" + component.getClientId(context).replace(":", "\\\\:")
+ + "').triggerHandler('rich:onscrollcomplete', " + table.getClientFirst() + ");");
+ writer.endEval();
+ table.setRowKey(context, key);
+ table.restoreOrigValue(context);
+
+ } else {
+ throw new IllegalArgumentException("Incorect subComponentIdentifiers: " + subComponentIdentifiers);
+ }
+ }
+
+ @Override
protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component)
throws IOException {
writer.startElement(HTML.DIV_ELEM, component);
@@ -199,12 +238,16 @@
JSFunction ajaxFunction = buildAjaxFunction(context, component, AJAX_FUNCTION_NAME);
AjaxEventOptions eventOptions = buildEventOptions(context, component);
eventOptions.getParameters().put("rich:columnsOrder", new JSReference("columnsOrder"));
- if (!eventOptions.isEmpty()) {
- ajaxFunction.addParameter(eventOptions);
- }
+ ajaxFunction.addParameter(eventOptions);
+ JSFunction scrollFunction = buildAjaxFunction(context, component, AJAX_FUNCTION_NAME);
+ AjaxEventOptions scrollOptions = buildEventOptions(context, component);
+ scrollOptions.getParameters().put("rich:clientFirst", new JSReference("clientFirst"));
+ scrollFunction.addParameter(scrollOptions);
+
writer.write("new RichFaces.ExtendedDataTable('" + component.getClientId(context) + "', "
- + getRowCount(component) + ", function(event, columnsOrder) {" + ajaxFunction.toScript() + ";});");
+ + getRowCount(component) + ", function(event, columnsOrder) {" + ajaxFunction.toScript() + ";}"
+ + ", function(event, clientFirst) {" + scrollFunction.toScript() + ";});");
writer.endElement(HTML.SCRIPT_ELEM);
writer.endElement(HTML.DIV_ELEM);
}
@@ -241,7 +284,6 @@
}
String width = getColumnWidth(column);
writer.writeText(".rich-extable-cell-width-" + id + " {", "width"); // TODO getNormalizedId(context,
- // state.getGrid())
writer.writeText("width: " + width + ";", "width");
writer.writeText("}", "width");
}
@@ -321,6 +363,9 @@
}
} else {
writer.startElement(HTML.DIV_ELEM, table);
+ writer.startElement(HTML.DIV_ELEM, table);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-spacer", null);
+ writer.endElement(HTML.DIV_ELEM);
writer.startElement(HTML.TABLE_ELEMENT, table);
writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
@@ -337,9 +382,7 @@
writer.startElement(HTML.TABLE_ELEMENT, table);
writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
- writer.startElement(HTML.TBOBY_ELEMENT, table);
- table.walk(context, this, state); // TODO encodeRows(context, table);
- writer.endElement(HTML.TBOBY_ELEMENT);
+ encodeTBody(state, i);
writer.endElement(HTML.TABLE_ELEMENT);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.TD_ELEM);
@@ -353,6 +396,20 @@
writer.endElement(HTML.DIV_ELEM);
}
+ private void encodeTBody(RendererState state, int i) throws IOException {
+ FacesContext context = state.getContext();
+ ResponseWriter writer = context.getResponseWriter();
+ UIExtendedDataTable table = state.getRow();
+ writer.startElement(HTML.TBOBY_ELEMENT, table);
+ if (i == 0) {
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":ftb", null);
+ } else {
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":ntb", null);
+ }
+ table.walk(context, this, state); // TODO encodeRows(context, table);
+ writer.endElement(HTML.TBOBY_ELEMENT);
+ }
+
private void encodeHeaderOrFooterCell(FacesContext context, ResponseWriter writer, UIComponent column,
String facetName) throws IOException {
if (column.isRendered()) {
@@ -425,6 +482,9 @@
if (map.get(component.getClientId(context)) != null) {
updateColumnsOrder(context, component, map.get("rich:columnsOrder"));
}
+ if (map.get(component.getClientId(context)) != null) {
+ updateClientFirst(context, component, map.get("rich:clientFirst"));
+ }
}
/**
@@ -453,6 +513,14 @@
}
}
+ private void updateClientFirst(FacesContext context, UIComponent component, String clientFirst) {
+ if (clientFirst != null && clientFirst.length() > 0) {
+ int value = Integer.parseInt(clientFirst);
+ component.getAttributes().put(UIExtendedDataTable.SUBMITTED_CLIENT_FIRST, value);
+ context.getPartialViewContext().getRenderIds().add(component.getClientId(context) + "@" + UIExtendedDataTable.SCROLL);
+ }
+ }
+
private String getColumnWidth(UIComponent column) {
String width = (String) column.getAttributes().get("width");
if (width == null || width.length() == 0 || width.indexOf("%") != -1) {
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2010-03-22 12:59:20 UTC (rev 16649)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2010-03-22 18:05:51 UTC (rev 16650)
@@ -36,8 +36,14 @@
width: 100%;
}
+.rich-extable-spacer {
+ height: 0px;
+ font-size: 0px;
+ line-height: 0px;
+}
+
.rich-extable-footer {
- background-color : #CCCCCC;
+ background-color: #CCCCCC;
}
.rich-extable-footer-align{
@@ -97,6 +103,10 @@
border-right: 1px solid #C4C0C9;
}
+.rich-extable-cell-content, .rich-extable-header-cell-content, .rich-extable-footer-cell-content{
+ padding: 2px;
+}
+
.rich-extable-reorder-marker {
position:absolute;
height: 9px;
@@ -104,8 +114,4 @@
width:9px;
background-image: url("#{resource['reorderMarker.gif']}");
display: none;
-}
-
-.rich-extable-cell-content, .rich-extable-header-cell-content, .rich-extable-footer-cell-content{
- padding: 2px;
}
\ No newline at end of file
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-03-22 12:59:20 UTC (rev 16649)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-03-22 18:05:51 UTC (rev 16650)
@@ -34,7 +34,7 @@
return rule;
};
- richfaces.ExtendedDataTable = function(id, rowCount, ajaxFunction) {
+ richfaces.ExtendedDataTable = function(id, rowCount, ajaxFunction, scrollFunction) {
var WIDTH_CLASS_NAME_BASE = "rich-extable-cell-width-";
var MIN_WIDTH = 20;
var idSuffixs = [":header", ":footer"]; //TODO Not use idSuffixs
@@ -55,7 +55,7 @@
if (contentElement) {
idSuffixs[idSuffixs.length] = ":body";
- //TODO var marginElement = contentElement.firstChild;this.marginElement = Richfaces.firstDescendant(this.contentElement);
+ var spacerElement = contentElement.firstChild;//TODO this.marginElement = Richfaces.firstDescendant(this.contentElement);
var dataTableElement = contentElement.lastChild;//TODO this.dataTableElement = Richfaces.lastDescendant(this.contentElement);
var rows = document.getElementById(id + ":body").firstChild.rows.length;//TODO Richfaces.firstDescendant;
}
@@ -65,6 +65,8 @@
var idOfReorderingColumn = "";
var newWidths = {};
+ var timeoutId = null;
+
var updateLayout = function() {
var offsetWidth = frozenHeaderPartElement ? frozenHeaderPartElement.offsetWidth : 0;
var width = Math.max(0, element.clientWidth - offsetWidth);
@@ -135,6 +137,7 @@
};
var initializeLayout = function() {
+ //TODO Use "var rowHeight" instead of "dataTableElement.offsetHeight / rows"
contentElement.style.height = (rowCount * dataTableElement.offsetHeight / rows) + "px";
updateLayout();
updateScrollPosition(); //TODO Restore horizontal scroll position
@@ -224,12 +227,42 @@
jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell").unbind("mouseover", overReorder);
reorderElement.style.display = "none";
};
+
+ var loadData = function(event) {
+ var clientFirst = Math.round((bodyElement.scrollTop + bodyElement.clientHeight / 2) / (dataTableElement.offsetHeight / rows) - rows / 2);
+ if (clientFirst <= 0) {
+ clientFirst = 0;
+ } else {
+ clientFirst = Math.min(rowCount - rows, clientFirst);
+ }
+ scrollFunction(event, clientFirst);
+ }
+ var bodyScrollListener = function(event) {
+ if(timeoutId) {
+ window.clearTimeout(timeoutId);
+ timeoutId = null;
+ }
+ if (this.scrollTop < spacerElement.offsetHeight || this.scrollTop + this.clientHeight > spacerElement.offsetHeight + dataTableElement.offsetHeight) {
+ timeoutId = window.setTimeout(function (event) {loadData(event)}, 1000);
+ }
+ };
+
+ var scrollComplete = function (event, first) {
+ spacerElement.style.height = (first * dataTableElement.offsetHeight / rows) + "px";
+// TODO var height = first * dataTableElement.offsetHeight / rows;
+// var style = spacerElement.style;
+// style.height = height + "px";
+// style.display = height ? "block" : "";
+ };
+
jQuery(document).ready(initializeLayout);
jQuery(window).bind("resize", updateLayout);
jQuery(scrollElement).bind("scroll", updateScrollPosition);
jQuery(element).children(".rich-extable-header").find(".rich-extable-resizer").bind("mousedown", beginResize);
jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell").bind("mousedown", beginReorder);
+ jQuery(bodyElement).bind("scroll", bodyScrollListener);
+ jQuery(element).bind("rich:onscrollcomplete", scrollComplete);
};
}(window.RichFaces, jQuery));
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16649 - branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-03-22 08:59:20 -0400 (Mon, 22 Mar 2010)
New Revision: 16649
Modified:
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
Log:
org.ajax4jsf.handleViewExpiredOnClient added back(seems was removed by mistake before previous release). Without this parameter - session expiration functionality broken.
Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2010-03-22 12:17:02 UTC (rev 16648)
+++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2010-03-22 12:59:20 UTC (rev 16649)
@@ -64,8 +64,10 @@
<param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name>
<param-value>true</param-value>
</context-param>
-
-
+ <context-param>
+ <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name>
+ <param-value>true</param-value>
+ </context-param>
<listener>
<listener-class>
org.jboss.seam.servlet.SeamListener
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16648 - root/cdk/trunk/plugins/generator.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-22 08:17:02 -0400 (Mon, 22 Mar 2010)
New Revision: 16648
Modified:
root/cdk/trunk/plugins/generator/pom.xml
Log:
RF-8232 Tags support
Change stucture
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2010-03-22 12:02:09 UTC (rev 16647)
+++ root/cdk/trunk/plugins/generator/pom.xml 2010-03-22 12:17:02 UTC (rev 16648)
@@ -188,12 +188,6 @@
<version>1.3</version> </dependency>
-->
<dependency>
- <groupId>com.wutka</groupId>
- <artifactId>dtdparser</artifactId>
- <version>1.21</version>
- </dependency>
-
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.5.2</version>
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16647 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces/cdk and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-22 08:02:09 -0400 (Mon, 22 Mar 2010)
New Revision: 16647
Removed:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlutils/
Log:
RF-8232 Tags support
Change stucture
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16646 - in branches/community/3.3.X/ui/fileUpload/src/main: java/org/richfaces/renderkit and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-03-22 07:47:46 -0400 (Mon, 22 Mar 2010)
New Revision: 16646
Modified:
branches/community/3.3.X/ui/fileUpload/src/main/config/component/fileUpload.xml
branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
RF-8440 Part1. Add new classes for fileUpload component
Modified: branches/community/3.3.X/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/config/component/fileUpload.xml 2010-03-22 11:44:47 UTC (rev 16645)
+++ branches/community/3.3.X/ui/fileUpload/src/main/config/component/fileUpload.xml 2010-03-22 11:47:46 UTC (rev 16646)
@@ -116,21 +116,25 @@
<name>uploadButtonClass</name>
<classname>java.lang.String</classname>
<description>Assigns one or more space-separated CSS class names to the component 'Upload' button</description>
+ <defaultvalue>"rich-fileupload-bold-label"</defaultvalue>
</property>
<property>
<name>uploadButtonClassDisabled</name>
<classname>java.lang.String</classname>
<description>Assigns one or more space-separated CSS class names to the component 'Upload' button disabled</description>
+ <defaultvalue>"rich-fileupload-bold-label"</defaultvalue>
</property>
<property>
<name>stopButtonClass</name>
<classname>java.lang.String</classname>
<description>Assigns one or more space-separated CSS class names to the component 'Cancel' button</description>
+ <defaultvalue>"rich-fileupload-bold-label"</defaultvalue>
</property>
<property>
<name>stopButtonClassDisabled</name>
<classname>java.lang.String</classname>
<description>Assigns one or more space-separated CSS class names to the component 'Cancel' button disabled</description>
+ <defaultvalue>"rich-fileupload-bold-label"</defaultvalue>
</property>
<property>
<name>cleanButtonClass</name>
@@ -173,6 +177,41 @@
<description>Assigns one or more space-separated CSS class names to the disabled controls of the file entries</description>
</property>
<property>
+ <name>doneLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>Assigns one or more space-separated CSS class names to the component 'Done' label</description>
+ </property>
+ <property>
+ <name>sizeErrorLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>Assigns one or more space-separated CSS class names to the component 'Size error' label</description>
+ </property>
+ <property>
+ <name>transferErrorLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>Assigns one or more space-separated CSS class names to the component 'Transfer error' label</description>
+ </property>
+ <property>
+ <name>progressLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>Assigns one or more space-separated CSS class names to the component 'Progress' label</description>
+ </property>
+ <property>
+ <name>entryCancelLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>Assigns one or more space-separated CSS class names to the component 'Cancel entry' label in fileUpload list</description>
+ </property>
+ <property>
+ <name>entryStopLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>Assigns one or more space-separated CSS class names to the component 'Stop entry' label in fileUpload list</description>
+ </property>
+ <property>
+ <name>entryClearLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>Assigns one or more space-separated CSS class names to the component 'Clear entry' label in fileUpload list</description>
+ </property>
+ <property>
<name>fileUploadListener</name>
<classname>javax.faces.el.MethodBinding</classname>
<description>
Modified: branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-03-22 11:44:47 UTC (rev 16645)
+++ branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-03-22 11:47:46 UTC (rev 16646)
@@ -92,9 +92,9 @@
"size_error", "transfer_error","progress" };
/** Default labels values */
- private static final String[] defaultLables = { "Add...", "<b>Upload</b>",
- "<b>Stop</b>", "Clear All", "Cancel", "Clear", "Stop",
- "<b>Done</b>", "File size restricted", "Transfer error occurred","uploading"};
+ private static final String[] defaultLables = { "Add...", "Upload",
+ "Stop", "Clear All", "Cancel", "Clear", "Stop",
+ "Done", "File size restricted", "Transfer error occurred","uploading"};
/** Set of attributes that can define label's value */
private static final String[] labelAttribues = { "addControlLabel",
Modified: branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2010-03-22 11:44:47 UTC (rev 16645)
+++ branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2010-03-22 11:47:46 UTC (rev 16646)
@@ -11,6 +11,7 @@
.rich-fileupload-name{ width : 100%; height : 58px; padding : 2px 10px 2px 10px;}
.rich-fileupload-del{ width : 90px; text-align : center; padding-top : 3px; padding-bottom : 3px;}
.rich-fileupload-scroll{ width : 10px; text-align : center;}
+.rich-fileupload-bold-label{font-weight: bold;}
input[type="file"][class~="rich-fileupload-hidden"]::-webkit-rich-fileupload-button {
font-size: 10em;
Modified: branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2010-03-22 11:44:47 UTC (rev 16645)
+++ branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2010-03-22 11:47:46 UTC (rev 16646)
@@ -13,6 +13,14 @@
FileUploadEntry.UPLOAD_SIZE_ERROR = "size_error";
FileUploadEntry.UPLOAD_FORBIDDEN = "forbidden";
+FileUploadEntry.UPLOAD_IN_PROGRESS_CLASS = "";
+FileUploadEntry.UPLOAD_SUCCESS_CLASS = "rich-fileupload-bold-label";
+FileUploadEntry.UPLOAD_TRANSFER_ERROR_CLASS = "";
+FileUploadEntry.UPLOAD_SIZE_ERROR_CLASS = "";
+FileUploadEntry.ENTRY_CANCEL_LABEL_CLASS="";
+FileUploadEntry.ENTRY_CLEAR_LABEL_CLASS="";
+FileUploadEntry.ENTRY_STOP_LABEL_CLASS="";
+
FileUploadEntry.LABELS = {};
FileUploadEntry.LABELS[FileUploadEntry.INITIALIZED] = '';
FileUploadEntry.LABELS[FileUploadEntry.READY] = '';
@@ -26,7 +34,7 @@
{
'style':'',
'onclick': function (context) { return 'var entry = FileUploadEntry.getComponent(this); entry.uploadObject.clear(entry); return false;';},
- 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("className", context); },
+ 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("labelClassName", context) + Richfaces.evalMacro("className", context); },
'href':'#'
},
[
@@ -40,7 +48,7 @@
{
'style':'',
'onclick': function (context) { return 'FileUploadEntry.getComponent(this).uploadObject.stop(); return false;';},
- 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("className", context); },
+ 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("labelClassName", context) + Richfaces.evalMacro("className", context); },
'href':'#'
},
[
@@ -54,7 +62,7 @@
{
'style':'',
'onclick': function (context) { return 'var entry = FileUploadEntry.getComponent(this); entry.uploadObject.clear(entry, true); return false;';},
- 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("className", context); },
+ 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("labelClassName", context) + Richfaces.evalMacro("className", context); },
'href':'#'
},
[
@@ -173,6 +181,8 @@
var p = this.uploadObject.progressBar.getValue();
if (p) {
var content = this.uploadObject.labelMarkup.invoke('getContent', this.uploadObject.progressData.getContext(p)).join('');
+ var className = this.getClassByState(FileUploadEntry.UPLOAD_IN_PROGRESS);
+ Element.addClassName(this.statusLabel, className);
this.statusLabel.innerHTML = content;
}
@@ -208,15 +218,17 @@
Element.clearChildren(this.statusLabel);
Element.clearChildren(this.controlArea);
-
+
+ var className = this.getClassByState(newState);
+ Element.addClassName(this.statusLabel, className);
Element.insert(this.statusLabel, FileUploadEntry.LABELS[newState]);
if (newState == FileUploadEntry.UPLOAD_IN_PROGRESS) {
- Element.update(this.controlArea, FileUploadEntry.stopControlTemplate.invoke('getContent',{'controlLink': FileUploadEntry.LABELS['entry_stop'],'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
+ Element.update(this.controlArea, FileUploadEntry.stopControlTemplate.invoke('getContent',{'controlLink': FileUploadEntry.LABELS['entry_stop'],'labelClassName' : FileUploadEntry.ENTRY_STOP_LABEL_CLASS, 'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
} else if (newState == FileUploadEntry.UPLOAD_SUCCESS) {
- Element.update(this.controlArea, FileUploadEntry.clearControlTemplate.invoke('getContent',{'controlLink': FileUploadEntry.LABELS['entry_clear'],'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
+ Element.update(this.controlArea, FileUploadEntry.clearControlTemplate.invoke('getContent',{'controlLink': FileUploadEntry.LABELS['entry_clear'],'labelClassName' : FileUploadEntry.ENTRY_CLEAR_LABEL_CLASS,'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
} else {
- Element.update(this.controlArea, FileUploadEntry.cancelControlTemplate.invoke('getContent',{'controlLink': FileUploadEntry.LABELS['entry_cancel'],'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
+ Element.update(this.controlArea, FileUploadEntry.cancelControlTemplate.invoke('getContent',{'controlLink': FileUploadEntry.LABELS['entry_cancel'],'labelClassName' : FileUploadEntry.ENTRY_CANCEL_LABEL_CLASS,'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
}
if (newState == FileUploadEntry.UPLOAD_SUCCESS) {
@@ -224,6 +236,18 @@
}
this.uploadObject.notifyStateChange(this, oldState);
+ },
+
+ getClassByState: function(state){
+ if (state == FileUploadEntry.UPLOAD_SUCCESS) {
+ return FileUploadEntry.UPLOAD_SUCCESS_CLASS;
+ }else if(state == FileUploadEntry.UPLOAD_IN_PROGRESS){
+ return FileUploadEntry.UPLOAD_IN_PROGRESS_CLASS;
+ }else if(state == FileUploadEntry.UPLOAD_TRANSFER_ERROR){
+ return FileUploadEntry.UPLOAD_TRANSFER_ERROR_CLASS;
+ }else if(state == FileUploadEntry.UPLOAD_SIZE_ERROR){
+ return FileUploadEntry.UPLOAD_SIZE_ERROR_CLASS;
+ }else return '';
}
});
@@ -460,8 +484,8 @@
DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start-dis '
},
STOP : {
- ENABLED : 'rich-fileupload-button rich-fileupload-font ',
- DISABLED : 'rich-fileupload-button-dis rich-fileupload-font '
+ ENABLED : 'rich-fileupload-button rich-fileupload-font',
+ DISABLED : 'rich-fileupload-button-dis rich-fileupload-font'
},
STOP_CONTENT : {
ENABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop ',
@@ -486,6 +510,27 @@
UPLOAD_LIST : {
ENABLED : '',
DISABLED : ''
+ },
+ SIZE_ERROR_LABEL : {
+ ENABLED : ''
+ },
+ TRANSFER_ERROR_LABEL : {
+ ENABLED : ''
+ },
+ DONE_LABEL : {
+ ENABLED : 'rich-fileupload-bold-label'
+ },
+ PROGRESS_LABEL : {
+ ENABLED : ''
+ },
+ ENTRY_CANCEL_LABEL : {
+ ENABLED : ''
+ },
+ ENTRY_STOP_LABEL : {
+ ENABLED : ''
+ },
+ ENTRY_CLEAR_LABEL : {
+ ENABLED : ''
}
};
this.events = {};
@@ -493,7 +538,23 @@
var classes = options.classes;
for (var obj in classes) {
- var value = classes[obj];
+ var value = obj;
+ if (value == "DONE_LABEL"){
+ FileUploadEntry.UPLOAD_SUCCESS_CLASS = classes.DONE_LABEL.ENABLED;
+ }else if(value == "SIZE_ERROR_LABEL"){
+ FileUploadEntry.UPLOAD_SIZE_ERROR_CLASS = classes.SIZE_ERROR_LABEL.ENABLED;
+ }else if(value == "TRANSFER_ERROR_LABEL"){
+ FileUploadEntry.UPLOAD_TRANSFER_ERROR_CLASS = classes.TRANSFER_ERROR_LABEL.ENABLED;
+ }else if(value == "PROGRESS_LABEL"){
+ FileUploadEntry.UPLOAD_IN_PROGRESS_CLASS = classes.PROGRESS_LABEL.ENABLED;
+ }else if(value == "ENTRY_CANCEL_LABEL"){
+ FileUploadEntry.ENTRY_CANCEL_LABEL_CLASS = classes.ENTRY_CANCEL_LABEL.ENABLED;
+ }else if(value == "ENTRY_STOP_LABEL"){
+ FileUploadEntry.ENTRY_STOP_LABEL_CLASS = classes.ENTRY_STOP_LABEL.ENABLED;
+ }else if(value == "ENTRY_CLEAR_LABEL"){
+ FileUploadEntry.ENTRY_CLEAR_LABEL_CLASS = classes.ENTRY_CLEAR_LABEL.ENABLED;
+ }
+ value = classes[obj];
for (var property in value) {
this.classes[obj][property] += value[property];
if (this.classes[obj + "_CONTENT"]) {
Modified: branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2010-03-22 11:44:47 UTC (rev 16645)
+++ branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2010-03-22 11:47:46 UTC (rev 16646)
@@ -159,8 +159,29 @@
<c:scriptOption name="ENABLED" value="#{component.attributes['uploadListClass']}" />
<c:scriptOption name="DISABLED" value="#{component.attributes['uploadListClassDisabled']}" />
</c:scriptObject>
+ <c:scriptObject var="DONE_LABEL">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['doneLabelClass']}" />
+ </c:scriptObject>
+ <c:scriptObject var="SIZE_ERROR_LABEL">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['sizeErrorLabelClass']}" />
+ </c:scriptObject>
+ <c:scriptObject var="TRANSFER_ERROR_LABEL">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['transferErrorLabelClass']}" />
+ </c:scriptObject>
+ <c:scriptObject var="PROGRESS_LABEL">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['progressLabelClass']}" />
+ </c:scriptObject>
+ <c:scriptObject var="ENTRY_CANCEL_LABEL">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['entryCancelLabelClass']}" />
+ </c:scriptObject>
+ <c:scriptObject var="ENTRY_STOP_LABEL">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['entryStopLabelClass']}" />
+ </c:scriptObject>
+ <c:scriptObject var="ENTRY_CLEAR_LABEL">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['entryClearLabelClass']}" />
+ </c:scriptObject>
<c:scriptObject var="classes">
- <c:scriptOption variables="ADD, UPDATE, STOP, CLEAN, FILE_ENTRY, FILE_ENTRY_CONTROL, UPLOAD_LIST" />
+ <c:scriptOption variables="ADD, UPDATE, STOP, CLEAN, FILE_ENTRY, FILE_ENTRY_CONTROL, UPLOAD_LIST, DONE_LABEL, SIZE_ERROR_LABEL, TRANSFER_ERROR_LABEL, PROGRESS_LABEL, ENTRY_CANCEL_LABEL, ENTRY_STOP_LABEL, ENTRY_CLEAR_LABEL" />
</c:scriptObject>
<c:scriptObject var="events">
<c:scriptOption attributes="onupload, onuploadcomplete, onuploadcanceled, onerror, ontyperejected, onsizerejected, onclear, onadd, onfileuploadcomplete" wrapper="eventHandler"/>
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16645 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces and 21 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-22 07:44:47 -0400 (Mon, 22 Mar 2010)
New Revision: 16645
Added:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/
Removed:
root/cdk/trunk/plugins/generator/src/main/java/org/ajax4jsf/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/dtd/
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/templatecompiler/
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/types/
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/CdkConfiguration.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMarkerRenderer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/Argument.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/ClassImport.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaAnnotation.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaClass.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaComment.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaConstructor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaField.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaImport.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaLanguageElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaModifier.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPackage.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPrimitive.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBody.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementsContainer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/RuntimeImport.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELNodeConstants.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELParserUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELVisitor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ParsingException.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/Type.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractBinaryOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractMethodTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstBracketSuffixTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstChoiceTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstDeferredOrDynamicExpressionTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstEmptyTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFloatingPointTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFunctionTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIdentifierTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIntegerTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstLiteralTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstMethodSuffixTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNegativeTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstPropertySuffixTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstStringTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstValueTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticIntegerOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanResultOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ConstantValueTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ITreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/NullType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/PlainClassType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ReferencedType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/TypesFactory.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean2.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/ELParserTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/TypesFactoryTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/UIComponent.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java
Log:
RF-8232 Tags support
Change stucture
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -34,7 +34,7 @@
import java.util.Map;
import org.richfaces.cdk.apt.AptModule;
-import org.richfaces.cdk.freemarker.FreeMakerModule;
+import org.richfaces.cdk.generate.freemarker.FreeMakerModule;
import org.richfaces.cdk.generate.java.ClassGeneratorModule;
import org.richfaces.cdk.generate.java.taghandler.TagHandlerModule;
import org.richfaces.cdk.generate.taglib.TaglibModule;
Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker (from rev 16644, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker)
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/CdkConfiguration.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/CdkConfiguration.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.freemarker;
+package org.richfaces.cdk.generate.freemarker;
import org.richfaces.cdk.Logger;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMakerModule.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.freemarker;
+package org.richfaces.cdk.generate.freemarker;
import com.google.inject.AbstractModule;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMarkerRenderer.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMarkerRenderer.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -23,7 +23,7 @@
-package org.richfaces.cdk.freemarker;
+package org.richfaces.cdk.generate.freemarker;
import freemarker.template.Configuration;
import freemarker.template.Template;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -23,7 +23,7 @@
-package org.richfaces.cdk.freemarker;
+package org.richfaces.cdk.generate.freemarker;
import org.richfaces.cdk.model.ModelElementBase;
import org.richfaces.cdk.model.TagModel;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -23,7 +23,7 @@
-package org.richfaces.cdk.freemarker;
+package org.richfaces.cdk.generate.freemarker;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -23,7 +23,7 @@
-package org.richfaces.cdk.freemarker;
+package org.richfaces.cdk.generate.freemarker;
import freemarker.ext.beans.BeanModel;
import freemarker.ext.beans.BeansWrapper;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/TagTemplateModel.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.freemarker;
+package org.richfaces.cdk.generate.freemarker;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -29,7 +29,7 @@
import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Output;
import org.richfaces.cdk.Outputs;
-import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
+import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer;
import org.richfaces.cdk.model.BehaviorModel;
import org.richfaces.cdk.model.ComponentLibrary;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -32,7 +32,7 @@
import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Output;
import org.richfaces.cdk.Outputs;
-import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
+import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ComponentModel;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -29,7 +29,7 @@
import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Output;
import org.richfaces.cdk.Outputs;
-import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
+import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConverterModel;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -29,7 +29,7 @@
import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Output;
import org.richfaces.cdk.Outputs;
-import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
+import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ValidatorModel;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,7 +21,7 @@
*/
package org.richfaces.cdk.templatecompiler;
-import org.richfaces.builder.model.MethodBodyStatementsContainer;
+import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatementsContainer;
/**
* @author Nick Belaevski
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,7 +21,7 @@
*/
package org.richfaces.cdk.templatecompiler;
-import org.richfaces.builder.model.MethodBodyStatement;
+import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatement;
/**
* @author Nick Belaevski
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,7 +21,7 @@
*/
package org.richfaces.cdk.templatecompiler;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.Type;
/**
* @author Nick Belaevski
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfStatement.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfStatement.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfStatement.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,7 +21,7 @@
*/
package org.richfaces.cdk.templatecompiler;
-import org.richfaces.builder.model.MethodBodyStatementsContainer;
+import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatementsContainer;
public final class IfStatement extends MethodBodyStatementsContainer {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -1,6 +1,6 @@
package org.richfaces.cdk.templatecompiler;
-import org.richfaces.builder.model.MethodBodyStatement;
+import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatement;
import freemarker.ext.beans.BeansWrapper;
import freemarker.template.ObjectWrapper;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -23,7 +23,7 @@
package org.richfaces.cdk.templatecompiler;
-import org.richfaces.builder.model.MethodBodyStatement;
+import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatement;
import freemarker.ext.beans.BeanModel;
import freemarker.template.TemplateModel;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -25,7 +25,7 @@
import com.google.inject.Inject;
import freemarker.template.TemplateException;
-import org.richfaces.builder.model.JavaClass;
+import org.richfaces.cdk.templatecompiler.builder.model.JavaClass;
import org.richfaces.cdk.*;
import org.richfaces.cdk.model.*;
import org.richfaces.cdk.model.RendererModel.Type;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -27,13 +27,13 @@
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
-import org.richfaces.builder.model.Argument;
-import org.richfaces.builder.model.JavaClass;
-import org.richfaces.builder.model.JavaField;
-import org.richfaces.builder.model.JavaMethod;
-import org.richfaces.builder.model.JavaModifier;
-import org.richfaces.builder.model.MethodBody;
-import org.richfaces.builder.model.MethodBodyStatementsContainer;
+import org.richfaces.cdk.templatecompiler.builder.model.Argument;
+import org.richfaces.cdk.templatecompiler.builder.model.JavaClass;
+import org.richfaces.cdk.templatecompiler.builder.model.JavaField;
+import org.richfaces.cdk.templatecompiler.builder.model.JavaMethod;
+import org.richfaces.cdk.templatecompiler.builder.model.JavaModifier;
+import org.richfaces.cdk.templatecompiler.builder.model.MethodBody;
+import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatementsContainer;
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.Logger;
import org.richfaces.cdk.attributes.Attribute;
@@ -42,12 +42,12 @@
import org.richfaces.cdk.attributes.SchemaSet;
import org.richfaces.cdk.model.EventName;
import org.richfaces.cdk.model.PropertyBase;
-import org.richfaces.cdk.parser.el.ELParserUtils;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.HelperMethod;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELParserUtils;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.HelperMethod;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
import static org.richfaces.cdk.templatecompiler.QNameComparator.QNAME_COMPARATOR;
import org.richfaces.cdk.templatecompiler.model.AnyElement;
import org.richfaces.cdk.templatecompiler.model.CdkBodyElement;
Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model (from rev 16644, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model)
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/Argument.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/Argument.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/Argument.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
* Representation of method argument
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/ClassImport.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ClassImport.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/ClassImport.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
* @author Maksim Kaszynski
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaAnnotation.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaAnnotation.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaAnnotation.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import java.util.ArrayList;
import java.util.Arrays;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaClass.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaClass.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaClass.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import java.util.ArrayList;
import java.util.Comparator;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaComment.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaComment.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
* Java comment representation
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaConstructor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaConstructor.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaConstructor.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
* Constructor method
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaField.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaField.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaField.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaImport.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaImport.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaImport.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
* @author Maksim Kaszynski
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaLanguageElement.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaLanguageElement.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaLanguageElement.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import java.util.ArrayList;
import java.util.List;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaMethod.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import java.util.ArrayList;
import java.util.Arrays;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaModifier.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaModifier.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaModifier.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
* @author Maksim Kaszynski
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPackage.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPackage.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPackage.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
* @author Maksim Kaszynski
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPrimitive.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPrimitive.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPrimitive.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import java.util.HashMap;
import java.util.Map;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBody.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBody.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import java.util.HashSet;
import java.util.Set;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatement.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatement.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatement.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import org.richfaces.cdk.templatecompiler.FreeMarkerRenderer;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementImpl.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementImpl.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementImpl.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import org.richfaces.cdk.templatecompiler.FreeMarkerRenderer;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementsContainer.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementsContainer.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
import java.util.ArrayList;
import java.util.List;
@@ -59,7 +59,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.builder.model.MethodBodyStatement#getCode()
+ * @see org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatement#getCode()
*/
@Override
public String getCode(FreeMarkerRenderer renderer) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/RuntimeImport.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/RuntimeImport.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/RuntimeImport.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.builder.model;
+package org.richfaces.cdk.templatecompiler.builder.model;
/**
* Implementation of import taht cannot be resolved in design time
Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el (from rev 16644, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el)
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELNodeConstants.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELNodeConstants.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el;
+package org.richfaces.cdk.templatecompiler.el;
public final class ELNodeConstants {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELParserUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELParserUtils.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el;
+package org.richfaces.cdk.templatecompiler.el;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
@@ -70,29 +70,29 @@
import org.jboss.el.parser.AstTrue;
import org.jboss.el.parser.AstValue;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.node.AstBracketSuffixTreeNode;
-import org.richfaces.cdk.parser.el.node.AstChoiceTreeNode;
-import org.richfaces.cdk.parser.el.node.AstDeferredOrDynamicExpressionTreeNode;
-import org.richfaces.cdk.parser.el.node.AstEmptyTreeNode;
-import org.richfaces.cdk.parser.el.node.AstFloatingPointTreeNode;
-import org.richfaces.cdk.parser.el.node.AstFunctionTreeNode;
-import org.richfaces.cdk.parser.el.node.AstIdentifierTreeNode;
-import org.richfaces.cdk.parser.el.node.AstIntegerTreeNode;
-import org.richfaces.cdk.parser.el.node.AstLiteralTreeNode;
-import org.richfaces.cdk.parser.el.node.AstMethodSuffixTreeNode;
-import org.richfaces.cdk.parser.el.node.AstNegativeTreeNode;
-import org.richfaces.cdk.parser.el.node.AstNotTreeNode;
-import org.richfaces.cdk.parser.el.node.AstPropertySuffixTreeNode;
-import org.richfaces.cdk.parser.el.node.AstStringTreeNode;
-import org.richfaces.cdk.parser.el.node.AstValueTreeNode;
-import org.richfaces.cdk.parser.el.node.BinaryArithmeticIntegerOperationTreeNode;
-import org.richfaces.cdk.parser.el.node.BinaryArithmeticOperationTreeNode;
-import org.richfaces.cdk.parser.el.node.BinaryBooleanOperationTreeNode;
-import org.richfaces.cdk.parser.el.node.BinaryBooleanResultOperationTreeNode;
-import org.richfaces.cdk.parser.el.node.ConstantValueTreeNode;
-import org.richfaces.cdk.parser.el.node.EqualityTestTreeNode;
-import org.richfaces.cdk.parser.el.node.ITreeNode;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.node.AstBracketSuffixTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstChoiceTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstDeferredOrDynamicExpressionTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstEmptyTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstFloatingPointTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstFunctionTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstIdentifierTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstIntegerTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstLiteralTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstMethodSuffixTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstNegativeTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstNotTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstPropertySuffixTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstStringTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.AstValueTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.BinaryArithmeticIntegerOperationTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.BinaryArithmeticOperationTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.BinaryBooleanOperationTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.BinaryBooleanResultOperationTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.ConstantValueTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.EqualityTestTreeNode;
+import org.richfaces.cdk.templatecompiler.el.node.ITreeNode;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* Class, that encapsulate all functionality, related to Reflection calls, such as loading classes, get property
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELVisitor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELVisitor.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el;
+package org.richfaces.cdk.templatecompiler.el;
-import static org.richfaces.cdk.parser.el.HelperMethod.TO_STRING_CONVERSION;
+import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_STRING_CONVERSION;
import static org.richfaces.cdk.util.JavaUtils.getEscapedString;
import java.text.MessageFormat;
@@ -32,8 +32,8 @@
import org.jboss.el.parser.AstCompositeExpression;
import org.jboss.el.parser.ELParser;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.node.ITreeNode;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.node.ITreeNode;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* Entry point for parsing EL expressions. @see parse() method.
*
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/HelperMethod.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,12 +19,12 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el;
+package org.richfaces.cdk.templatecompiler.el;
-import static org.richfaces.cdk.parser.el.ELNodeConstants.CONVERT_TO_BOOLEAN_FUNCTION;
-import static org.richfaces.cdk.parser.el.ELNodeConstants.CONVERT_TO_STRING_FUNCTION;
-import static org.richfaces.cdk.parser.el.ELNodeConstants.IS_EMPTY_FUNCTION;
-import static org.richfaces.cdk.parser.el.ELNodeConstants.IS_EQUAL_FUNCTION;
+import static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.CONVERT_TO_BOOLEAN_FUNCTION;
+import static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.CONVERT_TO_STRING_FUNCTION;
+import static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.IS_EMPTY_FUNCTION;
+import static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.IS_EQUAL_FUNCTION;
import java.util.EnumSet;
import java.util.Set;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ParsingException.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ParsingException.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ParsingException.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el;
+package org.richfaces.cdk.templatecompiler.el;
/**
* Parsing Exception
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/Type.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/Type.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/Type.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el;
+package org.richfaces.cdk.templatecompiler.el;
import java.util.Collection;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractBinaryOperationTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBinaryOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractBinaryOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,13 +19,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
/**
* <p>
@@ -55,8 +55,8 @@
/*
* (non-Javadoc)
*
- * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map,
- * org.richfaces.cdk.parser.el.ELVisitor)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map,
+ * org.richfaces.cdk.templatecompiler.el.ELVisitor)
*/
@Override
public void visit(StringBuilder sb, ELVisitor visitor) throws ParsingException {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractMethodTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractMethodTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,18 +19,18 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import java.util.ArrayList;
import java.util.List;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELParserUtils;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELParserUtils;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* @author Nick Belaevski
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELParserUtils;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELParserUtils;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This abstract class implement some methods of ITreeNode interface to using in subclasses.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstBracketSuffixTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstBracketSuffixTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This class extend AbstractTreeNode and wrap AstBracketSuffix node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstChoiceTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstChoiceTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,14 +21,14 @@
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
/**
* This class extend AbstractTreeNode and wrap AstChoice node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstDeferredOrDynamicExpressionTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,16 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
-import static org.richfaces.cdk.parser.el.HelperMethod.TO_STRING_CONVERSION;
+import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_STRING_CONVERSION;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This class extend AbstractTreeNode and wrap AstDeferredExpression node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstEmptyTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstEmptyTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,15 +21,15 @@
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
-import static org.richfaces.cdk.parser.el.HelperMethod.EMPTINESS_CHECK;
+import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EMPTINESS_CHECK;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This class extend AbstractTreeNode and wrap AstEmpty node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFloatingPointTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFloatingPointTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,14 +21,14 @@
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This class extend AbstractTreeNode and wrap AstFloatingPoint node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFunctionTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFunctionTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.AstFunction;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
import org.richfaces.cdk.util.Strings;
/**
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIdentifierTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIdentifierTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,13 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
/**
* This class extend AbstractTreeNode and wrap AstIdentifier node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIntegerTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIntegerTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,13 +21,13 @@
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This class extend AbstractTreeNode and wrap AstInteger node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstLiteralTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstLiteralTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,14 +21,14 @@
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
import static org.richfaces.cdk.util.JavaUtils.getEscapedString;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This class extend AbstractTreeNode and wrap AstLiteral node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstMethodSuffixTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstMethodSuffixTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
/**
* This class extend AbstractTreeNode and wrap AstMethodSuffix node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNegativeTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNegativeTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,13 +21,13 @@
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
/**
* This class extend AbstractTreeNode and wrap AstNegative node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,13 +21,13 @@
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
/**
* This class extend AbstractTreeNode and wrap AstNot node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstPropertySuffixTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstPropertySuffixTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,18 +19,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELParserUtils;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELParserUtils;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This class extend AbstractTreeNode and wrap AstPropertySuffix node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstStringTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstStringTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -21,15 +21,15 @@
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.AstString;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
import static org.richfaces.cdk.util.JavaUtils.getEscapedString;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* This class extend AbstractTreeNode and wrap AstString node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstValueTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstValueTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
/**
* This class extend AbstractTreeNode and wrap AstValue node.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticIntegerOperationTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticIntegerOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticIntegerOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,14 +19,14 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* @author Nick Belaevski
@@ -43,7 +43,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type)
*/
@Override
protected Type getOperationType(Type firstArgumentType,
@@ -52,7 +52,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getCoercedChildOutput(int, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getCoercedChildOutput(int, java.util.Map, org.richfaces.cdk.templatecompiler.el.ELVisitor)
*/
@Override
protected String getCoercedChildOutput(int childIndex, ELVisitor visitor)
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticOperationTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,13 +19,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* @author Nick Belaevski
@@ -42,7 +42,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type)
*/
@Override
protected Type getOperationType(Type firstArgumentType,
@@ -60,7 +60,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getCoercedChildOutput(int, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getCoercedChildOutput(int, java.util.Map, org.richfaces.cdk.templatecompiler.el.ELVisitor)
*/
@Override
protected String getCoercedChildOutput(int childIndex, ELVisitor visitor)
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanOperationTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryBooleanOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,13 +19,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* @author Nick Belaevski
@@ -42,7 +42,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type)
*/
@Override
protected Type getOperationType(Type firstArgumentType,
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanResultOperationTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryBooleanResultOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanResultOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,13 +19,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* @author Nick Belaevski
@@ -42,7 +42,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type)
*/
@Override
protected Type getOperationType(Type firstArgumentType,
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ConstantValueTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ConstantValueTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,14 +19,14 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* @author Nick Belaevski
@@ -58,8 +58,8 @@
/*
* (non-Javadoc)
*
- * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map,
- * org.richfaces.cdk.parser.el.ELVisitor)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map,
+ * org.richfaces.cdk.templatecompiler.el.ELVisitor)
*/
@Override
public void visit(StringBuilder sb, ELVisitor visitor) throws ParsingException {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/EqualityTestTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,16 +19,16 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
-import static org.richfaces.cdk.parser.el.HelperMethod.EQUALS_CHECK;
+import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EQUALS_CHECK;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELNodeConstants;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* @author Nick Belaevski
@@ -72,7 +72,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor)
+ * @see org.richfaces.cdk.templatecompiler.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.templatecompiler.el.ELVisitor)
*/
@Override
public void visit(StringBuilder sb, ELVisitor visitor) throws ParsingException {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ITreeNode.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ITreeNode.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.node;
+package org.richfaces.cdk.templatecompiler.el.node;
import org.jboss.el.parser.Node;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
/**
* Interface for all wrappers of org.jboss.el.parser.Node class.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ComplexType.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,17 +19,17 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.types;
+package org.richfaces.cdk.templatecompiler.el.types;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.util.ArrayUtils;
+
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.util.ArrayUtils;
-
/**
* @author Nick Belaevski
*
@@ -54,7 +54,7 @@
/*
* (non-Javadoc)
*
- * @see org.richfaces.cdk.parser.el.Type#getImportsList()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getImportsList()
*/
@Override
public Collection<Class<?>> getImportsList() {
@@ -71,7 +71,7 @@
/*
* (non-Javadoc)
*
- * @see org.richfaces.cdk.parser.el.Type#isNullType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isNullType()
*/
@Override
public boolean isNullType() {
@@ -81,7 +81,7 @@
/*
* (non-Javadoc)
*
- * @see org.richfaces.cdk.parser.el.Type#getTypeArguments()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getTypeArguments()
*/
@Override
public Type[] getTypeArguments() {
@@ -104,7 +104,7 @@
/*
* (non-Javadoc)
*
- * @see org.richfaces.cdk.parser.el.Type#getCode()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getCode()
*/
@Override
public String getCode() {
@@ -178,7 +178,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getRawType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getRawType()
*/
@Override
public Class<?> getRawType() {
@@ -199,7 +199,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isArray()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isArray()
*/
@Override
public boolean isArray() {
@@ -207,7 +207,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type)
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isAssignableFrom(org.richfaces.cdk.templatecompiler.el.Type)
*/
@Override
public boolean isAssignableFrom(Type anotherType) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/NullType.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/NullType.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,12 +19,12 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.types;
+package org.richfaces.cdk.templatecompiler.el.types;
import java.util.Collection;
import java.util.Collections;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.Type;
/**
* @author Nick Belaevski
@@ -42,7 +42,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getCode()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getCode()
*/
@Override
public String getCode() {
@@ -50,7 +50,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getImportsIterator()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getImportsIterator()
*/
@Override
public Collection<Class<?>> getImportsList() {
@@ -58,7 +58,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isNullType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isNullType()
*/
@Override
public boolean isNullType() {
@@ -66,7 +66,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getRawType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getRawType()
*/
@Override
public Class<?> getRawType() {
@@ -74,7 +74,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getTypeArguments()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getTypeArguments()
*/
@Override
public Type[] getTypeArguments() {
@@ -90,7 +90,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getContainerType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getContainerType()
*/
@Override
public Type getContainerType() {
@@ -98,7 +98,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isArray()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isArray()
*/
@Override
public boolean isArray() {
@@ -106,7 +106,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type)
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isAssignableFrom(org.richfaces.cdk.templatecompiler.el.Type)
*/
@Override
public boolean isAssignableFrom(Type anotherType) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/PlainClassType.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/PlainClassType.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/PlainClassType.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,13 +19,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.types;
+package org.richfaces.cdk.templatecompiler.el.types;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Collection;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.Type;
/**
* @author Nick Belaevski
@@ -46,7 +46,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getCode()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getCode()
*/
@Override
public String getCode() {
@@ -54,7 +54,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getImportsIterator()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getImportsIterator()
*/
@Override
public Collection<Class<?>> getImportsList() {
@@ -62,7 +62,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isNullType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isNullType()
*/
@Override
public boolean isNullType() {
@@ -70,7 +70,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getRawType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getRawType()
*/
@Override
public Class<?> getRawType() {
@@ -78,7 +78,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getTypeArguments()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getTypeArguments()
*/
@Override
public Type[] getTypeArguments() {
@@ -130,7 +130,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getCompositeType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getCompositeType()
*/
@Override
public Type getContainerType() {
@@ -138,7 +138,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isArray()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isArray()
*/
@Override
public boolean isArray() {
@@ -146,7 +146,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type)
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isAssignableFrom(org.richfaces.cdk.templatecompiler.el.Type)
*/
@Override
public boolean isAssignableFrom(Type anotherType) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ReferencedType.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ReferencedType.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,13 +19,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.types;
+package org.richfaces.cdk.templatecompiler.el.types;
import java.text.MessageFormat;
import java.util.Collection;
import java.util.Collections;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.Type;
/**
* @author Nick Belaevski
@@ -46,7 +46,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getCode()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getCode()
*/
@Override
public String getCode() {
@@ -54,7 +54,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getImportsList()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getImportsList()
*/
@Override
public Collection<Class<?>> getImportsList() {
@@ -62,7 +62,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getRawType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getRawType()
*/
@Override
public Class<?> getRawType() {
@@ -70,7 +70,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isNullType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isNullType()
*/
@Override
public boolean isNullType() {
@@ -78,7 +78,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getTypeArguments()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getTypeArguments()
*/
@Override
public Type[] getTypeArguments() {
@@ -130,7 +130,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#getCompositeType()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#getCompositeType()
*/
@Override
public Type getContainerType() {
@@ -138,7 +138,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isArray()
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isArray()
*/
@Override
public boolean isArray() {
@@ -146,7 +146,7 @@
}
/* (non-Javadoc)
- * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type)
+ * @see org.richfaces.cdk.templatecompiler.el.Type#isAssignableFrom(org.richfaces.cdk.templatecompiler.el.Type)
*/
@Override
public boolean isAssignableFrom(Type anotherType) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/TypesFactory.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/TypesFactory.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.types;
+package org.richfaces.cdk.templatecompiler.el.types;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
@@ -43,7 +43,7 @@
import org.richfaces.cdk.JavaLogger;
import org.richfaces.cdk.Logger;
-import org.richfaces.cdk.parser.el.Type;
+import org.richfaces.cdk.templatecompiler.el.Type;
import org.richfaces.cdk.util.ArrayUtils;
/**
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -32,8 +32,8 @@
import org.richfaces.cdk.Mock;
import org.richfaces.cdk.Output;
import org.richfaces.cdk.Outputs;
-import org.richfaces.cdk.freemarker.CdkConfiguration;
-import org.richfaces.cdk.freemarker.LibraryModelWrapper;
+import org.richfaces.cdk.generate.freemarker.CdkConfiguration;
+import org.richfaces.cdk.generate.freemarker.LibraryModelWrapper;
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.EventName;
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -31,7 +31,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.richfaces.cdk.CdkTestRunner;
-import org.richfaces.cdk.freemarker.PropertyModel;
+import org.richfaces.cdk.generate.freemarker.PropertyModel;
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConverterModel;
Copied: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test (from rev 16644, root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test)
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.test;
+package org.richfaces.cdk.templatecompiler.parser.el.test;
import java.util.ArrayList;
import java.util.HashMap;
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean2.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean2.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean2.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.test;
+package org.richfaces.cdk.templatecompiler.parser.el.test;
public class Bean2 {
private String string;
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/ELParserTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/ELParserTest.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,29 +19,28 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.test;
+package org.richfaces.cdk.templatecompiler.parser.el.test;
+import org.junit.After;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.richfaces.cdk.parser.el.HelperMethod.EMPTINESS_CHECK;
-import static org.richfaces.cdk.parser.el.HelperMethod.EQUALS_CHECK;
-import static org.richfaces.cdk.parser.el.HelperMethod.TO_BOOLEAN_CONVERSION;
-import static org.richfaces.cdk.parser.el.HelperMethod.TO_STRING_CONVERSION;
+import org.junit.Before;
+import org.junit.Test;
+import org.richfaces.cdk.templatecompiler.el.ELVisitor;
+import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EMPTINESS_CHECK;
+import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EQUALS_CHECK;
+import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_BOOLEAN_CONVERSION;
+import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_STRING_CONVERSION;
+import org.richfaces.cdk.templatecompiler.el.ParsingException;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.richfaces.cdk.parser.el.ELVisitor;
-import org.richfaces.cdk.parser.el.ParsingException;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
-
public class ELParserTest {
private ELVisitor visitor;
@@ -625,7 +624,7 @@
private void parseExpression(String expression, Class<?> returnType) throws ParsingException {
Map<String, Type> contextMap = new HashMap<String, Type>();
- contextMap.put("action", TypesFactory.getType(org.richfaces.cdk.parser.el.test.Bean.class));
+ contextMap.put("action", TypesFactory.getType(org.richfaces.cdk.templatecompiler.parser.el.test.Bean.class));
contextMap.put("clientId", TypesFactory.getType(String.class));
contextMap.put("test", TypesFactory.getType(boolean.class));
contextMap.put("otherTest", TypesFactory.getType(boolean.class));
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/TypesFactoryTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypesFactoryTest.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/TypesFactoryTest.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.richfaces.cdk.parser.el.test;
+package org.richfaces.cdk.templatecompiler.parser.el.test;
import static org.junit.Assert.*;
@@ -28,8 +28,8 @@
import java.util.Map;
import org.junit.Test;
-import org.richfaces.cdk.parser.el.Type;
-import org.richfaces.cdk.parser.el.types.TypesFactory;
+import org.richfaces.cdk.templatecompiler.el.Type;
+import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
/**
* @author Nick Belaevski
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/UIComponent.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/UIComponent.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/UIComponent.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.richfaces.cdk.parser.el.test;
+package org.richfaces.cdk.templatecompiler.parser.el.test;
public class UIComponent {
private boolean rendered;
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-03-20 00:14:21 UTC (rev 16644)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-03-22 11:44:47 UTC (rev 16645)
@@ -28,7 +28,7 @@
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import org.richfaces.PartialStateHolderHelper;
-import org.richfaces.cdk.freemarker.PropertyModel;
+import org.richfaces.cdk.generate.freemarker.PropertyModel;
/**
*
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16644 - in root/cdk/trunk/plugins/generator: src/main/java/org/richfaces/cdk/apt and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2010-03-19 20:14:21 -0400 (Fri, 19 Mar 2010)
New Revision: 16644
Modified:
root/cdk/trunk/plugins/generator/pom.xml
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java
Log:
CODING IN PROGRESS - issue RF-8523: Refactor CDK annotations
https://jira.jboss.org/jira/browse/RF-8523
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/pom.xml 2010-03-20 00:14:21 UTC (rev 16644)
@@ -109,7 +109,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.6</version>
+ <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -26,6 +26,7 @@
import org.richfaces.cdk.CdkProcessingException;
import org.richfaces.cdk.annotations.JsfBehavior;
import org.richfaces.cdk.model.BehaviorModel;
+import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.FacesId;
import javax.annotation.processing.SupportedAnnotationTypes;
@@ -41,17 +42,17 @@
public class BehaviorProcessor extends ProcessorBase implements CdkAnnotationProcessor {
@Override
- public void process(TypeElement element) throws CdkProcessingException {
+ public void process(TypeElement element, ComponentLibrary library) throws CdkProcessingException {
JsfBehavior behavior = element.getAnnotation(JsfBehavior.class);
BehaviorModel behaviorModel = new BehaviorModel(new FacesId(behavior.id()));
- setClassNames(element, behaviorModel, behavior);
+ setClassNames(element, behaviorModel, behavior.generate());
setTagInfo(behavior.tag(), behaviorModel);
processAttributes(element, behaviorModel);
setDescription(behaviorModel, behavior.icon(), getDocComment(element), behavior.displayName());
- getLibrary().getBehaviors().add(behaviorModel);
+ library.getBehaviors().add(behaviorModel);
}
@Override
@@ -59,10 +60,6 @@
return JsfBehavior.class;
}
- public void setClassNames(TypeElement element, BehaviorModel behaviorModel, JsfBehavior behavior) {
- String baseClass = element.getQualifiedName().toString();
- setClassNames(element, behaviorModel, behavior.generate(), baseClass);
- }
@Override
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -24,6 +24,7 @@
package org.richfaces.cdk.apt;
import org.richfaces.cdk.CdkProcessingException;
+import org.richfaces.cdk.model.ComponentLibrary;
import javax.lang.model.element.TypeElement;
import java.lang.annotation.Annotation;
@@ -39,9 +40,10 @@
/**
* <p class="changed_added_4_0"></p>
* @param element
+ * @param library TODO
* @throws CdkProcessingException
*/
- public void process(TypeElement element) throws CdkProcessingException;
+ public void process(TypeElement element, ComponentLibrary library) throws CdkProcessingException;
public Class<? extends Annotation> getProcessedAnnotation();
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -29,6 +29,7 @@
import org.richfaces.cdk.Logger;
import org.richfaces.cdk.ModelBuilder;
import org.richfaces.cdk.ModelValidator;
+import org.richfaces.cdk.model.ComponentLibrary;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.ProcessingEnvironment;
@@ -59,7 +60,11 @@
@Inject
private Set<CdkAnnotationProcessor> processors;
+ // TODO - set library as parameter.
@Inject
+ private ComponentLibrary library;
+
+ @Inject
private Set<ModelBuilder> builders;
@Inject
@@ -103,7 +108,7 @@
for (Element element : annotatedWith) {
if (ElementKind.CLASS.equals(element.getKind())) {
try {
- processor.process((TypeElement) element);
+ processor.process((TypeElement) element, library);
} catch (CdkProcessingException e) {
sendError(element, e);
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -25,8 +25,14 @@
package org.richfaces.cdk.apt;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.MirroredTypeException;
+import javax.lang.model.type.MirroredTypesException;
+import javax.lang.model.type.TypeMirror;
+
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.annotations.Event;
import org.richfaces.cdk.annotations.Facet;
@@ -40,13 +46,7 @@
import org.richfaces.cdk.model.FacetModel;
import org.richfaces.cdk.util.Strings;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.MirroredTypeException;
-import javax.lang.model.type.MirroredTypesException;
-import javax.lang.model.type.TypeMirror;
-import java.lang.annotation.Annotation;
-import java.util.Set;
+import com.google.inject.Inject;
/**
* <p class="changed_added_4_0">That class process component-related annotations such as {@link org.richfaces.cdk.annotations.JsfComponent} or
@@ -56,22 +56,19 @@
* @author asmirnov(a)exadel.com
*
*/
-@SupportedAnnotationTypes({"javax.faces.component.FacesComponent", JsfComponent.NAME})
public class ComponentProcessor extends ProcessorBase implements CdkAnnotationProcessor {
+ public static final String COMPONENT_FAMILY = "COMPONENT_FAMILY";
@Inject
- private Injector injector;
+ private RendererProcessor rendererProcessor;
- public void process(TypeElement componentElement) {
+ public void process(TypeElement componentElement, ComponentLibrary library) {
JsfComponent annotation = componentElement.getAnnotation(JsfComponent.class);
if (null != annotation) {
- ComponentLibrary library = getLibrary();
// Process class-level annotations.
ComponentModel component = new ComponentModel();
- component.setType(FacesId.parseId(annotation.type()));
// Should that component be generated ?
- String baseClass = componentElement.getQualifiedName().toString();
- setClassNames(componentElement, component, annotation.generate(), baseClass);
+ setClassNames(componentElement, component, annotation.generate());
setComponentProperties(componentElement, component, annotation);
for (Tag tag : annotation.tag()) {
setTagInfo(tag, component);
@@ -82,18 +79,19 @@
private void setComponentProperties(TypeElement componentElement, ComponentModel component, JsfComponent annotation)
throws CdkException {
+ // type
+ component.setType(FacesId.parseId(annotation.type()));
// JsfComponent family
- setComponeneFamily(componentElement, component);
+ setComponeneFamily(componentElement, component, annotation.family());
setDescription(component, annotation.icon(), getDocComment(componentElement), annotation.displayName());
- processFacets(componentElement, component);
+ processFacets(componentElement, component, annotation);
// process Events.
- setEvents(componentElement, component);
+ setEvents(componentElement, component, annotation);
- RendererProcessor rendererProcessor = injector.getInstance(RendererProcessor.class);
- JsfComponent componentAnnotation = componentElement.getAnnotation(JsfComponent.class);
- JsfRenderer renderer = componentAnnotation.renderer();
+ // TODO Use @Inject directly, componentElement is wrong here.
+ JsfRenderer renderer = annotation.renderer();
rendererProcessor.process(componentElement, renderer);
// TODO - process @Test annotations.
@@ -101,7 +99,7 @@
processAttributes(componentElement, component);
}
- private void processFacets(TypeElement componentElement, ComponentModel component) {
+ final void processFacets(TypeElement componentElement, ComponentModel component, JsfComponent annotation) {
SourceUtils sourceUtils = getSourceUtils();
Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, asClassDesctiption(componentElement));
@@ -120,10 +118,10 @@
}
// @Facets annotation.
- JsfComponent annotation = componentElement.getAnnotation(JsfComponent.class);
for (Facet facet : annotation.facets()) {
- if (!Strings.isEmpty(facet.name())) {
- FacetModel facetModel = component.getOrCreateFacet(facet.name());
+ String name = facet.name();
+ if (!Strings.isEmpty(name)) {
+ FacetModel facetModel = component.getOrCreateFacet(name);
processFacet(facet, facetModel);
} else {
// TODO - record error.
@@ -132,22 +130,21 @@
}
}
- private void processFacet(Facet facet, FacetModel facetModel) {
+ final void processFacet(Facet facet, FacetModel facetModel) {
setIcon(facetModel, facet.icon());
facetModel.setDisplayname(facet.displayName());
// Flags.
facetModel.setGenerate(facet.generate());
}
- private void setComponeneFamily(TypeElement componentElement, ComponentModel component) {
- JsfComponent annotation = componentElement.getAnnotation(JsfComponent.class);
+ final void setComponeneFamily(TypeElement componentElement, ComponentModel component, String family) {
- if (!Strings.isEmpty(annotation.family())) {
+ if (!Strings.isEmpty(family)) {
// @Family annotation
- component.setFamily(annotation.family());
+ component.setFamily(family);
} else {
// static final COMPONENT_FAMILY string constant.
- Object value = getSourceUtils().getConstant(asClassDesctiption(componentElement), "COMPONENT_FAMILY");
+ Object value = getSourceUtils().getConstant(asClassDesctiption(componentElement), COMPONENT_FAMILY);
if (null != value) {
component.setFamily(value.toString());
}
@@ -155,8 +152,8 @@
}
- private void setEvents(TypeElement componentElement, ComponentModel component) {
- Event[] fires = componentElement.getAnnotation(JsfComponent.class).fires();
+ final void setEvents(TypeElement componentElement, ComponentModel component, JsfComponent annotation) {
+ Event[] fires = annotation.fires();
for (Event event : fires) {
try {
@@ -174,12 +171,12 @@
}
@Override
- protected String[] getAnnotationAttributes(TypeElement componentElement) {
+ protected final String[] getAnnotationAttributes(TypeElement componentElement) {
return componentElement.getAnnotation(JsfComponent.class).attributes();
}
@Override
- public Class<? extends Annotation> getProcessedAnnotation() {
+ public final Class<? extends Annotation> getProcessedAnnotation() {
return JsfComponent.class;
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -24,6 +24,7 @@
import org.richfaces.cdk.CdkProcessingException;
import org.richfaces.cdk.annotations.JsfConverter;
import org.richfaces.cdk.model.ClassName;
+import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConverterModel;
import org.richfaces.cdk.model.FacesId;
@@ -40,7 +41,7 @@
public class ConverterProcessor extends ProcessorBase implements CdkAnnotationProcessor {
@Override
- public void process(TypeElement element) throws CdkProcessingException {
+ public void process(TypeElement element, ComponentLibrary library) throws CdkProcessingException {
JsfConverter converter = element.getAnnotation(JsfConverter.class);
ConverterModel converterModel = new ConverterModel();
@@ -61,11 +62,11 @@
setDescription(converterModel, converter.icon(), getDocComment(element), converter.displayName());
processAttributes(element, converterModel);
- setClassNames(element, converterModel, converter);
+ setClassNames(element, converterModel, converter.generate());
setTagInfo(converter.tag(), converterModel);
- getLibrary().getConverters().add(converterModel);
+ library.getConverters().add(converterModel);
}
@Override
@@ -73,13 +74,7 @@
return JsfConverter.class;
}
- // TODO same method in the ValidatorProcessor move their in one class
- public void setClassNames(TypeElement componentElement, ConverterModel converterModel, JsfConverter converter) {
- String baseClass = componentElement.getQualifiedName().toString();
- setClassNames(componentElement, converterModel, converter.generate(), baseClass);
- }
-
protected String[] getAnnotationAttributes(TypeElement element) {
JsfConverter converter = element.getAnnotation(JsfConverter.class);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -1,10 +1,16 @@
package org.richfaces.cdk.apt;
-import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.MirroredTypeException;
+import javax.lang.model.type.MirroredTypesException;
+import javax.lang.model.type.TypeMirror;
+
import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.NamingConventions;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.Icon;
@@ -14,7 +20,6 @@
import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor;
import org.richfaces.cdk.model.BeanModelBase;
import org.richfaces.cdk.model.ClassName;
-import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.DescriptionGroup;
import org.richfaces.cdk.model.ModelElementBase;
import org.richfaces.cdk.model.PropertyBase;
@@ -23,14 +28,9 @@
import org.richfaces.cdk.xmlconfig.CdkEntityResolver;
import org.richfaces.cdk.xmlconfig.FragmentParser;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.MirroredTypeException;
-import javax.lang.model.type.MirroredTypesException;
-import javax.lang.model.type.TypeMirror;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import com.google.common.collect.Lists;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
public abstract class ProcessorBase {
@@ -38,14 +38,10 @@
private static final String SIGNATURE_NONE_CLASS_NAME = Signature.NONE.class.getName().replace('$', '.');
- @Inject
- private ComponentLibrary library;
@Inject
private Provider<SourceUtils> sourceUtils;
- @Inject
- private NamingConventions namingConventions;
@Inject
private FragmentParser fragmentParser;
@@ -66,13 +62,6 @@
return this.sourceUtils.get();
}
- /**
- * <p class="changed_added_4_0"></p>
- * @return the namingConventions
- */
- public NamingConventions getNamingConventions() {
- return this.namingConventions;
- }
protected void setTagInfo(Tag tag, ModelElementBase model) {
@@ -95,7 +84,7 @@
* @param icon
*/
protected void setIcon(DescriptionGroup component, Icon icon) {
- if (!Strings.isEmpty(icon.small()) || !Strings.isEmpty(icon.large())) {
+ if (null != icon && (!Strings.isEmpty(icon.small()) || !Strings.isEmpty(icon.large()))) {
DescriptionGroup.Icon iconValue = new DescriptionGroup.Icon();
if (!Strings.isEmpty(icon.small())) {
@@ -110,9 +99,6 @@
}
}
- public ComponentLibrary getLibrary() {
- return library;
- }
protected void setDescription(DescriptionGroup component, Icon icon, String description, String displayName) {
@@ -129,7 +115,7 @@
}
protected void setClassNames(TypeElement componentElement, ModelElementBase modelElement,
- String generatedClass, String baseClass) {
+ String generatedClass) {
if (componentElement.getModifiers().contains(Modifier.ABSTRACT) || !Strings.isEmpty(generatedClass)) {
modelElement.setGenerate(true);
@@ -137,7 +123,7 @@
} else {
modelElement.setGenerate(false);
}
- modelElement.setBaseClass(ClassName.parseName(baseClass));
+ modelElement.setBaseClass(ClassName.parseName(componentElement.getQualifiedName().toString()));
}
protected Collection<PropertyBase> parseProperties(String attributesConfig) {
@@ -172,9 +158,18 @@
}
}
});
-
+ // Process all files from @Jsf.. attributes property.
+ for(String annotationAttributes : getAnnotationAttributes(componentElement)){
+ try {
+ component.getAttributes().addAll(
+ parseProperties(CdkEntityResolver.URN_ATTRIBUTES + annotationAttributes));
+ } catch (CdkException e) {
+ // TODO - log errors ?
+ }
+ }
ClassName componentClassName = asClassDesctiption(componentElement);
Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, componentClassName);
+ // Check all abstract properties, they should be generated. TODO - move it to the validator ???
properties.addAll(sourceUtils.getAbstractBeanProperties(componentClassName));
// TODO - encapsulate attribute builder into utility class.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -21,23 +21,22 @@
package org.richfaces.cdk.apt;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
+import java.lang.annotation.Annotation;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.faces.render.RenderKitFactory;
+import javax.lang.model.element.TypeElement;
+
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.annotations.Family;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.model.ClassName;
+import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.RendererModel;
-import org.richfaces.cdk.templatecompiler.RendererTemplateParser;
import org.richfaces.cdk.util.Strings;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.faces.render.RenderKitFactory;
-import javax.lang.model.element.TypeElement;
-import java.lang.annotation.Annotation;
-
/**
* @author akolonitsky
* @since Dec 30, 2009
@@ -45,15 +44,13 @@
@SupportedAnnotationTypes({"javax.faces.component.FacesComponent", JsfRenderer.NAME})
public class RendererProcessor extends ProcessorBase implements CdkAnnotationProcessor {
- @Inject
- private Injector injector;
- public void process(TypeElement rendererElement) {
+ public void process(TypeElement rendererElement, ComponentLibrary library) {
JsfRenderer annotation = rendererElement.getAnnotation(JsfRenderer.class);
RendererModel rendererModel = process(rendererElement, annotation);
- ComponentModel componentModel = getLibrary().getComponentModel(rendererModel.getFamily());
+ ComponentModel componentModel = library.getComponentModel(rendererModel.getFamily());
if (componentModel != null) {
componentModel.getRenderers().add(rendererModel);
} else {
@@ -82,33 +79,30 @@
private void setTemplate(RendererModel rendererModel, JsfRenderer annotation) {
String template = annotation.template();
- if (Strings.isEmpty(template)) {
- template = getNamingConventions().inferTemplate(rendererModel.getType());
+ if (!Strings.isEmpty(template)) {
+ rendererModel.setTemplatePath(template);
+ // TODO - add template to source list to process it in appropriate builder.
+ processRendererTemplate(rendererModel);
}
- rendererModel.setTemplatePath(template);
-
- processRendererTemplate(rendererModel);
}
private void processRendererTemplate(RendererModel renderer) {
- RendererTemplateParser templateParser = injector.getInstance(RendererTemplateParser.class);
+// RendererTemplateParser templateParser = injector.getInstance(RendererTemplateParser.class);
// templateParser.
}
private void setComponentFamily(RendererModel rendererModel, JsfRenderer annotation) {
String family = annotation.family();
- if (Strings.isEmpty(family)) {
- family = this.getNamingConventions().inferComponentFamily(rendererModel.getType());
+ if (!Strings.isEmpty(family)) {
+ rendererModel.setFamily(family);
}
- rendererModel.setFamily(family);
}
private void setRendererType(RendererModel rendererModel, JsfRenderer annotation) {
String type = annotation.type();
if (Strings.isEmpty(type)) {
- type = this.getNamingConventions().inferRendererTypeByRendererClass(rendererModel.getRendererClass());
+ rendererModel.setType(new RendererModel.Type(type));
}
- rendererModel.setType(new RendererModel.Type(type));
}
protected String getComponentType(TypeElement componentElement) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -98,13 +98,34 @@
public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation,
ClassName type);
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param type
+ * @return
+ */
public Set<BeanProperty> getAbstractBeanProperties(ClassName type);
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param componentElement
+ * @return
+ */
public String getDocComment(ClassName componentElement);
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param componentElement
+ * @param name
+ * @return
+ */
public Object getConstant(ClassName componentElement, String name);
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param type
+ * @param visitor
+ */
public void visitSupertypes(ClassName type, SuperTypeVisitor visitor);
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -23,6 +23,7 @@
import org.richfaces.cdk.CdkProcessingException;
import org.richfaces.cdk.annotations.JsfValidator;
+import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.FacesId;
import org.richfaces.cdk.model.ValidatorModel;
@@ -38,16 +39,16 @@
public class ValidatorProcessor extends ProcessorBase implements CdkAnnotationProcessor {
@Override
- public void process(TypeElement element) throws CdkProcessingException {
+ public void process(TypeElement element, ComponentLibrary library) throws CdkProcessingException {
JsfValidator validator = element.getAnnotation(JsfValidator.class);
ValidatorModel validatorModel = new ValidatorModel(FacesId.parseId(validator.id()));
- setClassNames(element, validatorModel, validator);
+ setClassNames(element, validatorModel, validator.generate());
setDescription(validatorModel, validator.icon(), getDocComment(element), validator.displayName());
setTagInfo(validator.tag(), validatorModel);
- getLibrary().getValidators().add(validatorModel);
+ library.getValidators().add(validatorModel);
}
@Override
@@ -55,11 +56,6 @@
return JsfValidator.class;
}
- public void setClassNames(TypeElement componentElement, ValidatorModel validatorModel,
- JsfValidator validator) {
- String baseClass = componentElement.getQualifiedName().toString();
- setClassNames(componentElement, validatorModel, validator.generate(), baseClass);
- }
protected String[] getAnnotationAttributes(TypeElement element) {
JsfValidator validator = element.getAnnotation(JsfValidator.class);
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -41,6 +41,8 @@
import javax.el.ELContext;
import javax.faces.component.UIComponent;
+import javax.lang.model.element.Name;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -51,6 +53,42 @@
*/
public abstract class AnnotationProcessorTest extends CdkTestBase {
+ protected static final class TestName implements Name {
+
+ private final String name;
+
+ public TestName(String name) {
+ this.name = name;
+ }
+ @Override
+ public boolean contentEquals(CharSequence cs) {
+ // TODO Auto-generated method stub
+ return name.equals(cs);
+ }
+
+ @Override
+ public char charAt(int index) {
+ return name.charAt(index);
+ }
+
+ @Override
+ public int length() {
+ return name.length();
+ }
+
+ @Override
+ public CharSequence subSequence(int start, int end) {
+ return name.substring(start, end);
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+ }
+
+ protected static final String FOO_BAR = "foo.Bar";
+
@Inject
@Source(Sources.JAVA_SOURCES)
protected FileManager sources;
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -111,7 +111,7 @@
expect(utils.getBeanPropertiesAnnotatedWith(eq(Attribute.class), (ClassName)anyObject())).andReturn(Collections.<BeanProperty>emptySet());
expect(utils.getDocComment((ClassName) anyObject())).andStubReturn(null);
replay(log, utils, componentElement, jaxb, conventions,behaviorAnnotation,tag,name);
- processor.process(componentElement);
+ processor.process(componentElement, library);
verify(log, utils, componentElement, jaxb, conventions,behaviorAnnotation,tag,name);
Collection<BehaviorModel> behaviors = library.getBehaviors();
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -45,6 +45,7 @@
import org.richfaces.cdk.Output;
import org.richfaces.cdk.Outputs;
import org.richfaces.cdk.Stub;
+import org.richfaces.cdk.model.ComponentLibrary;
import javax.annotation.processing.Processor;
import javax.annotation.processing.RoundEnvironment;
@@ -77,6 +78,9 @@
private FileManager output;
@Inject
+ ComponentLibrary library;
+
+ @Inject
private CdkAnnotationProcessor cdkProcessor;
@Mock
@@ -116,7 +120,7 @@
expect((Set<TypeElement>) roundEnv.getElementsAnnotatedWith(TestAnnotation2.class)).andReturn(
Collections.singleton(element));
expect(element.getKind()).andReturn(ElementKind.CLASS);
- cdkProcessor.process(element);
+ cdkProcessor.process(element, library);
expectLastCall();
validator.verify();
expectLastCall();
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -23,33 +23,35 @@
package org.richfaces.cdk.apt;
-import com.google.common.collect.Iterables;
-import com.google.inject.Inject;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import org.junit.Ignore;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.richfaces.cdk.CdkTestRunner;
import org.richfaces.cdk.Mock;
import org.richfaces.cdk.NamingConventions;
-import org.richfaces.cdk.annotations.Event;
+import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.Facet;
import org.richfaces.cdk.annotations.Icon;
import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.apt.SourceUtils.BeanProperty;
+import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor;
+import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ComponentModel;
+import org.richfaces.cdk.model.FacetModel;
import org.richfaces.cdk.model.PropertyBase;
import org.richfaces.cdk.xmlconfig.JAXB;
-import javax.lang.model.element.TypeElement;
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.Collections;
+import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
/**
* <p class="changed_added_4_0">
@@ -60,6 +62,9 @@
*/
@RunWith(CdkTestRunner.class)
public class ComponentProcessorTest extends AnnotationProcessorTest {
+ public static final String SMALL_JPG = "/icons/Small.jpg";
+ public static final String LARGE_GIF = "/icons/Large.gif";
+ private static final String FOO_HTML_BAR = "foo.HtmlBar";
private static final String COMPONENT_CLASS_JAVA = "org/richfaces/cdk/test/component/AbstractTestComponent.java";
private static final String FACES_COMPONENT_CLASS_JAVA = "org/richfaces/cdk/test/component/UITestCommand.java";
@@ -69,102 +74,209 @@
@Inject
private ComponentLibrary library;
+ @Inject
+ private ComponentModel model;
+
@Mock
private SourceUtils utils;
@Mock
private TypeElement componentElement;
+
+ @Mock
+ private JsfComponent annotation;
@Mock
private JAXB jaxb;
-
+
@Mock
- private NamingConventions conventions;
+ private BeanProperty property;
+
/**
* Test method for
* {@link org.richfaces.cdk.apt.CdkProcessor#process(java.util.Set, javax.annotation.processing.RoundEnvironment)} .
*
* @throws Exception
*/
- @Test
- @Ignore
- public void testProcess() throws Exception {
- expect(componentElement.getAnnotation(JsfComponent.class)).andReturn(new JsfComponent() {
+ @Test
+ public void testSetClassNames() throws Exception {
+ expect(componentElement.getModifiers()).andReturn(Collections.<Modifier>emptySet());
+ expect(componentElement.getQualifiedName()).andReturn(new TestName(FOO_BAR));
+ replay(log, utils, componentElement, jaxb, annotation);
+ processor.setClassNames(componentElement, model,"");
+ verify(log, utils, componentElement, jaxb,annotation );
+ assertFalse(model.isGenerate());
+ assertEquals(FOO_BAR, model.getBaseClass().toString());
+ assertNull(model.getTargetClass());
+ }
- @Override
- public Class<? extends Annotation> annotationType() {
- return JsfComponent.class;
- }
+ /**
+ * Test method for
+ * {@link org.richfaces.cdk.apt.CdkProcessor#process(java.util.Set, javax.annotation.processing.RoundEnvironment)} .
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testSetClassNames1() throws Exception {
+ expect(componentElement.getModifiers()).andReturn(Collections.<Modifier>singleton(Modifier.ABSTRACT));
+ expect(componentElement.getQualifiedName()).andReturn(new TestName(FOO_BAR));
+ replay(log, utils, componentElement, jaxb, annotation);
+ processor.setClassNames(componentElement, model,"");
+ verify(log, utils, componentElement, jaxb,annotation );
+ assertTrue(model.isGenerate());
+ assertEquals(FOO_BAR, model.getBaseClass().toString());
+ assertNull(model.getTargetClass());
+ }
+ /**
+ * Test method for
+ * {@link org.richfaces.cdk.apt.CdkProcessor#process(java.util.Set, javax.annotation.processing.RoundEnvironment)} .
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testSetClassNames2() throws Exception {
+ expect(componentElement.getModifiers()).andReturn(Collections.<Modifier>emptySet());
+ expect(componentElement.getQualifiedName()).andReturn(new TestName(FOO_BAR));
+ replay(log, utils, componentElement, jaxb, annotation);
+ processor.setClassNames(componentElement, model,FOO_HTML_BAR);
+ verify(log, utils, componentElement, jaxb,annotation );
+ assertTrue(model.isGenerate());
+ assertEquals(FOO_BAR, model.getBaseClass().toString());
+ assertEquals(FOO_HTML_BAR,model.getTargetClass().toString());
+ }
- @Override
- public String type() {
- return "foo.Bar";
- }
+ @Test
+ public void testSetFamily() throws Exception {
+ replay(log, utils, componentElement, jaxb, annotation);
+ processor.setComponeneFamily(componentElement, model,FOO_HTML_BAR);
+ verify(log, utils, componentElement, jaxb,annotation );
+ assertEquals(FOO_HTML_BAR, model.getFamily());
+ }
+
+ @Test
+ public void testSetFamily1() throws Exception {
+ TestName fooBar = new TestName(FOO_BAR);
+ expect(componentElement.getQualifiedName()).andReturn(fooBar);
+ expect(utils.getConstant(eq(ClassName.parseName(FOO_BAR)), eq(ComponentProcessor.COMPONENT_FAMILY))).andReturn(FOO_HTML_BAR);
+ replay(log, utils, componentElement, jaxb, annotation);
+ processor.setComponeneFamily(componentElement, model,"");
+ verify(log, utils, componentElement, jaxb,annotation );
+ assertEquals(FOO_HTML_BAR, model.getFamily());
+ }
- public String generate() {
- return "";
- }
+ @Test
+ public void testSetFamily2() throws Exception {
+ TestName fooBar = new TestName(FOO_BAR);
+ expect(componentElement.getQualifiedName()).andReturn(fooBar);
+ expect(utils.getConstant(eq(ClassName.parseName(FOO_BAR)), eq(ComponentProcessor.COMPONENT_FAMILY))).andReturn(null);
+ replay(log, utils, componentElement, jaxb, annotation);
+ processor.setComponeneFamily(componentElement, model,"");
+ verify(log, utils, componentElement, jaxb,annotation );
+ assertNull( model.getFamily());
+ }
- public Tag[] tag() {
- return new Tag[]{};
- }
+ @Test
+ public void testSetIcon() throws Exception {
+ Icon icon = createMock(Icon.class);
+ expect(icon.large()).andReturn(LARGE_GIF).atLeastOnce();
+ expect(icon.small()).andReturn(SMALL_JPG).atLeastOnce();
+ replay(log, utils, componentElement, jaxb, annotation,icon);
+ processor.setIcon(model, icon);
+ verify(log, utils, componentElement, jaxb,annotation,icon );
+ assertNotNull(model.getIcon());
+ assertEquals(LARGE_GIF, model.getIcon().getLargeIcon());
+ assertEquals(SMALL_JPG, model.getIcon().getSmallIcon());
+ }
- @Override
- public String[] attributes() {
- return new String[]{};
- }
+ @Test
+ public void testSetIcon1() throws Exception {
+ Icon icon = createMock(Icon.class);
+ expect(icon.large()).andReturn("").atLeastOnce();
+ expect(icon.small()).andReturn("").atLeastOnce();
+ replay(log, utils, componentElement, jaxb, annotation,icon);
+ processor.setIcon(model, icon);
+ verify(log, utils, componentElement, jaxb,annotation,icon );
+ assertNull(model.getIcon());
+ }
+
+ @Test
+ public void testProcessFacetsFromProperty() throws Exception {
+ Facet facet = createMock(Facet.class);
+ expect(componentElement.getQualifiedName()).andReturn(new TestName(FOO_BAR));
+ expect(utils.getBeanPropertiesAnnotatedWith(eq(Facet.class),eq(ClassName.parseName(FOO_BAR)))).andReturn(Collections.singleton(property));
+ expect(annotation.facets()).andReturn(new Facet[0]);
+ expect(property.getAnnotation(Facet.class)).andReturn(facet);
+ expect(property.getName()).andReturn("foo");
+ expect(property.getDocComment()).andReturn("my comment");
+ expect(property.isExists()).andReturn(true);
+ expect(facet.icon()).andReturn(null);
+ expect(facet.displayName()).andReturn("fooFacet");
+ expect(facet.generate()).andReturn(true);
+ replay(log, utils, componentElement, jaxb, annotation,property,facet);
+ processor.processFacets(componentElement, model, annotation);
+ verify(log, utils, componentElement, jaxb,annotation,property,facet);
+ assertEquals(1, model.getFacets().size());
+ FacetModel facetModel = Iterables.getOnlyElement(model.getFacets());
+ assertTrue(facetModel.isGenerate());
+ assertEquals("foo", facetModel.getName());
+ assertEquals("my comment", facetModel.getDescription());
+ assertEquals("fooFacet", facetModel.getDisplayname());
+ assertNull(facetModel.getIcon());
+ }
+ @Test
+ public void testProcessFacetsFromAnnotation() throws Exception {
+ Facet facet = createMock(Facet.class);
+ expect(componentElement.getQualifiedName()).andReturn(new TestName(FOO_BAR));
+ expect(utils.getBeanPropertiesAnnotatedWith(eq(Facet.class),eq(ClassName.parseName(FOO_BAR)))).andReturn(Collections.<BeanProperty>emptySet());
+ expect(annotation.facets()).andReturn(new Facet[]{facet});
+ expect(facet.name()).andReturn("foo");
+ expect(facet.icon()).andReturn(null);
+ expect(facet.displayName()).andReturn("fooFacet");
+ expect(facet.generate()).andReturn(true);
+ replay(log, utils, componentElement, jaxb, annotation,property,facet);
+ processor.processFacets(componentElement, model, annotation);
+ verify(log, utils, componentElement, jaxb,annotation,property,facet);
+ assertEquals(1, model.getFacets().size());
+ FacetModel facetModel = Iterables.getOnlyElement(model.getFacets());
+ assertTrue(facetModel.isGenerate());
+ assertEquals("foo", facetModel.getName());
+// assertEquals("my comment", facetModel.getDescription());
+ assertEquals("fooFacet", facetModel.getDisplayname());
+ assertNull(facetModel.getIcon());
+ }
- @Override
- public String displayName() {
- return "";
- }
-
- @Override
- public Facet[] facets() {
- return new Facet[]{};
- }
-
- @Override
- public String family() {
- return "";
- }
-
- @Override
- public Event[] fires() {
- return new Event[]{};
- }
-
- @Override
- public Icon icon() {
- return null;
- }
-
- @Override
- public JsfRenderer renderer() {
- return null;
- }
-
- @Override
- public org.richfaces.cdk.annotations.Test test() {
- return null;
- }
-
-
- });
- replay(log, utils, componentElement, jaxb, conventions);
- processor.process(componentElement);
- verify(log, utils, componentElement, jaxb, conventions);
- Collection<ComponentModel> components = library.getComponents();
-
- assertEquals(1, components.size());
-
- ComponentModel component = Iterables.get(components, 0);
- Collection<PropertyBase> attributes = component.getAttributes();
-
- assertEquals(3, attributes.size());
+ @Test
+ public void testProcessAttributesFromProperty() throws Exception {
+ Attribute attribute = createNiceMock(Attribute.class);
+ expect(componentElement.getQualifiedName()).andStubReturn(new TestName(FOO_BAR));
+ expect(componentElement.getAnnotation(JsfComponent.class)).andReturn(annotation);
+ expect(annotation.attributes()).andReturn(new String[0]);
+ utils.visitSupertypes(eq(ClassName.parseName(FOO_BAR)), (SuperTypeVisitor) anyObject());expectLastCall();
+ expect(utils.getBeanPropertiesAnnotatedWith(eq(Attribute.class),eq(ClassName.parseName(FOO_BAR)))).andReturn(Collections.singleton(property));
+ expect(utils.getAbstractBeanProperties(eq(ClassName.parseName(FOO_BAR)))).andReturn(Collections.<BeanProperty>emptySet());
+ expect(property.getName()).andReturn("foo");
+ expect(property.getType()).andReturn(ClassName.parseName("java.lang.Integer"));
+ expect(property.getAnnotation(Attribute.class)).andReturn(attribute);
+ expect(property.getDocComment()).andReturn("my comment");
+// expect(property.isExists()).andReturn(true);
+ expect(attribute.icon()).andReturn(null);
+ expect(attribute.displayName()).andReturn("fooFacet");
+ expect(attribute.generate()).andReturn(true);
+ expect(attribute.events()).andReturn(new EventName[]{});
+ replay(log, utils, componentElement, jaxb, annotation,property,attribute);
+ processor.processAttributes(componentElement, model);
+ verify(log, utils, componentElement, jaxb,annotation,property,attribute);
+ assertEquals(1, model.getAttributes().size());
+ PropertyBase propertyModel = Iterables.getOnlyElement(model.getAttributes());
+ assertTrue(propertyModel.isGenerate());
+ assertEquals("foo", propertyModel.getName());
+ assertEquals("my comment", propertyModel.getDescription());
+ assertEquals("fooFacet", propertyModel.getDisplayname());
+ assertEquals(ClassName.parseName("java.lang.Integer"), propertyModel.getType());
+ assertNull(propertyModel.getIcon());
}
-
+
@Override
protected Iterable<String> sources() {
return Collections.singleton(COMPONENT_CLASS_JAVA);
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java 2010-03-19 21:03:10 UTC (rev 16643)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java 2010-03-20 00:14:21 UTC (rev 16644)
@@ -75,7 +75,7 @@
// TODO create Test for ProcessorBase
@Test
- @Ignore
+
public void testSetNames() {
ValidatorModel model;
@@ -97,13 +97,13 @@
// /////////////////////////////// ABSTRACT ///////////////////////////////////////
// @JsfValidator public abstract class BaseClass { ...
- checkAbstractWithException(null);
+// checkAbstractWithException(null);
// @JsfValidator(validatorClass = "") public abstract class BaseClass { ...
- checkAbstractWithException("");
+// checkAbstractWithException("");
// @JsfValidator(validatorClass = BaseClass) public abstract class BaseClass { ...
- checkAbstractWithException("BaseClass");
+// checkAbstractWithException("BaseClass");
// @JsfValidator(validatorClass = GeneratedClass) public abstract class BaseClass { ...
model = getValidatorModelForSetNames(true, "GeneratedClass", "BaseClass", true);
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16643 - branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-03-19 17:03:10 -0400 (Fri, 19 Mar 2010)
New Revision: 16643
Modified:
branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
Log:
RF-8425
Modified: branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
===================================================================
--- branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2010-03-19 21:01:42 UTC (rev 16642)
+++ branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2010-03-19 21:03:10 UTC (rev 16643)
@@ -43,7 +43,6 @@
import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.RendererUtils;
-import org.ajax4jsf.renderkit.RendererUtils.ScriptHashVariableWrapper;
import org.ajax4jsf.resource.InternetResource;
import org.richfaces.component.UIToolTip;
import org.richfaces.skin.Skin;
@@ -52,6 +51,8 @@
private static final String DIRECTION_AUTO = "auto";
private static final String DIRECTION_BOTTOM_RIGHT = "bottom-right";
+ private ToolTipRenderer blockRenderer;
+ private ToolTipRenderer nonblockRenderer;
private static final String AJAX_MODE = "ajax";
@@ -391,15 +392,21 @@
}
private ToolTipRenderer getRenderer(UIToolTip toolTip) throws ClassNotFoundException, InstantiationException, IllegalAccessException{
- Class<?> rendererClass;
- if ("block".equals(toolTip.getLayout())) {
- rendererClass = Class.forName("org.richfaces.renderkit.html.HtmlToolTipRendererBlock");
- } else {
- rendererClass = Class.forName("org.richfaces.renderkit.html.HtmlToolTipRenderer");
+ synchronized (this) {
+ if ("block".equals(toolTip.getLayout())) {
+ if (blockRenderer==null){
+ blockRenderer = (ToolTipRenderer)Class.forName("org.richfaces.renderkit.html.HtmlToolTipRendererBlock").newInstance();
+ }
+ return blockRenderer;
+
+ } else {
+ if (nonblockRenderer==null){
+ nonblockRenderer = (ToolTipRenderer)Class.forName("org.richfaces.renderkit.html.HtmlToolTipRenderer").newInstance();
+ }
+ return nonblockRenderer;
+
+ }
}
-
- return (ToolTipRenderer) rendererClass.newInstance();
-
}
}
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16642 - in branches/community/3.3.X/framework/impl/src/main: resources/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-03-19 17:01:42 -0400 (Fri, 19 Mar 2010)
New Revision: 16642
Modified:
branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java
branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/component/messages.properties
Log:
RF-8463
Modified: branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java 2010-03-19 21:00:58 UTC (rev 16641)
+++ branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java 2010-03-19 21:01:42 UTC (rev 16642)
@@ -24,6 +24,7 @@
import javax.faces.application.FacesMessage;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
+import org.richfaces.component.util.ComponentMessageUtil;
import org.richfaces.component.util.MessageUtil;
Modified: branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/component/messages.properties
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/component/messages.properties 2010-03-19 21:00:58 UTC (rev 16641)
+++ branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/component/messages.properties 2010-03-19 21:01:42 UTC (rev 16642)
@@ -5,6 +5,10 @@
org.richfaces.component.UIExtendedDataTable.Menu.GroupByColumn=Group by this column
org.richfaces.component.UIExtendedDataTable.Menu.DisableGrouping=Disable Grouping
org.richfaces.component.UIExtendedDataTable.NoData=No data
+org.richfaces.component.UIRangedNumberInput.MaxMinIsNull={0}: conversation error, maxValue or minValue is null!
+org.richfaces.component.UIRangedNumberInput.ValueIsNull={0}: input value can't be null!
+org.richfaces.component.UIRangedNumberInput.LessThatMinimal={0}: input value is less than minimal value!
+org.richfaces.component.UIRangedNumberInput.GreaterThanMaximal={0}: input value is more than maximum value!
# converters
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r16641 - in branches/community/3.3.X/ui/combobox/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-03-19 17:00:58 -0400 (Fri, 19 Mar 2010)
New Revision: 16641
Modified:
branches/community/3.3.X/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx
Log:
RF-8500
Modified: branches/community/3.3.X/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- branches/community/3.3.X/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2010-03-19 20:59:38 UTC (rev 16640)
+++ branches/community/3.3.X/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2010-03-19 21:00:58 UTC (rev 16641)
@@ -104,6 +104,10 @@
return values;
}
+ public String getReadOnlyValue(Object enableManualInput){
+ return (Boolean)enableManualInput ? "readonly" : "";
+ }
+
public List<Object> encodeSuggestionValues(FacesContext context, UIComboBox combobox) throws IOException, IllegalArgumentException {
List<Object> values = new ArrayList<Object>();
Modified: branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx 2010-03-19 20:59:38 UTC (rev 16640)
+++ branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx 2010-03-19 21:00:58 UTC (rev 16641)
@@ -120,7 +120,7 @@
name="#{clientId}comboboxField"
disabled="#{disabled}"
class="#{valueStyle} rich-combobox-input-inactive #{component.attributes['inputInactiveClass']}" type="text"
- readonly="#{enableManualInput}"
+ readonly="#{this:getReadOnlyValue(enableManualInput)}"
value="#{value}"
x:onblur="#{component.attributes['onblur']}"
onfocus = "#{component.attributes['onfocus']}"
@@ -130,13 +130,13 @@
/>
<input id="#{clientId}comboBoxButtonBG"
tabindex="-1"
- readonly="true"
+ readonly="readonly"
type="text"
value=""
class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/>
<input id="#{clientId}comboboxButton"
tabindex="-1"
- readonly="true"
+ readonly="readonly"
disabled="#{disabled}"
type="text"
value=""
14 years, 1 month
- 1
- 0