JBoss Tools SVN: r12510 - branches/jbosstools-3.0.0.CR1/tptp/plugins/org.jboss.tools.eclipse.as.tptp.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-09 16:33:57 -0500 (Tue, 09 Dec 2008)
New Revision: 12510
Modified:
branches/jbosstools-3.0.0.CR1/tptp/plugins/org.jboss.tools.eclipse.as.tptp/build.properties
Log:
JBIDE-3321 Bad metadata for various features
Modified: branches/jbosstools-3.0.0.CR1/tptp/plugins/org.jboss.tools.eclipse.as.tptp/build.properties
===================================================================
--- branches/jbosstools-3.0.0.CR1/tptp/plugins/org.jboss.tools.eclipse.as.tptp/build.properties 2008-12-09 21:32:03 UTC (rev 12509)
+++ branches/jbosstools-3.0.0.CR1/tptp/plugins/org.jboss.tools.eclipse.as.tptp/build.properties 2008-12-09 21:33:57 UTC (rev 12510)
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
17 years, 4 months
JBoss Tools SVN: r12509 - trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-09 16:32:03 -0500 (Tue, 09 Dec 2008)
New Revision: 12509
Modified:
trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/build.properties
Log:
JBIDE-3321 Bad metadata for various features
Modified: trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/build.properties
===================================================================
--- trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/build.properties 2008-12-09 21:29:57 UTC (rev 12508)
+++ trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/build.properties 2008-12-09 21:32:03 UTC (rev 12509)
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
17 years, 4 months
JBoss Tools SVN: r12508 - branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-09 16:29:57 -0500 (Tue, 09 Dec 2008)
New Revision: 12508
Modified:
branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.properties
Log:
JBIDE-3321 Bad metadata for various features
Modified: branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.properties
===================================================================
--- branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.properties 2008-12-09 21:28:10 UTC (rev 12507)
+++ branches/jbosstools-3.0.0.CR1/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.properties 2008-12-09 21:29:57 UTC (rev 12508)
@@ -1 +1 @@
-providerName=Red Hat, Inc.
+providerName=JBoss, a division of Red Hat
17 years, 4 months
JBoss Tools SVN: r12507 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-09 16:28:10 -0500 (Tue, 09 Dec 2008)
New Revision: 12507
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.properties
Log:
JBIDE-3321 Bad metadata for various features
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.properties 2008-12-09 21:18:35 UTC (rev 12506)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.properties 2008-12-09 21:28:10 UTC (rev 12507)
@@ -1 +1 @@
-providerName=Red Hat, Inc.
+providerName=JBoss, a division of Red Hat
17 years, 4 months
JBoss Tools SVN: r12506 - branches/jbosstools-3.0.0.CR1/esb/plugins/org.jboss.tools.esb.project.core.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-09 16:18:35 -0500 (Tue, 09 Dec 2008)
New Revision: 12506
Modified:
branches/jbosstools-3.0.0.CR1/esb/plugins/org.jboss.tools.esb.project.core/build.properties
Log:
JBIDE-3321 Bad metadata for various features
Modified: branches/jbosstools-3.0.0.CR1/esb/plugins/org.jboss.tools.esb.project.core/build.properties
===================================================================
--- branches/jbosstools-3.0.0.CR1/esb/plugins/org.jboss.tools.esb.project.core/build.properties 2008-12-09 21:15:25 UTC (rev 12505)
+++ branches/jbosstools-3.0.0.CR1/esb/plugins/org.jboss.tools.esb.project.core/build.properties 2008-12-09 21:18:35 UTC (rev 12506)
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
17 years, 4 months
JBoss Tools SVN: r12505 - trunk/esb/plugins/org.jboss.tools.esb.project.core.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-09 16:15:25 -0500 (Tue, 09 Dec 2008)
New Revision: 12505
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/build.properties
Log:
JBIDE-3321 Bad metadata for various features
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/build.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/build.properties 2008-12-09 20:38:46 UTC (rev 12504)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/build.properties 2008-12-09 21:15:25 UTC (rev 12505)
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
17 years, 4 months
JBoss Tools SVN: r12504 - trunk/jbpm/builders/org.jboss.tools.flow.jpdl4.builder.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-12-09 15:38:46 -0500 (Tue, 09 Dec 2008)
New Revision: 12504
Modified:
trunk/jbpm/builders/org.jboss.tools.flow.jpdl4.builder/pluginbuilder.config
Log:
Modified: trunk/jbpm/builders/org.jboss.tools.flow.jpdl4.builder/pluginbuilder.config
===================================================================
--- trunk/jbpm/builders/org.jboss.tools.flow.jpdl4.builder/pluginbuilder.config 2008-12-09 20:28:53 UTC (rev 12503)
+++ trunk/jbpm/builders/org.jboss.tools.flow.jpdl4.builder/pluginbuilder.config 2008-12-09 20:38:46 UTC (rev 12504)
@@ -1,4 +1,5 @@
-#Thu Nov 27 12:17:44 EST 2008
+#Tue Dec 09 15:38:34 EST 2008
+pluginbuilder.is.generation.necessary=true
autotestsuite.class.exclusions=.*All(Tests|PDE_Tests|_Tests|PDETests).*
pluginbuilder.features=org.jboss.tools.flow.jpdl4.feature,org.jboss.tools.flow.common.feature
pluginbuilder.is.svn=false
17 years, 4 months
JBoss Tools SVN: r12503 - trunk/documentation/jboss-tools-docs.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-09 15:28:53 -0500 (Tue, 09 Dec 2008)
New Revision: 12503
Modified:
trunk/documentation/jboss-tools-docs/all-guides.xml
trunk/documentation/jboss-tools-docs/pom.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-512 fix doc build errors
Modified: trunk/documentation/jboss-tools-docs/all-guides.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/all-guides.xml 2008-12-09 20:26:47 UTC (rev 12502)
+++ trunk/documentation/jboss-tools-docs/all-guides.xml 2008-12-09 20:28:53 UTC (rev 12503)
@@ -137,6 +137,19 @@
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
+ <fileSet>
+ <directory>../../jbpm/docs/converter_ref/target/docbook/publish/en-US</directory>
+ <outputDirectory>/jboss_bpmn_convert_ref_guide</outputDirectory>
+ <filtered>false</filtered>
+ <lineEnding>keep</lineEnding>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ <useStrictFiltering>false</useStrictFiltering>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
<fileSet>
<directory>../../jsf/docs/userguide/target/docbook/publish/en-US</directory>
<outputDirectory>/jsf</outputDirectory>
@@ -287,34 +300,6 @@
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
-
- <fileSet>
- <directory>../../jbpm/docs/converter_ref/target/docbook/publish/en-US</directory>
- <outputDirectory>/jboss_bpmn_convert_ref_guide</outputDirectory>
- <filtered>false</filtered>
- <lineEnding>keep</lineEnding>
- <includes>
- <include>**/*.*</include>
- </includes>
- <useStrictFiltering>false</useStrictFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
-
- <fileSet>
- <directory>../../jbpm/docs/reference/target/docbook/publish/en-US</directory>
- <outputDirectory>/jboss_jbpm_ref_guide</outputDirectory>
- <filtered>false</filtered>
- <lineEnding>keep</lineEnding>
- <includes>
- <include>**/*.*</include>
- </includes>
- <useStrictFiltering>false</useStrictFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: trunk/documentation/jboss-tools-docs/pom.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/pom.xml 2008-12-09 20:26:47 UTC (rev 12502)
+++ trunk/documentation/jboss-tools-docs/pom.xml 2008-12-09 20:28:53 UTC (rev 12503)
@@ -28,7 +28,6 @@
<module>../../birt/docs</module>
<module>../../smooks/docs/reference</module>
<module>../../jbpm/docs/converter_ref</module>
- <module>../../jbpm/docs/reference</module>
<module>index</module>
</modules>
17 years, 4 months
JBoss Tools SVN: r12502 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-12-09 15:26:47 -0500 (Tue, 09 Dec 2008)
New Revision: 12502
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java
Log:
add xmlns attributes and <?xml header to the generated files
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-09 20:24:28 UTC (rev 12501)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-09 20:26:47 UTC (rev 12502)
@@ -116,7 +116,9 @@
buffer.append(">");
} else if (element instanceof Process) {
Process process = (Process)element;
+ buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n");
buffer.append("<process");
+ buffer.append(" xmlns=\"http://jbpm.org/4/jpdl\"");
if (process.getInitial() != null) {
buffer.append(" ");
String value = process.getInitial().getName();
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java 2008-12-09 20:24:28 UTC (rev 12501)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java 2008-12-09 20:26:47 UTC (rev 12502)
@@ -17,6 +17,15 @@
@Override
protected InputStream getInitialContents() {
- return new ByteArrayInputStream("<process>\n</process>".getBytes());
+ return new ByteArrayInputStream(getInitialContentsAsString().getBytes());
}
+
+ private String getInitialContentsAsString() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n");
+ buffer.append("<process xmlns=\"http://jbpm.org/4/jpdl\" name=\"");
+ buffer.append(getFileName().substring(0, getFileName().lastIndexOf(getFileExtension()) - 1));
+ buffer.append("\">\n</process>");
+ return buffer.toString();
+ }
}
17 years, 4 months
JBoss Tools SVN: r12501 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-12-09 15:24:28 -0500 (Tue, 09 Dec 2008)
New Revision: 12501
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFStatusTemplate.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFReapeatTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataListTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
RESOLVED - issue JBIDE-3223: Components shouldn't render usual text inside
https://jira.jboss.org/jira/browse/JBIDE-3223
All components have been fixed.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2008-12-09 20:24:28 UTC (rev 12501)
@@ -10,6 +10,7 @@
org.eclipse.core.runtime,
org.jboss.tools.jst.jsp,
org.mozilla.xpcom,
- org.jboss.tools.jsf.vpe.richfaces;bundle-version="2.1.0"
+ org.jboss.tools.jsf.vpe.richfaces;bundle-version="2.1.0",
+ org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0"
Eclipse-LazyStart: true
Bundle-Vendor: JBoss, a division of Red Hat
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFReapeatTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFReapeatTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFReapeatTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -13,21 +13,47 @@
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
*
* @author Dzmitry Sakovich (dsakovich(a)exadel.com)
- *
+ * @author yradtsevich
*/
public class Ajax4JSFReapeatTemplate extends VpeAbstractTemplate {
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
- nsIDOMDocument visualDocument) {
- return new VpeCreationData(null);
+ nsIDOMDocument visualDocument) {
+ VpeCreationData vpeCreationData = new VpeCreationData(null);
+ VpeChildrenInfo vpeChildrenInfo = new VpeChildrenInfo(null);
+ vpeCreationData.addChildrenInfo(vpeChildrenInfo);
+
+ NodeList children = sourceNode.getChildNodes();
+ int childrenLength = children.getLength();
+ for (int i = 0; i < childrenLength; i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ vpeChildrenInfo.addSourceChild(child);
+ }
+ }
+
+ return vpeCreationData;
}
+ /**
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object, java.lang.String, java.lang.String)
+ */
+ @Override
+ public boolean isRecreateAtAttrChange(VpePageContext pageContext,
+ Element sourceElement, nsIDOMDocument visualDocument,
+ nsIDOMElement visualNode, Object data, String name, String value) {
+ return true;
+ }
}
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFStatusTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFStatusTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFStatusTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -0,0 +1,179 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.ajax4jsf.template;
+
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.mapping.AttributeData;
+import org.jboss.tools.vpe.editor.mapping.NodeData;
+import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMAttr;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMText;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.jboss.tools.jsf.vpe.jsf.template.util.model.VpeElementProxyData;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
+
+import com.sun.org.apache.regexp.internal.recompile;
+
+/**
+ * @author yradtsevich
+ *
+ */
+public class Ajax4JSFStatusTemplate extends VpeAbstractTemplate {
+
+ /*
+ *<vpe:tag name="a4j:status" case-sensitive="yes">
+ * <vpe:template children="yes" modify="yes">
+ * <span class="{@styleClass};{@stopStyleClass}" style="{@style};{@stopStyle}" title="{tagstring()}">
+ * <vpe:value expr=" {jsfvalue(@stopText)}"/>
+ * </span>
+ * </vpe:template>
+ *</vpe:tag>
+ */
+
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+ Creator creator = new Creator(pageContext, (Element)sourceNode, visualDocument);
+ return creator.create();
+ }
+
+ /**
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object, java.lang.String, java.lang.String)
+ */
+ @Override
+ public boolean isRecreateAtAttrChange(VpePageContext pageContext,
+ Element sourceElement, nsIDOMDocument visualDocument,
+ nsIDOMElement visualNode, Object data, String name, String value) {
+ return true;
+ }
+
+ private static class Creator {
+ private static final String ATTR_STOP_TEXT = "stopText";//$NON-NLS-1$
+ private static final String STOP_FACET_NAME = "stop";//$NON-NLS-1$
+ private static final String START_FACET_NAME = "start";//$NON-NLS-1$
+ private static final String ATTR_STOP_STYLE_CLASS = "stopStyleClass"; //$NON-NLS-1$
+ private static final String ATTR_STOP_STYLE = "stopStyle"; //$NON-NLS-1$
+ private final VpePageContext pageContext;
+ private final Element sourceElement;
+ private final nsIDOMDocument visualDocument;
+ private VpeCreationData vpeCreationData;
+
+ public Creator(VpePageContext pageContext, Element sourceElement,
+ nsIDOMDocument visualDocument) {
+ this.pageContext = pageContext;
+ this.sourceElement = sourceElement;
+ this.visualDocument = visualDocument;
+ }
+
+
+ public VpeCreationData create() {
+ nsIDOMElement mainElement = createMainElement();
+ vpeCreationData = new VpeCreationData(mainElement);
+ nsIDOMElement stopTextElement = createStopTextElement();
+ if (stopTextElement != null) {
+ mainElement.appendChild(createStopTextElement());
+ }
+ addChildrenInfo(mainElement);
+ return vpeCreationData;
+ }
+
+ private nsIDOMElement createMainElement() {
+ nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
+
+ // set class of the span to "{@styleClass} {@stopStyleClass}"
+ {
+ String styleClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS);
+ String stopStyleClass = sourceElement.getAttribute(ATTR_STOP_STYLE_CLASS);
+ StringBuffer spanClass = new StringBuffer();
+ if (styleClass != null) {
+ spanClass.append(styleClass);
+ }
+ if (stopStyleClass != null) {
+ spanClass.append(HTML.VALUE_CLASS_DELIMITER).append(stopStyleClass);
+ }
+ span.setAttribute(HTML.ATTR_CLASS, spanClass.toString());
+ }
+
+ // set style of the span to "{@style};{@stopStyle}"
+ {
+ String style = sourceElement.getAttribute(RichFaces.ATTR_STYLE);
+ String stopStyle = sourceElement.getAttribute(ATTR_STOP_STYLE);
+ StringBuffer spanStyle = new StringBuffer();
+ if (style != null) {
+ spanStyle.append(style).append(HTML.VALUE_STYLE_DELIMITER);
+ }
+ if (stopStyle != null) {
+ spanStyle.append(stopStyle).append(HTML.VALUE_STYLE_DELIMITER);
+ }
+ span.setAttribute(HTML.ATTR_STYLE, spanStyle.toString());
+ }
+ return span;
+ }
+
+ /**
+ * Creates new {@code nsIDOMElement} and inserts text of {@code 'stopText'} attribute
+ * into this element. Also it registers created element in {@link #vpeCreationData}
+ *
+ * @return created {@code nsIDOMElement} or {@code null} if {@link #sourceElement}
+ * does not have {@code 'stopText'} attribute
+ */
+ private nsIDOMElement createStopTextElement() {
+ nsIDOMElement visualElement = null;
+
+ Attr stopTextAttribute = sourceElement.getAttributeNode(ATTR_STOP_TEXT);
+ if (stopTextAttribute != null) {
+ visualElement = visualDocument.createElement(HTML.TAG_SPAN);
+ nsIDOMText textNode = visualDocument.createTextNode(
+ stopTextAttribute.getNodeValue());
+ visualElement.appendChild(textNode);
+ // add attribute for ability of editing
+ VpeElementProxyData elementData = new VpeElementProxyData();
+ elementData.addNodeData(new AttributeData(stopTextAttribute, textNode, true));
+ vpeCreationData.setElementData(elementData);
+ }
+
+ return visualElement;
+ }
+
+ /**
+ * Creates new object of {@link VpeChildrenInfo}, initializes it,
+ * and adds it to {@link #vpeCreationData}
+ *
+ * @param visualParent visual parent for {@code VpeChildrenInfo}
+ */
+ private void addChildrenInfo(nsIDOMElement visualParent) {
+ final VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualParent);
+ vpeCreationData.addChildrenInfo(childrenInfo);
+ NodeList children = sourceElement.getChildNodes();
+ int childrenLength = children.getLength();
+ for (int i = 0; i < childrenLength; i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE
+ && child.getNodeName().endsWith(RichFaces.TAG_FACET)) {
+ Element facet = (Element)child;
+ String facetName = facet.getAttribute(RichFaces.ATTR_NAME);
+ if (START_FACET_NAME.equalsIgnoreCase(facetName)) {
+ // just skip
+ } else if (STOP_FACET_NAME.equalsIgnoreCase(facetName)) {
+ childrenInfo.addSourceChild(facet);
+ }
+ }
+ }
+ }
+ }
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-12-09 20:24:28 UTC (rev 12501)
@@ -196,11 +196,9 @@
</vpe:tag>
<vpe:tag name="a4j:status" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <span class="{@styleClass};{@stopStyleClass}" style="{@style};{@stopStyle}" title="{tagstring()}">
- <vpe:value expr=" {jsfvalue(@stopText)}"/>
- </span>
- </vpe:template>
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFStatusTemplate">
+ </vpe:template>
</vpe:tag>
<vpe:tag name="a4j:loadBundle" case-sensitive="yes">
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2008-12-09 20:24:28 UTC (rev 12501)
@@ -16,7 +16,8 @@
org.eclipse.wst.html.core,
org.jboss.tools.vpe.html
Eclipse-LazyStart: true
-Export-Package: org.jboss.tools.jsf.vpe.jsf.template
+Export-Package: org.jboss.tools.jsf.vpe.jsf.template,
+ org.jboss.tools.jsf.vpe.jsf.template.util.model
Bundle-Localization: plugin
Import-Package: org.jboss.tools.jst.web.tld
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2008-12-09 20:24:28 UTC (rev 12501)
@@ -20,4 +20,5 @@
Bundle-Vendor: JBoss, a division of Red Hat
Bundle-ClassPath: lib/jhighlight-1.0.jar,
.
-Export-Package: org.jboss.tools.jsf.vpe.richfaces
+Export-Package: org.jboss.tools.jsf.vpe.richfaces,
+ org.jboss.tools.jsf.vpe.richfaces.template.util
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -66,7 +66,8 @@
STYLE_RESOURCES_PATH,
"dataDefinitionList");
- VpeCreationData creationData = new VpeCreationData(listElement);
+ VpeCreationData creationData = new VpeCreationData(listElement);
+ creationData.addChildrenInfo(new VpeChildrenInfo(null));
Element child = null;
NodeList list = sourceNode.getChildNodes();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -44,6 +44,7 @@
VisualDomUtil.copyAttributes(sourceNode, table);
VpeCreationData creationData = new VpeCreationData(table);
+ creationData.addChildrenInfo(new VpeChildrenInfo(null));
ComponentUtil.setCSSLink(pageContext, "dataTable/dataTable.css", "richFacesDataGrid"); //$NON-NLS-1$ //$NON-NLS-2$
String tableClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS);
@@ -105,7 +106,9 @@
if(!children.isEmpty()) {
VpeChildrenInfo childInfo = new VpeChildrenInfo(td);
for (Node child : children) {
- childInfo.addSourceChild(child);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ childInfo.addSourceChild(child);
+ }
}
creationData.addChildrenInfo(childInfo);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataListTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataListTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataListTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -55,6 +55,7 @@
HTML.ATTR_STYLE, null, null);
VpeCreationData creatorInfo = new VpeCreationData(unorderedList);
+ creatorInfo.addChildrenInfo(new VpeChildrenInfo(null));
final List<String> rowClasses;
@@ -81,8 +82,8 @@
unorderedList.appendChild(listItem);
VpeChildrenInfo info = new VpeChildrenInfo(listItem);
- creatorInfo.addChildrenInfo(info);
encodeListItem(info, sourceElement);
+ creatorInfo.addChildrenInfo(info);
}
return creatorInfo;
@@ -99,13 +100,7 @@
if (child.getNodeType() == Node.ELEMENT_NODE) {
Element childElement = (Element)child;
info.addSourceChild(childElement);
- } else if (child.getNodeType() == Node.TEXT_NODE) {
- String text = child.getNodeValue();
- text = (text == null ? null : text.trim());
- if (text != null && text.length() > 0) {
- info.addSourceChild(child);
- }
- }
+ }
}
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -48,6 +48,7 @@
HTML.ATTR_STYLE , null, null);
VpeCreationData creatorInfo = new VpeCreationData(orderedList);
+ creatorInfo.addChildrenInfo(new VpeChildrenInfo(null));
int rows = 1;
try {
@@ -62,8 +63,8 @@
orderedList.appendChild(listItem);
VpeChildrenInfo info = new VpeChildrenInfo(listItem);
- creatorInfo.addChildrenInfo(info);
encodeListItem(info, sourceElement);
+ creatorInfo.addChildrenInfo(info);
}
return creatorInfo;
@@ -80,12 +81,6 @@
if (child.getNodeType() == Node.ELEMENT_NODE) {
Element childElement = (Element)child;
info.addSourceChild(childElement);
- } else if (child.getNodeType() == Node.TEXT_NODE) {
- String text = child.getNodeValue();
- text = (text == null ? null : text.trim());
- if (text != null && text.length() > 0) {
- info.addSourceChild(child);
- }
}
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -50,9 +50,8 @@
private String uploadControlLabel;
-
private String clearAllControlLabel;
-
+
/**
* The Constructor.
*/
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -231,49 +231,35 @@
/**
* "fast move" buttons block
*/
- private static final List<String> fastMoveButtons;
+ private static final List<String> fastMoveButtons = Arrays.asList(
+ "copyAllControl", //$NON-NLS-1$
+ "removeAllControl" //$NON-NLS-1$
+ );
- static {
- fastMoveButtons = new ArrayList<String>();
- fastMoveButtons.add("copyAllControl"); //$NON-NLS-1$
- fastMoveButtons.add("removeAllControl"); //$NON-NLS-1$
- }
-
/**
* "move" buttons block
*/
- private static final List<String> moveButtons;
+ private static final List<String> moveButtons = Arrays.asList(
+ "copyControl", //$NON-NLS-1$
+ "removeControl" //$NON-NLS-1$
+ );
- static {
- moveButtons = new ArrayList<String>();
- moveButtons.add("copyControl"); //$NON-NLS-1$
- moveButtons.add("removeControl"); //$NON-NLS-1$
- }
-
/**
* "fast order" buttons block
*/
- private static final List<String> fastOrderButtons;
+ private static final List<String> fastOrderButtons = Arrays.asList(
+ "topControl", //$NON-NLS-1$
+ "bottomControl" //$NON-NLS-1$
+ );
- static {
- fastOrderButtons = new ArrayList<String>();
- fastOrderButtons.add("topControl"); //$NON-NLS-1$
- fastOrderButtons.add("bottomControl"); //$NON-NLS-1$
-
- }
-
/**
* "order" buttons block
*/
- private static final List<String> orderButtons;
+ private static final List<String> orderButtons = Arrays.asList(
+ "upControl", //$NON-NLS-1$
+ "downControl" //$NON-NLS-1$
+ );
- static {
- orderButtons = new ArrayList<String>();
- orderButtons.add("upControl"); //$NON-NLS-1$
- orderButtons.add("downControl"); //$NON-NLS-1$
-
- }
-
/**
* labels for controls
*/
@@ -379,6 +365,7 @@
.getAttribute(RichFaces.ATTR_STYLE));
VpeCreationData creationData = new VpeCreationData(basicTable);
+ creationData.addChildrenInfo(new VpeChildrenInfo(null));
// create caption
nsIDOMElement caption = createCaption(visualDocument, creationData);
@@ -562,39 +549,41 @@
// add children to "tr" element
int columnCount = 0;
for (Node child : children) {
- String localName = child.getLocalName();
- if (RichFaces.TAG_COLUMN.equals(localName) ||
- RichFaces.TAG_COLUMNS.equals(localName)) {
-
- nsIDOMElement column = visualDocument
- .createElement(HTML.TAG_TD);
-
- tr.appendChild(column);
-
- if (columnClasses.size() > 0) {
-
- String columnClass = columnClasses.get(columnCount
- % columnClasses.size());
- column.setAttribute(HTML.ATTR_CLASS, columnClass);
-
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ String localName = child.getLocalName();
+ if (RichFaces.TAG_COLUMN.equals(localName) ||
+ RichFaces.TAG_COLUMNS.equals(localName)) {
+
+ nsIDOMElement column = visualDocument
+ .createElement(HTML.TAG_TD);
+
+ tr.appendChild(column);
+
+ if (columnClasses.size() > 0) {
+
+ String columnClass = columnClasses.get(columnCount
+ % columnClasses.size());
+ column.setAttribute(HTML.ATTR_CLASS, columnClass);
+
+ }
+ nsIDOMElement columnTable = visualDocument
+ .createElement(HTML.TAG_TABLE);
+ column.appendChild(columnTable);
+
+ nsIDOMElement columnTableTr = visualDocument
+ .createElement(HTML.TAG_TR);
+ columnTable.appendChild(columnTableTr);
+
+ VpeChildrenInfo columnTableTrInfo = new VpeChildrenInfo(
+ columnTableTr);
+ creationData.addChildrenInfo(columnTableTrInfo);
+ columnTableTrInfo.addSourceChild(child);
+
+ columnCount++;
+
+ // trInfo.addSourceChild(child);
+
}
- nsIDOMElement columnTable = visualDocument
- .createElement(HTML.TAG_TABLE);
- column.appendChild(columnTable);
-
- nsIDOMElement columnTableTr = visualDocument
- .createElement(HTML.TAG_TR);
- columnTable.appendChild(columnTableTr);
-
- VpeChildrenInfo columnTableTrInfo = new VpeChildrenInfo(
- columnTableTr);
- creationData.addChildrenInfo(columnTableTrInfo);
- columnTableTrInfo.addSourceChild(child);
-
- columnCount++;
-
- // trInfo.addSourceChild(child);
-
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -286,6 +286,8 @@
final nsIDOMElement rootTBody = visualDocument.createElement(HTML.TAG_TBODY);
final nsIDOMElement rootTr = visualDocument.createElement(HTML.TAG_TR);
final VpeCreationData creationData = new VpeCreationData(rootTable);
+ creationData.addChildrenInfo(new VpeChildrenInfo(null));
+
rootTable.setAttribute(HTML.ATTR_CLASS, styleClasses.get(RichFaces.ATTR_STYLE)); //$NON-NLS-1$
rootTable.setAttribute(HTML.ATTR_STYLE, sourceElement.getAttribute(RichFaces.ATTR_STYLE));
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -13,7 +13,6 @@
package org.jboss.tools.jsf.vpe.richfaces.template;
-import java.awt.Component;
import java.util.ArrayList;
import java.util.List;
@@ -27,7 +26,6 @@
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -137,11 +135,14 @@
progressDiv.appendChild(uploadDiv);
List<Node> childrens = ComponentUtil.getChildren(source);
final VpeCreationData data = new VpeCreationData(progressDiv);
+ data.addChildrenInfo(new VpeChildrenInfo(null));
+
if (childrens.size() > 0) {
final VpeChildrenInfo info = new VpeChildrenInfo(progressDiv);
data.addChildrenInfo(info);
for (Node n : childrens) {
- if (n.getNodeName().indexOf(FACET) > 1 || n.getNodeName().indexOf(OUTPUT_TEXT) > 1) {
+ if (n.getNodeName().indexOf(FACET) > 1
+ || n.getNodeName().indexOf(OUTPUT_TEXT) > 1) {
info.addSourceChild(n);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -20,8 +20,6 @@
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.template.expression.VpeExpression;
-import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder;
-import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException;
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
@@ -88,40 +86,45 @@
// Method was called from dataTable
parentVisualNode.appendChild(curTr);
}
+
+ creationData.addChildrenInfo(new VpeChildrenInfo(null));
// Create mapping to Encode body
VpeChildrenInfo trChildrenInfo = new VpeChildrenInfo(curTr);
+
final List<Node> children = ComponentUtil.getChildren(sourceElement);
for (final Node child : children) {
- String nodeName = child.getNodeName();
- if (nodeName.endsWith(':' + RichFaces.TAG_COLUMN) ||
- nodeName.endsWith(':' + RichFaces.TAG_COLUMNS)) {
- final boolean breakBefore = RichFaces.VAL_TRUE.equals( ((Element)child).getAttribute(RichFaces.ATTR_BREAK_BEFORE) );
- if (breakBefore) {
- curRow++;
- curColumn = 0;
- curTr = visualDocument.createElement(HTML.TAG_TR);
- VisualDomUtil.copyAttributes(sourceElement, curTr);
-
- if (header) {
- curTr.setAttribute(HTML.ATTR_CLASS, getHeaderContinueClass());
- } else if(footer) {
- curTr.setAttribute(HTML.ATTR_CLASS, getFooterContinueClass());
- } else {
- curTr.setAttribute(HTML.ATTR_CLASS, getRowClass(curRow));
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ String nodeName = child.getNodeName();
+ if (nodeName.endsWith(':' + RichFaces.TAG_COLUMN) ||
+ nodeName.endsWith(':' + RichFaces.TAG_COLUMNS)) {
+ final boolean breakBefore = RichFaces.VAL_TRUE.equals( ((Element)child).getAttribute(RichFaces.ATTR_BREAK_BEFORE) );
+ if (breakBefore) {
+ curRow++;
+ curColumn = 0;
+ curTr = visualDocument.createElement(HTML.TAG_TR);
+ VisualDomUtil.copyAttributes(sourceElement, curTr);
+
+ if (header) {
+ curTr.setAttribute(HTML.ATTR_CLASS, getHeaderContinueClass());
+ } else if(footer) {
+ curTr.setAttribute(HTML.ATTR_CLASS, getFooterContinueClass());
+ } else {
+ curTr.setAttribute(HTML.ATTR_CLASS, getRowClass(curRow));
+ }
+
+ parentVisualNode.appendChild(curTr);
+ trChildrenInfo = new VpeChildrenInfo(curTr);
+ creationData.addChildrenInfo(trChildrenInfo);
}
-
- parentVisualNode.appendChild(curTr);
- trChildrenInfo = new VpeChildrenInfo(curTr);
- creationData.addChildrenInfo(trChildrenInfo);
+
+ final VpeChildrenInfo innerTdChildrenInfo = new VpeChildrenInfo(curTr);
+ creationData.addChildrenInfo(innerTdChildrenInfo);
+ innerTdChildrenInfo.addSourceChild(child);
+ curColumn++;
+ } else {
+ trChildrenInfo.addSourceChild(child);
}
-
- final VpeChildrenInfo innerTdChildrenInfo = new VpeChildrenInfo(curTr);
- creationData.addChildrenInfo(innerTdChildrenInfo);
- innerTdChildrenInfo.addSourceChild(child);
- curColumn++;
- } else {
- trChildrenInfo.addSourceChild(child);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeTemplate.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeTemplate.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -84,6 +84,8 @@
styleClass);
}
VpeCreationData vpeCreationData = new VpeCreationData(visualElement);
+ vpeCreationData.addChildrenInfo(new VpeChildrenInfo(null));
+
parseTree(pageContext, sourceNode, visualDocument, vpeCreationData,
visualElement);
setStylesAttributesToTree(visualElement, (Element) sourceNode);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2008-12-09 20:24:28 UTC (rev 12501)
@@ -110,7 +110,7 @@
</vpe:template>
</vpe:tag>
<vpe:tag name="rich:fileUpload" case-sensitive="yes">
- <vpe:template children="yes" modify="no"
+ <vpe:template children="no" modify="no"
class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesFileUploadTemplate">
<vpe:dnd>
<vpe:drag start-enable="yes" />
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml 2008-12-09 20:24:28 UTC (rev 12501)
@@ -1,23 +1,21 @@
<tests>
<test id="status1">
- <SPAN CLASS=";" STYLE="-moz-user-modify: read-only; cursor: pointer;">
- Complete
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <SPAN CLASS="" STYLE="">
+ <SPAN>
+ Complete
+ </SPAN>
</SPAN>
</test>
<test id="status2">
- <SPAN CLASS=";" STYLE="-moz-user-modify: read-only; cursor: pointer;">
+ <SPAN CLASS="StyleClass StopStyleClass" STYLE="border: 3px solid red;">
+ <SPAN>
+ STOP TEXT
+ </SPAN>
<DIV>
- <IMG HEIGHT="16"
- SRC="/.*ve/unresolved_image.gif/"
- STYLE="-moz-user-modify: read-write;"/>
+ <SPAN>
+ FACET STOP OUTPUT TEXT
+ </SPAN>
</DIV>
- <DIV>
- <IMG
- SRC="/.*ve/unresolved_image.gif/"
- STYLE="-moz-user-modify: read-write;"/>
- </DIV>
</SPAN>
</test>
</tests>
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -188,18 +188,19 @@
nsIDOMElement row = null;
nsIDOMElement caption = null;
- /*
- * Fixes http://jira.jboss.com/jira/browse/JBIDE-1944 author: Denis
- * Maliarevich Any text which is placed outside of the tags will be
- * displayed above the table.
- */
- String redundantText = REDUNDANT_TEXT_SEPARATOR;
- for (int i = 0; i < sourceElements.getRedundantTextNodesCount(); i++) {
- Node node = sourceElements.getRedundantTextNode(i);
- redundantText += node.getNodeValue();
- redundantText += REDUNDANT_TEXT_SEPARATOR;
- }
- div.appendChild(visualDocument.createTextNode(redundantText));
+// Fix https://jira.jboss.org/jira/browse/JBIDE-3223
+// /*
+// * Fixes http://jira.jboss.com/jira/browse/JBIDE-1944 author: Denis
+// * Maliarevich Any text which is placed outside of the tags will be
+// * displayed above the table.
+// */
+// String redundantText = REDUNDANT_TEXT_SEPARATOR;
+// for (int i = 0; i < sourceElements.getRedundantTextNodesCount(); i++) {
+// Node node = sourceElements.getRedundantTextNode(i);
+// redundantText += node.getNodeValue();
+// redundantText += REDUNDANT_TEXT_SEPARATOR;
+// }
+// div.appendChild(visualDocument.createTextNode(redundantText));
div.appendChild(outterTable);
if (true || sourceElements.hasTableCaption()) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-12-09 19:18:07 UTC (rev 12500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-12-09 20:24:28 UTC (rev 12501)
@@ -107,6 +107,7 @@
public static final String VALUE_ALIGN_LEFT = "left"; //$NON-NLS-1$
public static final String VALUE_ALIGN_MIDDLE = "middle"; //$NON-NLS-1$
public static final String VALUE_CLASS_DELIMITER = " "; //$NON-NLS-1$
+ public static final String VALUE_STYLE_DELIMITER = ";"; //$NON-NLS-1$
public static final String VALUE_TYPE_TEXT = "text"; //$NON-NLS-1$
public static final String VALUE_TYPE_PASSWORD = "password"; //$NON-NLS-1$
public static final String VALUE_TYPE_IMAGE = "image"; //$NON-NLS-1$
17 years, 4 months