JBoss Tools SVN: r43596 - trunk/esb/tests/org.jboss.tools.esb.core.test.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-11 09:35:23 -0400 (Tue, 11 Sep 2012)
New Revision: 43596
Modified:
trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml
Log:
Corrected syntax error
Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2012-09-11 13:26:41 UTC (rev 43595)
+++ trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2012-09-11 13:35:23 UTC (rev 43596)
@@ -17,6 +17,8 @@
<emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.project.core</emma.instrument.bundles>
</properties>
+ <build>
+
<plugins>
<plugin>
@@ -63,7 +65,6 @@
</plugins>
+ </build>
-
-
</project>
13 years, 3 months
JBoss Tools SVN: r43595 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-09-11 09:26:41 -0400 (Tue, 11 Sep 2012)
New Revision: 43595
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java
Log:
https://issues.jboss.org/browse/JBIDE-12584
Do not dispose active shell
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java 2012-09-11 13:26:03 UTC (rev 43594)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java 2012-09-11 13:26:41 UTC (rev 43595)
@@ -171,7 +171,6 @@
defaultConnectionProfile = dialog.getConnectionProfileName();
fillPropertiesFromConnectionProfile(defaultConnectionProfile);
}
- shell.dispose();
}
});
gd = new GridData(GridData.FILL_HORIZONTAL);
13 years, 3 months
JBoss Tools SVN: r43594 - trunk/esb/tests/org.jboss.tools.esb.core.test.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-11 09:26:03 -0400 (Tue, 11 Sep 2012)
New Revision: 43594
Modified:
trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml
Log:
Added macosx, win32, linux to target-platform-configuration plugin - trying to run tests on windows
Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2012-09-11 13:07:47 UTC (rev 43593)
+++ trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2012-09-11 13:26:03 UTC (rev 43594)
@@ -16,4 +16,54 @@
<coverage.filter>org.jboss.tools.esb.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.project.core</emma.instrument.bundles>
</properties>
-</project>
\ No newline at end of file
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+
+
+
+</project>
13 years, 3 months
JBoss Tools SVN: r43593 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-11 09:07:47 -0400 (Tue, 11 Sep 2012)
New Revision: 43593
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/build.properties
Log:
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/build.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/build.properties 2012-09-11 13:07:44 UTC (rev 43592)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/build.properties 2012-09-11 13:07:47 UTC (rev 43593)
@@ -6,8 +6,5 @@
META-INF/,\
plugin.xml,\
plugin.properties
-src.includes = plugin.properties,\
- META-INF/,\
- icons/,\
- plugin.xml,\
+src.includes = icons/,\
pom.xml
13 years, 3 months
JBoss Tools SVN: r43592 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-11 09:07:44 -0400 (Tue, 11 Sep 2012)
New Revision: 43592
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java
Log:
Changed the way project is selected
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java 2012-09-11 13:06:16 UTC (rev 43591)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java 2012-09-11 13:07:44 UTC (rev 43592)
@@ -61,15 +61,22 @@
selectCopyProjectsIntoWorkspace();
getBot().button("Deselect All").click();
SWTBotTree projectsTree = getBot().treeWithLabel("Projects:");
- for (SWTBotTreeItem item : projectsTree.getAllItems()){
- System.out.println(item.getText());
- }
+
for (String projectName : projectNames){
- SWTBotTreeItem projectItem = projectsTree.getTreeItem(getProjectLabel(projectName));
+ SWTBotTreeItem projectItem = getProjectTreeItem(projectsTree, projectName);
projectItem.check();
}
}
+ private SWTBotTreeItem getProjectTreeItem(SWTBotTree projectsTree, String projectName) {
+ for (SWTBotTreeItem item : projectsTree.getAllItems()){
+ if (projectName.equals(getProjectLabel(item.getText()))){
+ return item;
+ }
+ }
+ throw new IllegalStateException("Project " + projectName + " not available");
+ }
+
private void selectCopyProjectsIntoWorkspace() {
if (isFileSystem()){
if (copyProjectsIntoWorkspace){
@@ -81,11 +88,7 @@
}
private String getProjectLabel(String project){
- if (isFileSystem()){
- return project + " (" + projectPath + "/" + project + ")";
- } else {
- return project + " (" + project + ")";
- }
+ return project.substring(0, project.indexOf('(')).trim();
}
private boolean isFileSystem(){
13 years, 3 months
JBoss Tools SVN: r43591 - trunk/openshift/plugins/org.jboss.tools.openshift.egit.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-11 09:06:16 -0400 (Tue, 11 Sep 2012)
New Revision: 43591
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/build.properties
Log:
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/build.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/build.properties 2012-09-11 12:22:19 UTC (rev 43590)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/build.properties 2012-09-11 13:06:16 UTC (rev 43591)
@@ -1,4 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .
13 years, 3 months
JBoss Tools SVN: r43590 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: resources/richFacesTest/WebContent/pages/JBIDE/5768 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-09-11 08:22:19 -0400 (Tue, 11 Sep 2012)
New Revision: 43590
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/test-footer.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/test-header.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://issues.jboss.org/browse/JBIDE-5768 - junit for facets was added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml 2012-09-11 12:22:19 UTC (rev 43590)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+
+<rich:dataTable id="t1"
+ style="border: 1px solid red;" border="1" value="#{user.trees}">
+ <f:facet name="header">HEADER
+ <h:outputText value="*H1*"/>
+ <h:outputText value="*H2*"/>
+ </f:facet>
+ <f:facet name="footer">FOOTER
+ <h:outputText value="*F3*"/>
+ <h:outputText value="*F4*"/>
+ </f:facet> <rich:column>Col1</rich:column>
+ <rich:column>Col2</rich:column>
+</rich:dataTable>
+
+<rich:dataTable id="t2"
+ style="border: 1px solid green;" border="1" value="#{user.trees}">
+ <ui:include src="test-header.xhtml"/>
+ <ui:include src="test-footer.xhtml"/>
+ <rich:column>Col1</rich:column>
+ <rich:column>Col2</rich:column>
+</rich:dataTable>
+
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml.xml 2012-09-11 12:22:19 UTC (rev 43590)
@@ -0,0 +1,99 @@
+<tests>
+ <test id="t1">
+
+ <TABLE BORDER="1" STYLE="border: 1px solid red;" VALUE="#{user.trees}"
+ CLASS="dr-table rich-table">
+ <COLGROUP SPAN="2">
+ </COLGROUP>
+ <THEAD>
+ <TR CLASS="dr-table-header rich-table-header "
+ STYLE="/background-image: url\(.*resources/common/background.gif\);/">
+ <TD CLASS="dr-table-headercell rich-table-headercell " COLSPAN="100"
+ SCOPE="colgroup">
+ <SPAN CLASS="vpe-text">
+ HEADER
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ *H1*
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ *H2*
+ </SPAN>
+ </TD>
+ </TR>
+ </THEAD>
+ <TFOOT>
+ <TR CLASS="dr-table-footer rich-table-footer "
+ STYLE="/background-image: url\(.*resources/common/background.gif\);/">
+ <TD CLASS="dr-table-footercell rich-table-footercell " COLSPAN="100"
+ SCOPE="colgroup">
+ <SPAN CLASS="vpe-text">
+ FOOTER
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ *F3*
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ *F4*
+ </SPAN>
+ </TD>
+ </TR>
+ </TFOOT>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN CLASS="vpe-text">
+ Col1
+ </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN CLASS="vpe-text">
+ Col2
+ </SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+
+ <test id="t2">
+
+ <TABLE BORDER="1" STYLE="border: 1px solid green;" VALUE="#{user.trees}"
+ CLASS="dr-table rich-table">
+ <COLGROUP SPAN="2">
+ </COLGROUP>
+ <TR>
+ <TD COLSPAN="100">
+ <DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
+ <SPAN STYLE="-moz-user-modify: read-only;">
+ <SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">
+ head_include
+ </SPAN>
+ </SPAN>
+ </DIV>
+ </TD>
+ </TR>
+ <TR>
+ <TD COLSPAN="100">
+ <DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
+ <SPAN STYLE="-moz-user-modify: read-only;">
+ <SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">
+ foot_include
+ </SPAN>
+ </SPAN>
+ </DIV>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN CLASS="vpe-text">
+ Col1
+ </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN CLASS="vpe-text">
+ Col2
+ </SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/dataTable.xhtml.xml
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/test-footer.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/test-footer.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/test-footer.xhtml 2012-09-11 12:22:19 UTC (rev 43590)
@@ -0,0 +1,8 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html">
+ <f:facet name="footer">FOOTER
+ <h:outputText value="foot_include"/>
+ </f:facet>
+</ui:composition>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/test-header.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/test-header.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/5768/test-header.xhtml 2012-09-11 12:22:19 UTC (rev 43590)
@@ -0,0 +1,8 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html">
+ <f:facet name="header">HEADER
+ <h:outputText value="head_include"/>
+ </f:facet>
+</ui:composition>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2012-09-11 12:16:18 UTC (rev 43589)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2012-09-11 12:22:19 UTC (rev 43590)
@@ -444,6 +444,10 @@
performInvisibleTagTest("components/validator.xhtml", "validator"); //$NON-NLS-1$ //$NON-NLS-2$
}
+ public void testDataTableFacets() throws Throwable {
+ performContentTest("JBIDE/5768/dataTable.xhtml"); //$NON-NLS-1$
+ }
+
@Override
protected String getTestProjectName() {
return RichFacesAllTests.IMPORT_PROJECT_NAME;
13 years, 3 months
JBoss Tools SVN: r43589 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-11 08:16:18 -0400 (Tue, 11 Sep 2012)
New Revision: 43589
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
Log:
Restored all tests to test run - src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-11 11:57:21 UTC (rev 43588)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-11 12:16:18 UTC (rev 43589)
@@ -31,18 +31,18 @@
CreateRuntimeFromSOA.class,
NewProjectUsingRuntime.class,
NewProjectUsingBundledInEAP.class,
-// Editing.class,
-// HelloWorld.class,
-// HelloWorldAction.class,
+ Editing.class,
+ HelloWorld.class,
+ HelloWorldAction.class,
HelloWorldFileAction.class,
-// SmooksCSV2XML.class,
-// SmooksXML2POJO.class,
-// SmooksXML2XMLDateManipulation.class,
-// SmooksXML2XMLSimple.class,
-// WebServiceConsumer1.class,
-// WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
-// WebServiceProducerHttp.class,
-// WebServiceProducerSocket.class
+ SmooksCSV2XML.class,
+ SmooksXML2POJO.class,
+ SmooksXML2XMLDateManipulation.class,
+ SmooksXML2XMLSimple.class,
+ WebServiceConsumer1.class,
+ WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
+ WebServiceProducerHttp.class,
+ WebServiceProducerSocket.class
//SimpleEAPTest.class
})
@RunWith(RequirementAwareSuite.class)
13 years, 3 months
JBoss Tools SVN: r43588 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-09-11 07:57:21 -0400 (Tue, 11 Sep 2012)
New Revision: 43588
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/RichFacesDataTableTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java
Log:
https://issues.jboss.org/browse/JBIDE-5768 - allow <rich:dataTable> to render all facets elements
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 2012-09-11 10:53:31 UTC (rev 43587)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java 2012-09-11 11:57:21 UTC (rev 43588)
@@ -93,7 +93,7 @@
"dr-table-header rich-table-header", //$NON-NLS-1$
"dr-table-header-continue rich-table-header-continue", //$NON-NLS-1$
"dr-table-headercell rich-table-headercell", //$NON-NLS-1$
- headerClass, HTML.TAG_TD);
+ headerClass, HTML.TAG_TD, false);
}
/*
@@ -111,7 +111,7 @@
"dr-table-footer rich-table-footer", //$NON-NLS-1$
"dr-table-footer-continue rich-table-footer-continue", //$NON-NLS-1$
"dr-table-footercell rich-table-footercell", //$NON-NLS-1$
- footerClass, HTML.TAG_TD);
+ footerClass, HTML.TAG_TD, false);
}
nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2012-09-11 10:53:31 UTC (rev 43587)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2012-09-11 11:57:21 UTC (rev 43588)
@@ -84,25 +84,26 @@
*/
Element header = SourceDomUtil.getFacetByName(pageContext,
sourceElement, RichFaces.NAME_FACET_HEADER);
- Map<String, List<Node>> headerFacetChildren = VisualDomUtil.findFacetElements(header, pageContext);
- boolean headerJsfElementPresents = headerFacetChildren.get(VisualDomUtil.FACET_JSF_TAG).size() > 0;
+ boolean tableFacetHasChildren = false;
+ if (header != null) {
+ tableFacetHasChildren = header.getChildNodes().getLength() > 0;
+ }
boolean hasColumnWithHeader = RichFaces.hasColumnWithFacet(columns, RichFaces.NAME_FACET_HEADER);
- if(headerJsfElementPresents || hasColumnWithHeader) {
+ if(tableFacetHasChildren || hasColumnWithHeader) {
nsIDOMElement thead = visualDocument.createElement(HTML.TAG_THEAD);
table.appendChild(thead);
String headerClass = sourceElement.hasAttribute(RichFaces.ATTR_HEADER_CLASS)
? sourceElement.getAttribute(RichFaces.ATTR_HEADER_CLASS) : null;
- if(headerJsfElementPresents) {
- Node node = headerFacetChildren.get(VisualDomUtil.FACET_JSF_TAG).get(0);
+ if(tableFacetHasChildren) {
/*
* Encode Header for the whole table first
*/
encodeTableHeaderOrFooterFacet(pageContext, creationData,
- thead, columnsLength, visualDocument, node,
+ thead, columnsLength, visualDocument, header,
"dr-table-header rich-table-header", //$NON-NLS-1$
"dr-table-header-continue rich-table-header-continue", //$NON-NLS-1$
"dr-table-headercell rich-table-headercell", //$NON-NLS-1$
- headerClass, HTML.TAG_TD);
+ headerClass, HTML.TAG_TD, true);
}
if(hasColumnWithHeader) {
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
@@ -123,13 +124,16 @@
/*
* Encode Footer
+ * Facet cannot be found inside UI:INCLUDE tag
*/
Element footer = SourceDomUtil.getFacetByName(pageContext,
sourceElement, RichFaces.NAME_FACET_FOOTER);
- Map<String, List<Node>> footerFacetChildren = VisualDomUtil.findFacetElements(footer, pageContext);
- boolean footerJsfElementPresents = footerFacetChildren.get(VisualDomUtil.FACET_JSF_TAG).size() > 0;
+ tableFacetHasChildren = false;
+ if (footer != null) {
+ tableFacetHasChildren = footer.getChildNodes().getLength() > 0;
+ }
boolean hasColumnWithFooter = RichFaces.hasColumnWithFacet(columns, RichFaces.NAME_FACET_FOOTER);
- if (footerJsfElementPresents || hasColumnWithFooter) {
+ if (tableFacetHasChildren || hasColumnWithFooter) {
nsIDOMElement tfoot = visualDocument.createElement(HTML.TAG_TFOOT);
table.appendChild(tfoot);
String footerClass = sourceElement.hasAttribute(RichFaces.ATTR_FOOTER_CLASS)
@@ -149,17 +153,16 @@
"dr-table-subfootercell rich-table-subfootercell", //$NON-NLS-1$
footerClass, RichFaces.NAME_FACET_FOOTER, HTML.TAG_TD);
}
- if (footerJsfElementPresents) {
- Node node = footerFacetChildren.get(VisualDomUtil.FACET_JSF_TAG).get(0);
+ if (tableFacetHasChildren) {
/*
* Encode Footer for the whole table
*/
encodeTableHeaderOrFooterFacet(pageContext, creationData,
- tfoot, columnsLength, visualDocument, node,
+ tfoot, columnsLength, visualDocument, footer,
"dr-table-footer rich-table-footer", //$NON-NLS-1$
"dr-table-footer-continue rich-table-footer-continue", //$NON-NLS-1$
"dr-table-footercell rich-table-footercell", //$NON-NLS-1$
- footerClass,HTML.TAG_TD);
+ footerClass,HTML.TAG_TD, true);
}
}
@@ -254,14 +257,34 @@
nsIDOMElement parentTheadOrTfood, int columns,
nsIDOMDocument visualDocument, Node facetBody,
String skinFirstRowClass, String skinRowClass,
- String skinCellClass, String facetBodyClass, String facetVisualNode) {
+ String skinCellClass, String facetBodyClass,
+ String facetVisualNode, boolean encodeAllFacetChildrenManually) {
if (null == facetBody) {
- RichFacesTemplatesActivator.getDefault().logError("Facet Body is null !"); //$NON-NLS-1$
+ RichFacesTemplatesActivator.getDefault().logError("Facet Body is 'null' in <rich:dataTable> !!"); //$NON-NLS-1$
}
-
- boolean isColumnGroup = facetBody.getNodeName().endsWith(RichFaces.TAG_COLUMN_GROUP);
- boolean isSubTable = facetBody.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE);
+ NodeList allFacetElements = facetBody.getChildNodes();
+ int length = allFacetElements.getLength();
+ Node child = null;
+ boolean isColumnGroup = false;
+ boolean isSubTable = false;
+ if (length > 0) {
+ for (int i = 0; i < length; i++) {
+ child = allFacetElements.item(i);
+ if (child.getNodeName().endsWith(RichFaces.TAG_COLUMN_GROUP)) {
+ isColumnGroup = true;
+ facetBody = child;
+ break;
+ } else if (child.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE)) {
+ isSubTable = true;
+ facetBody = child;
+ break;
+ }
+ }
+ } else {
+ isColumnGroup = facetBody.getNodeName().endsWith(RichFaces.TAG_COLUMN_GROUP);
+ isSubTable = facetBody.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE);
+ }
if(isColumnGroup) {
RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encodeSubTable(pageContext, creationData, (Element)facetBody, visualDocument, parentTheadOrTfood);
} else if(isSubTable) {
@@ -290,9 +313,16 @@
td.setAttribute(HTML.ATTR_SCOPE, "colgroup"); //$NON-NLS-1$
- VpeChildrenInfo child = new VpeChildrenInfo(td);
- child.addSourceChild(facetBody);
- creationData.addChildrenInfo(child);
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(td);
+ if (encodeAllFacetChildrenManually) {
+ for (int i = 0; i < length; i++) {
+ childrenInfo.addSourceChild(allFacetElements.item(i));
+ }
+ creationData.addChildrenInfo(childrenInfo);
+ } else {
+ childrenInfo.addSourceChild(facetBody);
+ creationData.addChildrenInfo(childrenInfo);
+ }
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2012-09-11 10:53:31 UTC (rev 43587)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2012-09-11 11:57:21 UTC (rev 43588)
@@ -72,8 +72,9 @@
Document document = pageContext.getVisualBuilder().getIncludeDocuments().get(file);
if (document == null) {
document = VpeCreatorUtil.getDocumentForRead(file);
- if (document != null)
+ if (document != null) {
pageContext.getVisualBuilder().getIncludeDocuments().put(file, document);
+ }
}
if (document != null) {
VpeCreationData creationData = createInclude(document, visualDocument);
13 years, 3 months
JBoss Tools SVN: r43587 - branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-11 06:53:31 -0400 (Tue, 11 Sep 2012)
New Revision: 43587
Modified:
branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
Log:
JBIDE-12542 : Bump default Seam version to 2.3.0.CR1 in the JBoss Maven Facet wizard page
Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
===================================================================
--- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2012-09-11 10:50:27 UTC (rev 43586)
+++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2012-09-11 10:53:31 UTC (rev 43587)
@@ -161,7 +161,7 @@
} else if ("2.2".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$
seamVersion.setText("2.2.2.Final"); //$NON-NLS-1$
} else if ("2.3".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$
- seamVersion.setText("2.3.0.Beta2"); //$NON-NLS-1$
+ seamVersion.setText("2.3.0.CR1"); //$NON-NLS-1$
}
Button removeWTPContainers = new Button(composite,SWT.CHECK);
removeWTPContainers.setText(Messages.MavenFacetInstallPage_Remove_WTP_Classpath_containers);
13 years, 3 months