January 2009 - jbosstools-commits

JBoss Tools SVN: r13309 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2009-01-28 13:12:33 -0500 (Wed, 28 Jan 2009) New Revision: 13309 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssClassNewWizardTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssFileNewWizardTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/HtmlFileNewWizardTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsFileNewWizardTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JspFileNewWizardTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/PropertiesNewWizardTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-3500 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssClassNewWizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssClassNewWizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssClassNewWizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,6 +1,8 @@ package org.jboss.tools.jsf.ui.test; +import org.eclipse.jface.wizard.IWizard; + public class CssClassNewWizardTest extends WizardTest { public CssClassNewWizardTest(){ super("org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSClassWizard"); @@ -8,4 +10,42 @@ public void testCssClassNewWizardTestIsCreated() { wizardIsCreated(); } + + public void testCssClassNewWizardValidation() { + IWizard wizard = getWizardWithoutSelection(); + + boolean canFinish = wizard.canFinish(); + + assertFalse("Finish button is enabled at first wizard page.", canFinish); + } + + public void testCssClassNewWizardValidation2() { + IWizard wizard = getWizardOnProject(); + + boolean canFinish = wizard.canFinish(); + + // Assert Finish button is enabled by default if wizard is called on Project + assertTrue("Finish button is disabled at first wizard page.", canFinish); + + // Assert Finish button is disabled and error is present if + // Folder field is empty + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field points to folder that doesn't exist + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field is empty + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains forbidden characters + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains file name that already exists + } + } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssFileNewWizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssFileNewWizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssFileNewWizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,6 +1,8 @@ package org.jboss.tools.jsf.ui.test; +import org.eclipse.jface.wizard.IWizard; + public class CssFileNewWizardTest extends WizardTest { public CssFileNewWizardTest(){ super("org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard"); @@ -8,4 +10,41 @@ public void testCssFileNewWizardTestIsCreated() { wizardIsCreated(); } + + public void testCssFileNewWizardValidation() { + IWizard wizard = getWizardWithoutSelection(); + + boolean canFinish = wizard.canFinish(); + + assertFalse("Finish button is enabled at first wizard page.", canFinish); + } + + public void testCssFileNewWizardValidation2() { + IWizard wizard = getWizardOnProject(); + + boolean canFinish = wizard.canFinish(); + + // Assert Finish button is enabled by default if wizard is called on Project + assertTrue("Finish button is disabled at first wizard page.", canFinish); + + // Assert Finish button is disabled and error is present if + // Folder field is empty + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field points to folder that doesn't exist + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field is empty + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains forbidden characters + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains file name that already exists + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,6 +1,13 @@ package org.jboss.tools.jsf.ui.test; +import java.util.ArrayList; + +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.ui.IWorkbenchWizard; +import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.util.WorkbenchUtils; @@ -14,10 +21,16 @@ } public void testFacesConfigNewWizardValidation() { - IWizard wizard = WorkbenchUtils.findWizardByDefId(id); + IWizard wizard = getWizardWithoutSelection(); + boolean canFinish = wizard.canFinish(); - System.out.println("Wizard - "+wizard.getClass()); + assertFalse("Finish button is enabled at first wizard page.", canFinish); + } + + public void testFacesConfigNewWizardValidation2() { + IWizard wizard = getWizardOnProject(); + boolean canFinish = wizard.canFinish(); // Assert Finish button is enabled by default if wizard is called on Project Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/HtmlFileNewWizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/HtmlFileNewWizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/HtmlFileNewWizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,6 +1,8 @@ package org.jboss.tools.jsf.ui.test; +import org.eclipse.jface.wizard.IWizard; + public class HtmlFileNewWizardTest extends WizardTest { public HtmlFileNewWizardTest(){ super("org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard"); @@ -9,4 +11,41 @@ public void testHtmlFileNewWizardTestIsCreated() { wizardIsCreated(); } + + public void testHtmlFileNewWizardValidation() { + IWizard wizard = getWizardWithoutSelection(); + + boolean canFinish = wizard.canFinish(); + + assertFalse("Finish button is enabled at first wizard page.", canFinish); + } + + public void testHtmlFileNewWizardValidation2() { + IWizard wizard = getWizardOnProject(); + + boolean canFinish = wizard.canFinish(); + + // Assert Finish button is enabled by default if wizard is called on Project + assertTrue("Finish button is disabled at first wizard page.", canFinish); + + // Assert Finish button is disabled and error is present if + // Folder field is empty + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field points to folder that doesn't exist + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field is empty + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains forbidden characters + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains file name that already exists + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsFileNewWizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsFileNewWizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsFileNewWizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,6 +1,8 @@ package org.jboss.tools.jsf.ui.test; +import org.eclipse.jface.wizard.IWizard; + public class JsFileNewWizardTest extends WizardTest { public JsFileNewWizardTest(){ super("org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard"); @@ -9,4 +11,41 @@ public void testJsFileNewWizardTestIsCreated() { wizardIsCreated(); } + + public void testJsFileNewWizardValidation() { + IWizard wizard = getWizardWithoutSelection(); + + boolean canFinish = wizard.canFinish(); + + assertFalse("Finish button is enabled at first wizard page.", canFinish); + } + + public void testJsFileNewWizardValidation2() { + IWizard wizard = getWizardOnProject(); + + boolean canFinish = wizard.canFinish(); + + // Assert Finish button is enabled by default if wizard is called on Project + assertTrue("Finish button is disabled at first wizard page.", canFinish); + + // Assert Finish button is disabled and error is present if + // Folder field is empty + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field points to folder that doesn't exist + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field is empty + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains forbidden characters + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains file name that already exists + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JspFileNewWizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JspFileNewWizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JspFileNewWizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,6 +1,8 @@ package org.jboss.tools.jsf.ui.test; +import org.eclipse.jface.wizard.IWizard; + public class JspFileNewWizardTest extends WizardTest { public JspFileNewWizardTest(){ super("org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard"); @@ -9,4 +11,41 @@ public void testJspFileNewWizardTestIsCreated() { wizardIsCreated(); } + + public void testJspFileNewWizardValidation() { + IWizard wizard = getWizardWithoutSelection(); + + boolean canFinish = wizard.canFinish(); + + assertFalse("Finish button is enabled at first wizard page.", canFinish); + } + + public void testJspFileNewWizardValidation2() { + IWizard wizard = getWizardOnProject(); + + boolean canFinish = wizard.canFinish(); + + // Assert Finish button is enabled by default if wizard is called on Project + assertTrue("Finish button is disabled at first wizard page.", canFinish); + + // Assert Finish button is disabled and error is present if + // Folder field is empty + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field points to folder that doesn't exist + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field is empty + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains forbidden characters + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains file name that already exists + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/PropertiesNewWizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/PropertiesNewWizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/PropertiesNewWizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,6 +1,8 @@ package org.jboss.tools.jsf.ui.test; +import org.eclipse.jface.wizard.IWizard; + public class PropertiesNewWizardTest extends WizardTest { public PropertiesNewWizardTest(){ super("org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard"); @@ -9,4 +11,41 @@ public void testPropertiesFileNewWizardTestIsCreated() { wizardIsCreated(); } + + public void testPropertiesFileNewWizardValidation() { + IWizard wizard = getWizardWithoutSelection(); + + boolean canFinish = wizard.canFinish(); + + assertFalse("Finish button is enabled at first wizard page.", canFinish); + } + + public void testPropertiesFileNewWizardValidation2() { + IWizard wizard = getWizardOnProject(); + + boolean canFinish = wizard.canFinish(); + + // Assert Finish button is enabled by default if wizard is called on Project + assertTrue("Finish button is disabled at first wizard page.", canFinish); + + // Assert Finish button is disabled and error is present if + // Folder field is empty + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field points to folder that doesn't exist + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field is empty + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains forbidden characters + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains file name that already exists + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,13 +1,20 @@ package org.jboss.tools.jsf.ui.test; +import java.util.ArrayList; + +import javax.swing.text.View; + import junit.framework.TestCase; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.ui.IViewReference; +import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.util.WorkbenchUtils; import org.jboss.tools.test.util.JobUtils; @@ -16,8 +23,10 @@ public abstract class WizardTest extends TestCase { protected String id; - private IProject project; + protected IProject project; + protected WizardDialog dialog; + public WizardTest(String id){ this.id = id; } @@ -36,12 +45,14 @@ project = setup.importProject(); } this.project = project.getProject(); - System.out.println("Project - "+project); JobUtils.waitForIdle(); } @Override protected void tearDown() throws Exception { + if(dialog != null) + dialog.close(); + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); try { JobUtils.waitForIdle(); @@ -60,11 +71,22 @@ public void wizardIsCreated() { IWizard wizard = WorkbenchUtils.findWizardByDefId(id); - WizardDialog dialog = new WizardDialog( + dialog = new WizardDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); dialog.setBlockOnOpen(false); + //dialog. dialog.open(); + +// System.out.println("\nWizard ID - "+id); +// System.out.println("Wizard Class - "+wizard.getClass()); +// +// System.out.println("Pages - "+wizard.getPages().length); +// +// for(int i = 0; i < wizard.getPages().length;i++){ +// System.out.println("Wizard Page Class - "+wizard.getPages()[i].getClass()); +// } + try { IWizardPage startPage = wizard.getStartingPage(); assertNotNull(startPage); @@ -75,4 +97,36 @@ } } + + public IWizard getWizardWithoutSelection(){ + IWizard wizard = WorkbenchUtils.findWizardByDefId(id); + + dialog = new WizardDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + wizard); + dialog.setBlockOnOpen(false); + dialog.open(); + + return wizard; + } + + public IWizard getWizardOnProject(){ + ArrayList<IProject> list = new ArrayList<IProject>(); + + list.add(project); + + StructuredSelection selection = new StructuredSelection(list); + + IWizard wizard = WorkbenchUtils.findWizardByDefId(id); + + ((IWorkbenchWizard)wizard).init(PlatformUI.getWorkbench(), selection); + + dialog = new WizardDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + wizard); + dialog.setBlockOnOpen(false); + dialog.open(); + + return wizard; + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java 2009-01-28 16:54:26 UTC (rev 13308) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java 2009-01-28 18:12:33 UTC (rev 13309) @@ -1,6 +1,8 @@ package org.jboss.tools.jsf.ui.test; +import org.eclipse.jface.wizard.IWizard; + public class XhtmlFileNewWizardTest extends WizardTest { public XhtmlFileNewWizardTest(){ super("org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard"); @@ -9,4 +11,41 @@ public void testXhtmlFileNewWizardTestIsCreated() { wizardIsCreated(); } + + public void testXhtmlFileNewWizardValidation() { + IWizard wizard = getWizardWithoutSelection(); + + boolean canFinish = wizard.canFinish(); + + assertFalse("Finish button is enabled at first wizard page.", canFinish); + } + + public void testXhtmlFileNewWizardValidation2() { + IWizard wizard = getWizardOnProject(); + + boolean canFinish = wizard.canFinish(); + + // Assert Finish button is enabled by default if wizard is called on Project + assertTrue("Finish button is disabled at first wizard page.", canFinish); + + // Assert Finish button is disabled and error is present if + // Folder field is empty + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field points to folder that doesn't exist + // All other fields are correct + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field is empty + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains forbidden characters + + // Assert Finish button is disabled and error is present if + // Folder field is correct + // Name field contains file name that already exists + } }

15 years, 12 months

1
0
0 / 0

JBoss Tools SVN: r13308 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.jsf/templates and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2009-01-28 11:54:26 -0500 (Wed, 28 Jan 2009) New Revision: 13308 Removed: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandLink.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml 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.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml Log: RESOLVED - issue JBIDE-3616: The resizer is not showed when an input component is selected by mouse. https://jira.jboss.org/jira/browse/JBIDE-3616 AFFECTED issues: 1. JBIDE-3511: Text body of h:outputText and h:outputFormat is rendered in incorrect sequence. https://jira.jboss.org/jira/browse/JBIDE-3511 2. JBIDE-3512: Text bodies of tags h:commandButton, h:inputSecret, h:inputText and h:inputTextarea are not rendered by VPE. https://jira.jboss.org/jira/browse/JBIDE-3512 - All changes related to the issues JBIDE-3511 and JBIDE-3512 have been rolled back Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandButtonTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,80 +0,0 @@ -package org.jboss.tools.jsf.vpe.jsf.template; - -import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil; -import org.jboss.tools.vpe.editor.context.VpePageContext; -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.jboss.tools.vpe.editor.util.VisualDomUtil; -import org.jboss.tools.vpe.editor.util.VpeStyleUtil; -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; - -public class JsfCommandButtonTemplate extends AbstractOutputJsfTemplate { - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - nsIDOMDocument visualDocument) { - - Element sourceElement = (Element) sourceNode; - - nsIDOMElement contentSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement firstSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement lastSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement input = visualDocument.createElement(HTML.TAG_INPUT); - - VpeCreationData creationData = new VpeCreationData(contentSpan); - - boolean disabled = ComponentUtil.string2boolean(ComponentUtil - .getAttribute(sourceElement, HTML.ATTR_DISABLED)); - String type = sourceElement.getAttribute(HTML.ATTR_TYPE); - String image = sourceElement.getAttribute(HTML.VALUE_TYPE_IMAGE); - String value = sourceElement.getAttribute(HTML.ATTR_VALUE); - String style = sourceElement.getAttribute(HTML.ATTR_STYLE); - String clazz = sourceElement.getAttribute(HTML.ATTR_CLASS); - String dir = sourceElement.getAttribute(HTML.ATTR_DIR); - - if (ComponentUtil.isNotBlank(image)) { - type = HTML.VALUE_TYPE_IMAGE; - String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(image, pageContext, true); - input.setAttribute(HTML.ATTR_SRC, imgFullPath); - } - - if (ComponentUtil.isBlank(type)) { - type = HTML.VALUE_TYPE_BUTTON; - } - input.setAttribute(HTML.ATTR_TYPE, type); - - if (ComponentUtil.isNotBlank(value)) { - input.setAttribute(HTML.ATTR_VALUE, value); - } - if (ComponentUtil.isNotBlank(style)) { - input.setAttribute(HTML.ATTR_VALUE, style); - } - if (ComponentUtil.isNotBlank(clazz)) { - input.setAttribute(HTML.ATTR_VALUE, clazz); - } - if (ComponentUtil.isNotBlank(dir)) { - input.setAttribute(HTML.ATTR_VALUE, dir); - } - - if (disabled) { - input.setAttribute(HTML.ATTR_DISABLED, HTML.ATTR_DISABLED); - } - - VpeChildrenInfo spanInfo = new VpeChildrenInfo(firstSpan); - creationData.addChildrenInfo(spanInfo); - NodeList nodeList = sourceElement.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node child = nodeList.item(i); - spanInfo.addSourceChild(child); - } - contentSpan.appendChild(firstSpan); - contentSpan.appendChild(lastSpan); - firstSpan.appendChild(input); - return creationData; - } - -} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputSecretTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,17 +0,0 @@ -package org.jboss.tools.jsf.vpe.jsf.template; - -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.mozilla.interfaces.nsIDOMDocument; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -public class JsfInputSecretTemplate extends JsfInputTextTemplate { - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - nsIDOMDocument visualDocument) { - VpeCreationData creationData = createInputElement(visualDocument, (Element) sourceNode, true); - return creationData; - } - -} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -16,10 +16,8 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.AttributeData; import org.jboss.tools.vpe.editor.mapping.VpeElementData; -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.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMHTMLTextAreaElement; @@ -27,7 +25,6 @@ import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class JsfInputTextAreaTemplate extends AbstractEditableJsfTemplate { @@ -35,22 +32,16 @@ nsIDOMDocument visualDocument) { Element sourceElement = (Element) sourceNode; - /* - * https://jira.jboss.org/jira/browse/JBIDE-3512 - * Container for correct children encoding was added. - * Author: dmaliarevich - */ - nsIDOMElement contentSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement firstSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement lastSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement textArea = visualDocument.createElement(HTML.TAG_TEXTAREA); + + nsIDOMElement textArea = visualDocument + .createElement(HTML.TAG_TEXTAREA); // Commented as fix for JBIDE-3012. // ((nsIDOMHTMLTextAreaElement) textArea // .queryInterface(nsIDOMHTMLTextAreaElement.NS_IDOMHTMLTEXTAREAELEMENT_IID)) // .setReadOnly(true); - VpeCreationData creationData = new VpeCreationData(contentSpan); + VpeCreationData creationData = new VpeCreationData(textArea); copyGeneralJsfAttributes(sourceElement, textArea); ComponentUtil.copyDisabled(sourceElement, textArea); @@ -77,17 +68,7 @@ } textArea.appendChild(text); creationData.setElementData(elementData); - VpeChildrenInfo spanInfo = new VpeChildrenInfo(firstSpan); - creationData.addChildrenInfo(spanInfo); - NodeList nodeList = sourceElement.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node child = nodeList.item(i); - spanInfo.addSourceChild(child); - } - - contentSpan.appendChild(firstSpan); - contentSpan.appendChild(lastSpan); - lastSpan.appendChild(textArea); + return creationData; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -11,49 +11,30 @@ package org.jboss.tools.jsf.vpe.jsf.template; -import java.util.ArrayList; -import java.util.List; - import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil; import org.jboss.tools.jsf.vpe.jsf.template.util.JSF; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.AttributeData; import org.jboss.tools.vpe.editor.mapping.VpeElementData; -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.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class JsfInputTextTemplate extends AbstractEditableJsfTemplate { public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - VpeCreationData creationData = createInputElement(visualDocument, (Element) sourceNode, false); - return creationData; - } - protected VpeCreationData createInputElement(nsIDOMDocument visualDocument, - Element sourceElement, - boolean typePassword) { - - /* - * https://jira.jboss.org/jira/browse/JBIDE-3512 - * Container for correct children encoding was added. - * Author: dmaliarevich - */ - nsIDOMElement contentSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement firstSpan = VisualDomUtil.createBorderlessContainer(visualDocument); - nsIDOMElement lastSpan = VisualDomUtil.createBorderlessContainer(visualDocument); + Element sourceElement = (Element) sourceNode; + nsIDOMElement input = visualDocument.createElement(HTML.TAG_INPUT); - VpeCreationData creationData = new VpeCreationData(contentSpan); - + VpeCreationData creationData = new VpeCreationData(input); + copyGeneralJsfAttributes(sourceElement, input); ComponentUtil.copyDisabled(sourceElement, input); @@ -61,34 +42,24 @@ copyAttribute(input, sourceElement, JSF.ATTR_SIZE, HTML.ATTR_SIZE); copyAttribute(input, sourceElement, JSF.ATTR_DIR, HTML.ATTR_DIR); - if (typePassword) { - input.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_PASSWORD); - } - VpeElementData elementData = new VpeElementData(); if (sourceElement.hasAttribute(JSF.ATTR_VALUE)) { - Attr attr = sourceElement.getAttributeNode(JSF.ATTR_VALUE); - elementData.addNodeData(new AttributeData(attr, input, true)); + + Attr attr = sourceElement.getAttributeNode(JSF.ATTR_VALUE); + elementData + .addNodeData(new AttributeData(attr, input, true)); + } else { - elementData.addNodeData(new AttributeData(JSF.ATTR_VALUE, input, - true)); + + elementData.addNodeData(new AttributeData(JSF.ATTR_VALUE, + input, true)); + } creationData.setElementData(elementData); - VpeChildrenInfo spanInfo = new VpeChildrenInfo(firstSpan); - creationData.addChildrenInfo(spanInfo); - NodeList nodeList = sourceElement.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node child = nodeList.item(i); - spanInfo.addSourceChild(child); - } - - contentSpan.appendChild(firstSpan); - contentSpan.appendChild(lastSpan); - lastSpan.appendChild(input); return creationData; } - + @Override public Attr getOutputAttributeNode(Element element) { // TODO Auto-generated method stub @@ -102,5 +73,4 @@ return true; } - } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -21,7 +21,6 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.w3c.dom.Attr; @@ -73,24 +72,16 @@ Element element = (Element) sourceNode; - // create container - nsIDOMElement mainContainer = VisualDomUtil.createBorderlessContainer(visualDocument); + // create span element + nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN); + // creation data - VpeCreationData creationData = new VpeCreationData(mainContainer); - - VisualDomUtil.appendChildrenInsertionPoint(element, mainContainer, creationData, visualDocument); - - // create container for values of attributes, for tag body - // and append them them to main container - nsIDOMElement attributeValueContainer = VisualDomUtil.createBorderlessContainer(visualDocument); - mainContainer.appendChild(attributeValueContainer); + VpeCreationData creationData = new VpeCreationData(span); - - // copy attributes - copyOutputJsfAttributes(attributeValueContainer, element); + copyOutputJsfAttributes(span, element); - processOutputAttribute(pageContext, visualDocument, element, attributeValueContainer, + processOutputAttribute(pageContext, visualDocument, element, span, creationData); return creationData; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -11,16 +11,13 @@ package org.jboss.tools.jsf.vpe.jsf.template; import org.jboss.tools.vpe.editor.context.VpePageContext; -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.jboss.tools.vpe.editor.util.VisualDomUtil; 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; /** * @author Sergey Dzmitrovich @@ -41,30 +38,28 @@ Element element = (Element) sourceNode; - nsIDOMElement mainContainer = VisualDomUtil.createBorderlessContainer(visualDocument); - VpeCreationData creationData = new VpeCreationData(mainContainer); + // create span element + nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN); - VisualDomUtil.appendChildrenInsertionPoint(element, mainContainer, creationData, visualDocument); - - // create container for values of attributes, for tag body - // and append them them to main container - nsIDOMElement attributeValueContainer = VisualDomUtil.createBorderlessContainer(visualDocument); - mainContainer.appendChild(attributeValueContainer); - // creation data + VpeCreationData creationData = new VpeCreationData(span); // copy attributes - copyOutputJsfAttributes(attributeValueContainer, element); - processOutputAttribute(pageContext, visualDocument, element, attributeValueContainer, + copyOutputJsfAttributes(span, element); + + processOutputAttribute(pageContext, visualDocument, element, span, creationData); return creationData; + } @Override public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement visualNode, Object data, String name, String value) { + return true; } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -31,7 +31,7 @@ </vpe:tag> <vpe:tag name="h:inputText" case-sensitive="yes"> - <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextTemplate"> + <vpe:template children="no" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextTemplate">  @@ -57,7 +57,7 @@ </vpe:tag> <vpe:tag name="h:inputTextarea" case-sensitive="yes"> - <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextAreaTemplate"> + <vpe:template children="no" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextAreaTemplate">  + size="{@size}" dir="{@dir}" /> <vpe:resize> <vpe:width width-attr="style.width" /> <vpe:height height-attr="style.height" /> @@ -180,23 +180,10 @@  <vpe:tag name="h:commandButton" case-sensitive="yes"> - <vpe:template children="yes" modify="no" - class="org.jboss.tools.jsf.vpe.jsf.template.JsfCommandButtonTemplate"> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> -  - + </vpe:if>  -  + </vpe:if>  </vpe:tag> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandLink.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandLink.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandLink.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,14 +1,11 @@ <tests> <test id="commandLink1"> - <A STYLE="-moz-user-modify: read-write;"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"></SPAN> - <SPAN CLASS="vpe-text">Say Hello</SPAN> - </SPAN> + <A DIR="" STYLE="-moz-user-modify: read-write;"> + <SPAN>Say Hello</SPAN> </A> </test> <test id="commandLink2"> - <A STYLE="-moz-user-modify: read-write;"> + <A DIR="" STYLE="-moz-user-modify: read-write;"> <SPAN>Link</SPAN> </A> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,13 +1,7 @@ <tests> <test id="portlet"> - <SPAN STYLE="-moz-user-modify: read-only;"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - .... - </SPAN> - </SPAN> + <SPAN STYLE="-moz-user-modify: read-only;"> + <SPAN> ....</SPAN> </SPAN> </test> </tests> \ No newline at end of file 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 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,6 @@ <tests> <test id="status1"> - <SPAN> + <SPAN CLASS="" STYLE=""> <SPAN> Complete </SPAN> @@ -12,12 +12,8 @@ STOP TEXT </SPAN> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - FACET STOP OUTPUT TEXT - </SPAN> + <SPAN> + FACET STOP OUTPUT TEXT </SPAN> </DIV> </SPAN> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -5,11 +5,9 @@ </head> <body> <f:view> - <b> - <h:outputFormat value="{0}"> - <f:param value="paramValue" /> - </h:outputFormat> - </b> + <b><h:outputFormat value="{0}" + ><f:param value="paramValue" + /></h:outputFormat></b> </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,62 +1,53 @@ <tests> <test id="body_test"> - <DIV ID="body_test" STYLE="-moz-user-modify: read-write;" > - <TABLE STYLE="background-color: red;" CLASS="dr-table rich-table"> - <COLGROUP SPAN="1"> - </COLGROUP> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: green;" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - #{test.color} - </SPAN> - </TD> - </TR> - </TABLE> - <DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 100px; height: 100px;"> - <TABLE CLASS="dr-table rich-sdt"> - <COLGROUP SPAN="1"> - </COLGROUP> - <TBODY HEIGHT="100" STYLE="background-color: blue;" WIDTH="100px;"> - </TBODY> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<DIV ID="body_test" STYLE="-moz-user-modify: read-write;"> +<TABLE STYLE="background-color: red;" CLASS="dr-table rich-table"> +<COLGROUP SPAN="1"> +</COLGROUP> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: green;" CLASS="dr-table-cell rich-table-cell"> +<SPAN CLASS="vpe-text"> +#{test.color} +</SPAN> +</TD> +</TR> +</TABLE> +<DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 100px; height: 100px;"> +<TABLE CLASS="dr-table rich-sdt"> +<COLGROUP SPAN="1"> +</COLGROUP> +<TBODY HEIGHT="100" STYLE="background-color: blue;" WIDTH="100px;"> +</TBODY> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</TD> +</TR> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</TD> +</TR> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</TD> +</TR> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</TD> +</TR> +<TR CLASS="dr-table-firstrow rich-table-firstrow"> +<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - </TABLE> - </DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text" STYLE="background-color: pink;"> - ssssssssss - </SPAN> - </SPAN> - </DIV> +</TD> +</TR> +</TABLE> +</DIV> +<SPAN STYLE="background-color: pink;"> +ssssssssss +</SPAN> +</DIV> </test> </tests> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,32 +1,29 @@ <tests> <test id="test_el"> - - <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> - <SPAN CLASS="message" STYLE="-moz-user-modify: read-only;"> - Error Messages - </SPAN> - <DIV CLASS="dr-pnl rich-panel" STYLE=""> - <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - 123456789 Test El expression Test El expression Test El expression - </SPAN> - <DIV - STYLE="width: 109px; height: 106px; background-color: green; -moz-user-modify: read-write;"> - <BR VPE:PSEUDO-ELEMENT="yes" - STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" /> - </DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Hello - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - Name: Test El expression - </SPAN> - </DIV> +<FORM + STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> + <SPAN CLASS="message" STYLE="-moz-user-modify: read-only;"> + Error Messages +</SPAN> + <DIV CLASS="dr-pnl rich-panel" STYLE=""> + <DIV CLASS="dr-pnl-b rich-panel-body"> + <SPAN> + 123456789 Test El expression Test El expression Test El expression +</SPAN> + <DIV + STYLE="width: 109px; height: 106px; background-color: green; -moz-user-modify: read-write;"> + <BR VPE:PSEUDO-ELEMENT="yes" + STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"> + </BR> </DIV> - </FORM> - </test> + <SPAN> + Hello +</SPAN> + <SPAN> + Name: Test El expression +</SPAN> + </DIV> + </DIV> +</FORM> +</test> </tests> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,108 +1,82 @@ <tests> <test id="jbide3376"> + <DIV ID="jbide3376"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<TABLE STYLE="-moz-user-modify: read-only;"> +<TR> +<TD> +<DIV> +<TABLE> +<CAPTION> +</CAPTION> +<THEAD> +<TR> +<TH> +<DIV> +<SPAN> +Header +</SPAN> +</DIV> +</TH> +</TR> +</THEAD> +<TFOOT> +<TR> +<TD> +<DIV> +<SPAN> +Header +</SPAN> +</DIV> +</TD> +</TR> +</TFOOT> +<TBODY> +<TR> +<TD STYLE="border: 0px hidden ; padding: 0px;"> +<TABLE WIDTH="100%" BORDER="0"> +<TBODY> +<TR> +<TD> +<SPAN> +#{book.name} +</SPAN> +</TD> +<TD> +<SPAN> +#{book.name} +</SPAN> +</TD> +</TR> +</TBODY> +<COLGROUP> +<COL STYLE="-moz-user-modify: read-write;"/> - <DIV ID="jbide3376" > - <TABLE - STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> - <TR> - <TD> - <DIV> - <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> - <TABLE STYLE="-moz-user-modify: read-only;"> - <TR> - <TD> - <DIV> - <TABLE> - <CAPTION> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<COL STYLE="-moz-user-modify: read-write;"/> - </CAPTION> - <THEAD> - <TR> - <TH > - <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Header - </SPAN> - </SPAN> - </DIV> - </TH> - </TR> - </THEAD> - <TFOOT> - <TR> - <TD > - <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Header - </SPAN> - </SPAN> - </DIV> - </TD> - </TR> - </TFOOT> - <TBODY> - <TR> - <TD STYLE="border: 0px hidden ; padding: 0px;"> - <TABLE WIDTH="100%" BORDER="0"> - <TBODY> - <TR> - <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{book.name} - </SPAN> - </SPAN> - </TD> - <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{book.name} - </SPAN> - </SPAN> - </TD> - </TR> - </TBODY> - <COLGROUP> - <COL STYLE="-moz-user-modify: read-write;" /> +</COLGROUP> +</TABLE> +</TD> +</TR> +</TBODY> +</TABLE> +</DIV> +</TD> +</TR> +</TABLE><A>Go next page:</A><BR STYLE="-moz-user-modify: read-write;"/> - <COL STYLE="-moz-user-modify: read-write;" /> - - </COLGROUP> - </TABLE> - </TD> - </TR> - </TBODY> - </TABLE> - </DIV> - </TD> - </TR> - </TABLE> - <A>Go next page:</A> - <BR STYLE="-moz-user-modify: read-write;" /> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Begin - </SPAN> - </SPAN> - </FORM> - </DIV> - </TD> - </TR> - </TABLE> - </DIV> - </test> +<SPAN> +Begin +</SPAN> +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> +</test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -21,10 +21,6 @@ <h:commandButton value="commandButton5" id="commandButton5" image="" /> - <h:commandButton value="Fight" id="commandButton6"><p>h:commandButton</p></h:commandButton> - - <h:commandButton value="commandButton7" id="commandButton7" type="button" disabled="true"/> - </h:form> </f:view> </body> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,74 +1,17 @@ <tests> <test id="commandButton1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="button" value="commandButton"/> </test> <test id="commandButton2"> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton1" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="button" value="commandButton1" /> </test> <test id="commandButton3"> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton3" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="reset" value="commandButton3" /> </test> <test id="commandButton4"> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton4" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="submit" value="commandButton4" /> </test> <test id="commandButton5"> - - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton5" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <input type="image" SRC="/.*ve/unresolved_image.gif/" /> </test> - <test id="commandButton6"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="Fight" /> - <P STYLE="-moz-user-modify: read-write;"> - <SPAN CLASS="vpe-text"> - h:commandButton - </SPAN> - </P> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> - </test> - <test id="commandButton7"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="commandButton7" DISABLED="disabled" /> - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,14 +1,12 @@ <tests> <test id="dataTable"> - - <TABLE STYLE="-moz-user-modify: read-only;" > + <TABLE STYLE="-moz-user-modify: read-only;"> <TR> <TD> <DIV> <TABLE> <CAPTION> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </CAPTION> <TBODY> <TR> @@ -18,24 +16,12 @@ <TR> <TH> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Last Name - </SPAN> - </SPAN> + <SPAN>Last Name</SPAN> </DIV> </TH> <TH> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - First Name - </SPAN> - </SPAN> + <SPAN>First Name</SPAN> </DIV> </TH> </TR> @@ -44,24 +30,12 @@ <TR> <TD> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer - </SPAN> - </SPAN> + <SPAN>footer</SPAN> </DIV> </TD> <TD> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer - </SPAN> - </SPAN> + <SPAN>footer</SPAN> </DIV> </TD> </TR> @@ -69,30 +43,16 @@ <TBODY> <TR> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Dupont - </SPAN> - </SPAN> + <SPAN>Dupont</SPAN> </TD> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - William - </SPAN> - </SPAN> + <SPAN>William</SPAN> </TD> </TR> </TBODY> <COLGROUP> - <COL STYLE="-moz-user-modify: read-write;" /> - - <COL STYLE="-moz-user-modify: read-write;" /> - + <COL STYLE="-moz-user-modify: read-write;"/> + <COL STYLE="-moz-user-modify: read-write;"/> </COLGROUP> </TABLE> </TD> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,13 +1,7 @@ <tests> <test id="facet"> - <DIV > - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Last Name - </SPAN> - </SPAN> + <DIV> + <SPAN> Last Name</SPAN> </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -9,10 +9,8 @@ <f:view> <h1><h:outputText value="inputSecret" /></h1> - <h:inputSecret value="inputSecret" id="inputSecret1"/> + <h:inputSecret value="inputSecret" id="inputSecret"/> - <h:inputSecret value="asdsfsdfsdfkmsdkfdf" id="inputSecret2">h:inputSecret </h:inputSecret> - </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputSecret.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,24 +1,5 @@ <tests> - <test id="inputSecret1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="password" VALUE="inputSecret" /> - </SPAN> - </SPAN> + <test id="inputSecret"> + <input type="password" /> </test> - <test id="inputSecret2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - h:inputSecret - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="password" VALUE="asdsfsdfsdfkmsdkfdf" /> - - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -9,9 +9,8 @@ <f:view> <h1><h:outputText value="inputText" /></h1> - <h:inputText id="inputText1" value="inputText"/> + <h:inputText id="inputText" value="inputText"/> - <h:inputText id="inputText2" value="Test verbtim for h:inputSecret ">h:inputText</h:inputText> </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputText.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,23 +1,5 @@ <tests> - <test id="inputText1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT VALUE="inputText" /> - </SPAN> - </SPAN> + <test id="inputText"> + <input /> </test> - <test id="inputText2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - h:inputText - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT VALUE="Test verbtim for h:inputSecret " /> - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -9,10 +9,8 @@ <f:view> <h1><h:outputText value="inputTextArea" /></h1> - <h:inputTextarea value="inputTextArea" id="inputTextArea1" /> + <h:inputTextarea value="inputTextArea" id="inputTextArea" /> - <h:inputTextarea value="Test text for h:inputTextarea " id="inputTextArea2">h:inputTextarea</h:inputTextarea> - </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,27 +1,5 @@ <tests> - <test id="inputTextArea1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <TEXTAREA> - inputTextArea - </TEXTAREA> - </SPAN> - </SPAN> + <test id="inputTextArea"> + <TEXTAREA> inputTextArea </TEXTAREA> </test> - <test id="inputTextArea2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - h:inputTextarea - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <TEXTAREA> - Test text for h:inputTextarea - </TEXTAREA> - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -8,15 +8,14 @@ <f:view> <h1><h:outputText value="outputFormat" /></h1> -<div> + <h:outputFormat value="outputFormat1" id="outputFormat1" /> <h:outputFormat escape="true" value="outputFormat2" id="outputFormat2" /> <h:outputFormat escape="false" value="outputFormat3" id="outputFormat3" /> <h:outputFormat value="{0}" id="outputFormat4"> <f:param value="outputFormat4" /> </h:outputFormat> - <h:outputFormat value="5" id="outputFormat5">outputFormat</h:outputFormat> -</div> + </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,52 +1,16 @@ <tests> <test id="outputFormat1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputFormat1 - </SPAN> - </SPAN> + <SPAN> outputFormat1 </SPAN> </test> <test id="outputFormat2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputFormat2 - </SPAN> - </SPAN> + <SPAN> outputFormat2 </SPAN> </test> <test id="outputFormat3"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - outputFormat3 - </SPAN> - </SPAN> + <SPAN> + <SPAN> outputFormat3 </SPAN> </SPAN> </test> <test id="outputFormat4"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputFormat4 - </SPAN> - </SPAN> + <SPAN> outputFormat4 </SPAN> </test> - <test id="outputFormat5"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - outputFormat - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - 5 - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp 2009-01-28 16:54:26 UTC (rev 13308) @@ -12,7 +12,7 @@ <h:outputText value="outputText1" id="outputText1" /> <h:outputText value="outputText2" id="outputText2" escape="true" /> <h:outputText value="outputText3" id="outputText3" escape="false" /> - <h:outputText value="4" id="outputText4">outputText</h:outputText> + </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,44 +1,13 @@ <tests> <test id="outputText1"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputText1 - </SPAN> - </SPAN> - <SPAN>outputText1</SPAN> + <SPAN> outputText1</SPAN> </test> <test id="outputText2"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - outputText2 - </SPAN> - </SPAN> + <SPAN> outputText2</SPAN> </test> <test id="outputText3"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - outputText3 - </SPAN> - </SPAN> + <SPAN> + <SPAN> outputText3</SPAN> </SPAN> </test> - <test id="outputText4"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - outputText - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - 4 - </SPAN> - </SPAN> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,6 @@ <tests> <test id="panelGrid"> - <TABLE STYLE="-moz-user-modify: read-write;" > + <TABLE> <TR> <TD> <DIV> @@ -8,62 +8,26 @@ <TBODY> <TR CLASS="oddRows"> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - column 1 - </SPAN> - </SPAN> + <SPAN> column 1 </SPAN> </TD> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - column 2 - </SPAN> - </SPAN> + <SPAN> column 2 </SPAN> </TD> </TR> <TR CLASS="evenRows"> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 1 - </SPAN> - </SPAN> + <SPAN> 1 </SPAN> </TD> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 2 - </SPAN> - </SPAN> + <SPAN> 2 </SPAN> </TD> </TR> <TR CLASS="oddRows"> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 3 - </SPAN> - </SPAN> + <SPAN> 3 </SPAN> </TD> <TD> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 4 - </SPAN> - </SPAN> + <SPAN> 4 </SPAN> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,38 +1,14 @@ <tests> <test id="panelGroup1"> - <SPAN STYLE="-moz-user-modify: read-write;" > - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 1 - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 2 - </SPAN> - </SPAN> + <SPAN> + <SPAN> 1</SPAN> + <SPAN> 2</SPAN> </SPAN> </test> <test id="panelGroup2"> - <DIV STYLE="-moz-user-modify: read-write;" > - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 3 - </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - 4 - </SPAN> - </SPAN> + <DIV> + <SPAN> 3</SPAN> + <SPAN> 4</SPAN> </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -59,10 +59,10 @@ TestUtil.findAllElementsByName(rst, elements, HTML.TAG_SPAN); - assertEquals("Number of divs should be equals 3", 3, elements.size()); //$NON-NLS-1$ + assertEquals("Count of divs should be equals 1", 1, elements.size()); //$NON-NLS-1$ final nsIDOMElement spanOne = (nsIDOMElement) elements.get(0).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - assertEquals("Style attribute should be substituted", VALUE_4, spanOne.getLastChild().getFirstChild().getNodeValue()); //$NON-NLS-1$ + assertEquals("Style attribute should be substituted", VALUE_4, spanOne.getFirstChild().getNodeValue()); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -44,9 +44,9 @@ setException(null); //test for element node - testCaretManupulationWithoutElSubstitution("JBIDE/2505/testJBIDE2505.jsp", 11, 34); //$NON-NLS-1$ + testCaretManupulationWithoutElSubstitution("JBIDE/2505/testJBIDE2505.jsp",11, 34); //$NON-NLS-1$ //test for sourceNode - testCaretManupulationWithoutElSubstitution("JBIDE/2505/testJBIDE2505.jsp", 12, 58); //$NON-NLS-1$ + testCaretManupulationWithoutElSubstitution("JBIDE/2505/testJBIDE2505.jsp",12, 58); //$NON-NLS-1$ if(getException()!=null) { throw getException(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -170,7 +170,7 @@ nsIDOMNode node = SelectionUtil.getLastSelectedNode(controller.getPageContext()); - assertEquals("Node names should be equals.", "Hello", node.getLastChild().getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Node names should be equals", "Hello", node.getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2009-01-28 16:54:26 UTC (rev 13308) @@ -282,22 +282,25 @@ // disabled="true", so number of "a" tags must be one assertEquals(1, spanElements.size()); - nsIDOMNode outputFormat = spanElements.get(0); + nsIDOMNode span = spanElements.get(0); - nsIDOMNodeList outputFormatChildren = outputFormat.getChildNodes(); - assertNotNull(outputFormatChildren); - assertEquals(outputFormatChildren.getLength(), 2); - - nsIDOMNode fParamContainer = outputFormatChildren.item(1); - assertNotNull(fParamContainer); - - nsIDOMNodeList fParamContainerChildren = fParamContainer.getChildNodes(); - assertNotNull(fParamContainerChildren); - assertTrue(fParamContainerChildren.getLength() > 0); - - nsIDOMNode text = fParamContainerChildren.item(0); - assertEquals("paramValue", text.getNodeValue()); + nsIDOMNodeList children = span.getChildNodes(); + assertNotNull(children); + boolean isFind = false; + for (int i = 0; i < children.getLength(); i++) { + + nsIDOMNode text = children.item(i); + + if ("paramValue".equals(text.getNodeValue())) { //$NON-NLS-1$ + isFind = true; + break; + } + + assertEquals(true, isFind); + + } + // check exception if (getException() != null) { throw getException(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,47 +1,22 @@ <tests> <test id="column1"> - <TD COLSPAN="3" ID="column1" CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - FIELDS - </SPAN> - </SPAN> + <TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell"> + <SPAN> FIELDS</SPAN> </TD> </test> <test id="column2"> - <TD BREAKBEFORE="true" ID="column2" - CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field1 - </SPAN> - </SPAN> + <TD BREAKBEFORE="true" CLASS="dr-table-headercell rich-table-headercell"> + <SPAN> field1</SPAN> </TD> </test> <test id="column3"> - <TD ID="column3" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{row.field1} - </SPAN> - </SPAN> + <TD CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{row.field1}</SPAN> </TD> </test> <test id="column4"> - <TD ID="column4" CLASS="dr-table-footercell rich-table-footercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer1 - </SPAN> - </SPAN> + <TD CLASS="dr-table-footercell rich-table-footercell"> + <SPAN> footer1</SPAN> </TD> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml 2009-01-28 16:54:26 UTC (rev 13308) @@ -5,6 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> + <head> </head> <body> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,14 +1,7 @@ <tests> <test id="columns"> - <TD VALUE="#{bookList.books}" VAR="label" ID="columns" - CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{book.price} - </SPAN> - </SPAN> + <TD CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{book.price}</SPAN> </TD> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,212 +1,111 @@ <tests> <test id="dataDefinitionList"> - <DL CLASS="yellow-background"> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass blue-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass blue-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> <DT CLASS="headerClass"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - TERM-VISIBLE + <SPAN> + TERM-VISIBLE </SPAN> - </SPAN> </DIV> </DT> <DD CLASS="columnClass red-text"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col1 + <SPAN> + col1 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col2 + <SPAN> + col2 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col3 + <SPAN> + col3 </SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - col4 + <SPAN> + col4 </SPAN> - </SPAN> </DD> </DL> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -11,22 +11,14 @@ <DIV CLASS="dr-pnl rich-panel"> <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url$.*resources/common/background.gif$;/"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} + <SPAN> + #{data.number} </SPAN> - </SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </DIV> </DIV> </TD> @@ -34,22 +26,14 @@ <DIV CLASS="dr-pnl rich-panel"> <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url$.*resources/common/background.gif$;/"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} + <SPAN> + #{data.number} </SPAN> - </SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </DIV> </DIV> </TD> @@ -59,22 +43,14 @@ <DIV CLASS="dr-pnl rich-panel"> <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url$.*resources/common/background.gif$;/"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} + <SPAN> + #{data.number} </SPAN> - </SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </DIV> </DIV> </TD> @@ -82,22 +58,14 @@ <DIV CLASS="dr-pnl rich-panel"> <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url$.*resources/common/background.gif$;/"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} + <SPAN> + #{data.number} </SPAN> - </SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </DIV> </DIV> </TD> @@ -105,9 +73,9 @@ </TBODY> </TABLE> </test> + <test id="dataGrid2"> - <test id="dataGrid2"> <TABLE VALUE="#{bean.dtList}" VAR="data" ID="dataGrid2" CLASS="dr-table rich-table"> <COLGROUP SPAN="1"> @@ -118,13 +86,9 @@ <SPAN CLASS="vpe-text"> AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </TD> </TR> <TR CLASS="dr-table-row rich-table-row"> @@ -132,13 +96,9 @@ <SPAN CLASS="vpe-text"> AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </TD> </TR> <TR CLASS="dr-table-row rich-table-row"> @@ -146,13 +106,9 @@ <SPAN CLASS="vpe-text"> AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} + <SPAN> + #{data.field1} </SPAN> - </SPAN> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,65 +1,16 @@ <tests> <test id="dataList"> - <UL VAR="data" VALUE="#{bean.dtList}" ROWS="4" ID="dataList" CLASS="dr-list rich-datalist"> <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field1: -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field1} -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field2: -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field2} -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field3: -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.field3} -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - number: -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{data.number} -</SPAN> - </SPAN> + <SPAN> field1:</SPAN> + <SPAN > #{data.field1}</SPAN> + <SPAN> field2:</SPAN> + <SPAN> #{data.field2}</SPAN> + <SPAN> field3:</SPAN> + <SPAN> #{data.field3}</SPAN> + <SPAN> number:</SPAN> + <SPAN> #{data.number}</SPAN> </LI> </UL> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,228 +1,30 @@ <tests> <test id="dataOrderedList"> - - <OL TYPE="A" ID="dataOrderedList" VALUE="" ROWS="5" - CLASS="dr-list rich-orderedlist"> + <OL TYPE="A" VALUE="" ROWS="5" CLASS="dr-list rich-orderedlist"> <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> + <SPAN> row=1 </SPAN> + <SPAN> row=2 </SPAN> + <SPAN> row=3 </SPAN> + <SPAN> row=4 </SPAN> + <SPAN> row=5 </SPAN> + <SPAN> row=6 </SPAN> </LI> <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> + <SPAN> row=1 </SPAN> + <SPAN> row=2 </SPAN> + <SPAN> row=3 </SPAN> + <SPAN> row=4 </SPAN> + <SPAN> row=5 </SPAN> + <SPAN> row=6 </SPAN> </LI> <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> + <SPAN> row=1 </SPAN> + <SPAN> row=2 </SPAN> + <SPAN> row=3 </SPAN> + <SPAN> row=4 </SPAN> + <SPAN> row=5 </SPAN> + <SPAN> row=6 </SPAN> </LI> - <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> - </LI> - <LI CLASS="dr-list-item rich-list-item"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=1 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=2 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=3 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=4 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=5 -</SPAN> - </SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - row=6 -</SPAN> - </SPAN> - </LI> </OL> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,57 +1,28 @@ <tests> <test id="dataTable"> - <TABLE WIDTH="700" CELLSPACING="0" CELLPADDING="0" BORDER="0" - VAR="row" VALUE="#{bean.dtList}" ROWKEYVAR="rowKey" ID="dataTable" - CLASS="dr-table rich-table"> + VAR="row" VALUE="#{bean.dtList}" ROWKEYVAR="rowKey" CLASS="dr-table rich-table"> <COLGROUP SPAN="1"> </COLGROUP> <THEAD> <TR CLASS="dr-table-header rich-table-header" STYLE="/background-image: url$.*resources/common/background.gif$;/"> <TD ROWSPAN="2" CLASS="dr-table-headercell rich-table-headercell"> - <IMG WIDTH="1" HEIGHT="1" - SRC="/.*resources/spacer/spacer.gif/" - CLASS="rich-spacer" /> - + <IMG WIDTH="1" HEIGHT="1" SRC="/.*resources/spacer/spacer.gif/"/> </TD> <TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - FIELDS -</SPAN> - </SPAN> + <SPAN> FIELDS</SPAN> </TD> </TR> <TR CLASS="dr-table-header-continue rich-table-header-continue"> <TD BREAKBEFORE="true" CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field1 -</SPAN> - </SPAN> + <SPAN> field1</SPAN> </TD> <TD CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field2 -</SPAN> - </SPAN> + <SPAN> field2</SPAN> </TD> <TD CLASS="dr-table-headercell rich-table-headercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - field3 -</SPAN> - </SPAN> + <SPAN> field3</SPAN> </TD> </TR> </THEAD> @@ -59,74 +30,31 @@ <TR CLASS="dr-table-footer rich-table-footer"> <TD CLASS="dr-table-footercell rich-table-footercell"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-footercell rich-table-footercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer1 -</SPAN> - </SPAN> + <SPAN> footer1</SPAN> </TD> <TD CLASS="dr-table-footercell rich-table-footercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer2 -</SPAN> - </SPAN> + <SPAN> footer2</SPAN> </TD> <TD CLASS="dr-table-footercell rich-table-footercell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - footer3 -</SPAN> - </SPAN> + <SPAN> footer3</SPAN> </TD> </TR> </TFOOT> <TBODY> <TR CLASS="dr-subtable-cell rich-subtable-cell"> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{rowKey} -</SPAN> - </SPAN> + <SPAN> #{rowKey}</SPAN> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{row.field1} -</SPAN> - </SPAN> + <SPAN> #{row.field1}</SPAN> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{row.field2} -</SPAN> - </SPAN> + <SPAN> #{row.field2}</SPAN> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{row.field3} -</SPAN> - </SPAN> + <SPAN> #{row.field3}</SPAN> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,100 +1,72 @@ <tests> - <test id="dropDownMenu"> - - <UL VPE-DDM-MENU-TITLE-UL=""> - <LI VPE-DDM-MENU-TITLE-LI="" - CLASS="rich-ddmenu-label rich-ddmenu-label-unselect" STYLE=""> - <DIV CLASS="dr-menu-top-div"> - <SPAN CLASS="rich-label-text-decor"> - Menu 1 + <test id="dropDownMenu"> + +<UL VPE-DDM-MENU-TITLE-UL="" > +<LI VPE-DDM-MENU-TITLE-LI="" CLASS="rich-ddmenu-label rich-ddmenu-label-unselect" STYLE="" > +<DIV CLASS="dr-menu-top-div" > +<SPAN CLASS="rich-label-text-decor" > +Menu 1 </SPAN> - </DIV> - <UL VPE-DDM-MENU-CHILDREN-UL="" - CLASS="rich-menu-list-border rich-menu-list-bg" STYLE=""> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> +</DIV> +<UL VPE-DDM-MENU-CHILDREN-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" STYLE="" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 1 </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<SPAN CLASS="rich-menu-item-label" > +<SPAN > +Item 1 +</SPAN> +</SPAN> +</DIV> +</LI> +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE="" > +<DIV CLASS="dr-menu-group-top-div" > +<SPAN CLASS="rich-menu-item-icon-enabled" > +<IMG SRC="/.*resources/menuGroup/spacer.gif/" /> - </LI> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE=""> - <DIV CLASS="dr-menu-group-top-div"> - <SPAN CLASS="rich-menu-item-icon-enabled"> - <IMG - SRC="/.*resources/menuGroup/spacer.gif/" /> - - </SPAN> - <SPAN CLASS="rich-menu-item-label rich-menu-group-label"> - Group 2 </SPAN> - <SPAN CLASS="rich-menu-item-folder rich-menu-group-folder" - STYLE=""> - <IMG - SRC="/.*resources/menuGroup/arrow.gif/" /> +<SPAN CLASS="rich-menu-item-label rich-menu-group-label" > +Group 2 +</SPAN> +<SPAN CLASS="rich-menu-item-folder rich-menu-group-folder" STYLE="" > +<IMG SRC="/.*resources/menuGroup/arrow.gif/" /> +</SPAN> +</DIV> +<UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </SPAN> - </DIV> - <UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg"> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> - - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 2 </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<SPAN CLASS="rich-menu-item-label" > +<SPAN> +Item 2 +</SPAN> +</SPAN> +</DIV> +</LI> +</UL> +</LI> +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </LI> - </UL> - <BR _MOZ_DIRTY="" TYPE="_moz" /> - - </LI> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> - - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 3 </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<SPAN CLASS="rich-menu-item-label" > +<SPAN> +Item 3 +</SPAN> +</SPAN> +</DIV> +</LI> +</UL> +</LI> +</UL> - </LI> - </UL> - </LI> - </UL> - </test> + </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -4,103 +4,67 @@ BORDER="0" STYLE="table-layout: fixed;"> <COLGROUP> <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL WIDTH="100" /> - </COLGROUP> <THEAD> <TR CLASS="dr-table-subheader rich-table-subheader"> <TH CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Flag -</SPAN> - </SPAN> + <SPAN> Flag</SPAN> </SPAN> </TH> <TH CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - State Name -</SPAN> - </SPAN> + <SPAN> State Name</SPAN> </SPAN> <IMG STYLE="vertical-align: middle;" SRC="/.*resources/extendedDataTable/sortable.gif/" /> - </TH> <TH CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - State Capital -</SPAN> - </SPAN> + <SPAN> State Capital</SPAN> </SPAN> <IMG STYLE="vertical-align: middle;" SRC="/.*resources/extendedDataTable/sortable.gif/" /> - </TH> <TH CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <SPAN> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Time Zone -</SPAN> - </SPAN> + <SPAN> Time Zone</SPAN> </SPAN> </TH> <TH CLASS="dr-table-subheadercell rich-table-subheadercell"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TH> </TR> <TR CLASS="dr-table-subheader rich-table-subheader"> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <DIV STYLE="padding: 4px;"> <INPUT TYPE="text" CLASS="extendedTable-input" /> - </DIV> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <DIV STYLE="padding: 4px;"> <INPUT TYPE="text" CLASS="extendedTable-input" /> - </DIV> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> </TR> </THEAD> @@ -110,30 +74,25 @@ CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter" SCOP="col"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> <TD CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter"> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> </TR> </TFOOT> @@ -143,15 +102,10 @@ <TABLE WIDTH="100%" STYLE="table-layout: fixed;"> <COLGROUP> <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL WIDTH="100" /> - <COL /> - </COLGROUP> <TBODY> <TR CLASS="dr-body-table-tr"> @@ -159,38 +113,19 @@ <IMG SRC="/.*ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;" /> - </TD> <TD WIDTH="170" SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" FILTEREVENT="onkeyup" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{cap.state} -</SPAN> - </SPAN> + <SPAN> #{cap.state}</SPAN> </TD> <TD WIDTH="170" SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" FILTEREVENT="onkeyup" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{cap.name} -</SPAN> - </SPAN> + <SPAN> #{cap.name}</SPAN> </TD> <TD SORTABLE="false" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{cap.timeZone} -</SPAN> - </SPAN> + <SPAN> #{cap.timeZone}</SPAN> </TD> </TR> </TBODY> @@ -200,7 +135,6 @@ <DIV STYLE="overflow: scroll; width: 17px; height: 100%;"> </DIV> <BR _MOZ_DIRTY="" TYPE="_moz" /> - </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -2,42 +2,26 @@ <test id="listShuttle"> <TABLE CLASS="rich-list-shuttle" STYLE=""> <TR> - <TD COLSPAN="2" CLASS="rich-shuttle-source-caption"> - source label - </TD> - <TD COLSPAN="2" CLASS="rich-shuttle-target-caption"> - target label - </TD> + <TD COLSPAN="2" CLASS="rich-shuttle-source-caption"> source label</TD> + <TD COLSPAN="2" CLASS="rich-shuttle-target-caption"> target label</TD> </TR> <TR> <TD> <DIV CLASS="rich-shuttle-list-content" STYLE="width: 234px; height: 245px;"> <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0"> - <TR> + <TR CLASS=""> <TH BACKGROUND="/.*resources/shuttle/header.gif/" CLASS="rich-shuttle-header-tab-cell"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Song Name - </SPAN> - </SPAN> + <SPAN> Song Name</SPAN> </DIV> </TH> <TH BACKGROUND="/.*resources/shuttle/header.gif/" CLASS="rich-shuttle-header-tab-cell"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Artist Name - </SPAN> - </SPAN> + <SPAN> Artist Name</SPAN> </DIV> </TH> </TR> @@ -46,13 +30,7 @@ <TABLE> <TR> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - You must be evil - </SPAN> - </SPAN> + <SPAN> You must be evil</SPAN> </TD> </TR> </TABLE> @@ -61,13 +39,7 @@ <TABLE> <TR> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Chris Rea - </SPAN> - </SPAN> + <SPAN> Chris Rea</SPAN> </TD> </TR> </TABLE> @@ -85,9 +57,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-copyAll"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_copy_all.gif/" /> - - Copy all + SRC="/.*resources/shuttle/arrow_copy_all.gif/"/> Copy all </DIV> </DIV> </DIV> @@ -99,9 +69,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-copy"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_copy.gif/" /> - - Copy + SRC="/.*resources/shuttle/arrow_copy.gif/"/> Copy </DIV> </DIV> </DIV> @@ -113,9 +81,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-remove"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_remove.gif/" /> - - Remove + SRC="/.*resources/shuttle/arrow_remove.gif/"/> Remove </DIV> </DIV> </DIV> @@ -127,9 +93,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-removeAll"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_remove_all.gif/" /> - - Remove All + SRC="/.*resources/shuttle/arrow_remove_all.gif/"/> Remove All </DIV> </DIV> </DIV> @@ -139,31 +103,19 @@ <TD> <DIV CLASS="rich-shuttle-list-content" STYLE="width: 278px; height: 245px;"> <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0"> - <TR> + <TR CLASS=""> <TH BACKGROUND="/.*resources/shuttle/header.gif/" CLASS="rich-shuttle-header-tab-cell"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Song Name - </SPAN> - </SPAN> + <SPAN> Song Name</SPAN> </DIV> </TH> <TH BACKGROUND="/.*resources/shuttle/header.gif/" CLASS="rich-shuttle-header-tab-cell"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Artist Name - </SPAN> - </SPAN> + <SPAN> Artist Name</SPAN> </DIV> </TH> </TR> @@ -172,13 +124,7 @@ <TABLE> <TR> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - You must be evil - </SPAN> - </SPAN> + <SPAN> You must be evil</SPAN> </TD> </TR> </TABLE> @@ -187,13 +133,7 @@ <TABLE> <TR> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Chris Rea - </SPAN> - </SPAN> + <SPAN> Chris Rea</SPAN> </TD> </TR> </TABLE> @@ -211,9 +151,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-top"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_first.gif/" /> - - First + SRC="/.*resources/shuttle/arrow_first.gif/"/> First </DIV> </DIV> </DIV> @@ -225,9 +163,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-up"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_up.gif/" /> - - Up + SRC="/.*resources/shuttle/arrow_up.gif/"/> Up </DIV> </DIV> </DIV> @@ -239,9 +175,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-down"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_down.gif/" /> - - Down + SRC="/.*resources/shuttle/arrow_down.gif/"/> Down </DIV> </DIV> </DIV> @@ -253,9 +187,7 @@ <DIV CLASS="rich-shuttle-button rich-shuttle-bottom"> <DIV CLASS="rich-shuttle-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/shuttle/arrow_last.gif/" /> - - Last + SRC="/.*resources/shuttle/arrow_last.gif/"/> Last </DIV> </DIV> </DIV> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,45 +1,35 @@ <tests> - <test id="menuGroup"> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE=""> - <DIV CLASS="dr-menu-group-top-div"> - <SPAN CLASS="rich-menu-item-icon-enabled"> - <IMG - SRC="/.*resources/menuGroup/spacer.gif/" /> + <test id="menuGroup"> - </SPAN> - <SPAN CLASS="rich-menu-item-label rich-menu-group-label"> - Group 2 +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE="" > +<DIV CLASS="dr-menu-group-top-div" > +<SPAN CLASS="rich-menu-item-icon-enabled" > +<IMG SRC="/.*resources/menuGroup/spacer.gif/" /> + </SPAN> - <SPAN CLASS="rich-menu-item-folder rich-menu-group-folder" - STYLE=""> - <IMG - SRC="/.*resources/menuGroup/arrow.gif/" /> +<SPAN CLASS="rich-menu-item-label rich-menu-group-label" > +Group 2 +</SPAN> +<SPAN CLASS="rich-menu-item-folder rich-menu-group-folder" STYLE="" > +<IMG SRC="/.*resources/menuGroup/arrow.gif/" /> +</SPAN> +</DIV> +<UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </SPAN> - </DIV> - <UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg"> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> - - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 2 </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +<SPAN CLASS="rich-menu-item-label" > +<SPAN> +Item 2 +</SPAN> +</SPAN> +</DIV> +</LI> +</UL> +</LI> - </LI> - </UL> - <BR _MOZ_DIRTY="" TYPE="_moz" /> - </LI> - </test> + </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,25 +1,19 @@ <tests> - <test id="menuItem"> + <test id="menuItem"> - <LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE=""> - <DIV CLASS="dr-menu-item-top-div"> - <SPAN CLASS="rich-menu-item-icon"> - <IMG - SRC="/.*resources/menuItem/spacer.gif/" /> +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > +<SPAN CLASS="rich-menu-item-icon" > +<IMG SRC="/.*resources/menuItem/spacer.gif/" /> - </SPAN> - <SPAN CLASS="rich-menu-item-label"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Item 1 - </SPAN> - </SPAN> - </SPAN> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> +</SPAN> +<SPAN CLASS="rich-menu-item-label" > +<SPAN > +Item 1 +</SPAN> +</SPAN> +</DIV> +</LI> - </LI> - </test> + </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,5 @@ <tests> <test id="messages"> - <TABLE CELLSPACING="0" CELLPADDING="0" STYLE="border-style: dotted; color: Turquoise; text-align: center; font-size: small; font-style: italic; background-color: Orchid; font-family: Arial CE,Arial Narrow; text-decoration: line-through; font-weight: bolder;" CLASS="rich-messages infoClass"> @@ -8,90 +7,50 @@ <TD> <SPAN CLASS="rich-messages-marker"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Passed -</SPAN> - </SPAN> + <SPAN> Passed </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label"> - No Error -</SPAN> + <SPAN CLASS="rich-messages-label"> No Error </SPAN> </TD> </TR> <TR> <TD CLASS="errorClass"> <SPAN CLASS="rich-messages-marker markerError"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Error -</SPAN> - </SPAN> + <SPAN> Error </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label errorLabel"> - Error message -</SPAN> + <SPAN CLASS="rich-messages-label errorLabel"> Error message </SPAN> </TD> </TR> <TR> <TD CLASS="fatalClass"> <SPAN CLASS="rich-messages-marker markerFatal"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Fatal -</SPAN> - </SPAN> + <SPAN> Fatal </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label fatalLabel"> - Fatal message -</SPAN> + <SPAN CLASS="rich-messages-label fatalLabel"> Fatal message </SPAN> </TD> </TR> <TR> <TD CLASS="infoClass"> <SPAN CLASS="rich-messages-marker markerInfo"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Info -</SPAN> - </SPAN> + <SPAN> Info </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label infoLabel"> - Info message -</SPAN> + <SPAN CLASS="rich-messages-label infoLabel"> Info message </SPAN> </TD> </TR> <TR> <TD CLASS="warnClass"> <SPAN CLASS="rich-messages-marker markerWarn"> <DIV> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Warning -</SPAN> - </SPAN> + <SPAN> Warning </SPAN> </DIV> </SPAN> - <SPAN CLASS="rich-messages-label warnLabel"> - Warning message -</SPAN> + <SPAN CLASS="rich-messages-label warnLabel"> Warning message </SPAN> </TD> </TR> </TABLE> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,5 @@ <tests> <test id="orderingList"> - <TABLE WIDTH="300" HEIGHT="200" CLASS="rich-ordering-list-body"> <TR> <TD> @@ -20,45 +19,21 @@ <TD BACKGROUND="/.*resources/orderingList/table_header_cell_bg.gif/" CLASS="rich-ordering-list-table-header-cell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Song Name -</SPAN> - </SPAN> + <SPAN> Song Name</SPAN> </TD> <TD BACKGROUND="/.*resources/orderingList/table_header_cell_bg.gif/" CLASS="rich-ordering-list-table-header-cell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Artist Name -</SPAN> - </SPAN> + <SPAN> Artist Name</SPAN> </TD> </TR> </THEAD> <TR CLASS="rich-ordering-list-row"> <TD WIDTH="180" CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - You must be evil -</SPAN> - </SPAN> + <SPAN> You must be evil</SPAN> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - Chris Rea -</SPAN> - </SPAN> + <SPAN> Chris Rea</SPAN> </TD> </TR> </TABLE> @@ -67,16 +42,14 @@ <TD> <DIV STYLE="overflow: scroll; width: 17px; height: 100%;"> </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> - + <BR _MOZ_DIRTY="" TYPE="_moz"/> </TD> </TR> <TR> <TD> <DIV STYLE="overflow: scroll; width: 100%; height: 17px;"> </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz" /> - + <BR _MOZ_DIRTY="" TYPE="_moz"/> </TD> </TR> </TABLE> @@ -90,8 +63,7 @@ <A CLASS="rich-ordering-list-button-selection"> <DIV CLASS="rich-ordering-list-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/top.gif/"/> - First + SRC="/.*resources/orderingList/top.gif/"/>First </DIV> </A> </DIV> @@ -102,8 +74,7 @@ <A CLASS="rich-ordering-list-button-selection"> <DIV CLASS="rich-ordering-list-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/up.gif/"/> - Up + SRC="/.*resources/orderingList/up.gif/"/>Up </DIV> </A> </DIV> @@ -114,8 +85,7 @@ <A CLASS="rich-ordering-list-button-selection"> <DIV CLASS="rich-ordering-list-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/down.gif/"/> - Down + SRC="/.*resources/orderingList/down.gif/"/>Down </DIV> </A> </DIV> @@ -126,8 +96,7 @@ <A CLASS="rich-ordering-list-button-selection"> <DIV CLASS="rich-ordering-list-button-content"> <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/bottom.gif/"/> - Last + SRC="/.*resources/orderingList/bottom.gif/"/>Last </DIV> </A> </DIV> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,6 +1,5 @@ <tests> <test id="scrollableDataTable"> - <DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 500px; height: 100px;"> <TABLE CLASS="dr-table rich-sdt"> <COLGROUP SPAN="6"> @@ -9,63 +8,39 @@ <TR CLASS="dr-table-subheader dr-sdt-hr"> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Make -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Make + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Model -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Model + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Price -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Price + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Mileage -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Mileage + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - VIN -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + VIN + </SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="headerText"> - Stock -</SPAN> - </SPAN> + <SPAN CLASS="headerText"> + Stock + </SPAN> </TD> </TR> </THEAD> @@ -77,282 +52,162 @@ </TBODY> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> <TR CLASS="dr-table-firstrow rich-table-firstrow"> <TD ID="make" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.make} -</SPAN> - </SPAN> + <SPAN> + #{category.make} + </SPAN> </TD> <TD ID="model" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.model} -</SPAN> - </SPAN> + <SPAN> + #{category.model} + </SPAN> </TD> <TD ID="price" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.price} -</SPAN> - </SPAN> + <SPAN> + #{category.price} + </SPAN> </TD> <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.mileage} -</SPAN> - </SPAN> + <SPAN> + #{category.mileage} + </SPAN> </TD> <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.vin} -</SPAN> - </SPAN> + <SPAN> + #{category.vin} + </SPAN> </TD> <TD ID="stock" CLASS="dr-table-cell rich-table-cell col"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{category.stock} -</SPAN> - </SPAN> + <SPAN> + #{category.stock} + </SPAN> </TD> </TR> </TABLE> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -2,13 +2,7 @@ <test id="toggleControl"> <SPAN STYLE="color: blue; text-decoration: underline;" VPE-USER-TOGGLE-ID=""> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - CLOSED - </SPAN> - </SPAN> + <SPAN> CLOSED </SPAN> </SPAN> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -3,13 +3,7 @@ <DIV> <SPAN STYLE="color: blue; text-decoration: underline;" VPE-USER-TOGGLE-ID=""> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - CLOSED - </SPAN> - </SPAN> + <SPAN> CLOSED </SPAN> </SPAN> </DIV> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -62,24 +62,11 @@ <TBODY> <TR VALIGN="middle"> <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - <INPUT CLASS="barsearch" /> - - </SPAN> - </SPAN> + <INPUT CLASS="barsearch" /> </TD> <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - <INPUT TYPE="button" VALUE="Search" /> - - </SPAN> - <SPAN CLASS="vpe-text"> - </SPAN> - </SPAN> + <INPUT TYPE="button" CLASS="barsearchbutton" VALUE="Search" + STYLE="-moz-user-modify: read-only;" /> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -8,26 +8,16 @@ <TR> <TD STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconCollapsedWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconCollapsedWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> - </TD> <TD STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> - </TD> <TD CLASS="treeNodeNameStyle"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{item.name} -</SPAN> - </SPAN> + <SPAN> #{item.name}</SPAN> </TD> </TR> </TBODY> @@ -41,26 +31,16 @@ <TR> <TD STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconCollapsedWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconCollapsedWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> - </TD> <TD STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> - </TD> <TD CLASS="treeNodeNameStyle"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{item.title} -</SPAN> - </SPAN> + <SPAN> #{item.title}</SPAN> </TD> </TR> </TBODY> @@ -77,22 +57,13 @@ <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNotCollapsedWithLines.gif/" RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> - </TD> <TD> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconLeafWithLines.gif/" + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconLeafWithLines.gif/" RICHFACESTREENODEPARAM="iconLeaf" /> - </TD> <TD CLASS="treeNodeNameStyle"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{item.title} -</SPAN> - </SPAN> + <SPAN> #{item.title}</SPAN> </TD> </TR> </TBODY> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml 2009-01-28 16:36:11 UTC (rev 13307) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml 2009-01-28 16:54:26 UTC (rev 13308) @@ -1,36 +1,28 @@ <tests> <test id="treeNode"> - <DIV> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-tree-full-width"> - <TBODY> - <TR> - <TD - STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconCollapsedWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> - - </TD> - <TD - STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> - - </TD> - <TD CLASS="treeNodeNameStyle"> - <SPAN CLASS="vpe-text"> - <SPAN CLASS="vpe-text"> - </SPAN> - <SPAN CLASS="vpe-text"> - #{item.name} - </SPAN> - </SPAN> - </TD> - </TR> - </TBODY> - </TABLE> - </DIV> + <DIV> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-tree-full-width"> + <TBODY> + <TR> + <TD + STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" + SRC="/.*resources/tree/iconCollapsedWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + </TD> + <TD + STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" + SRC="/.*resources/tree/iconNodeWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/> + </TD> + <TD CLASS="treeNodeNameStyle"> + <SPAN> #{item.name}</SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> </test> </tests> \ No newline at end of file

15 years, 12 months

1
0
0 / 0

JBoss Tools SVN: r13307 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/help.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-01-28 11:36:11 -0500 (Wed, 28 Jan 2009) New Revision: 13307 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties Log: JBIDE-3658 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-01-28 15:28:29 UTC (rev 13306) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-01-28 16:36:11 UTC (rev 13307) @@ -259,6 +259,9 @@ ESBService101_Properties.Title=ESB Service +ESBService101_AddProperty.WindowTitle=Add Property +ESBService101_AddProperty.Title=ESB Property + #Listeners List ESBListeners101_AddListener.WindowTitle=Add Listener @@ -421,6 +424,8 @@ ESBPreTarget_Properties.Title=ESB Target +#Adding specific actions + ESBActions101_AddByteArrayToString.WindowTitle=Add Byte Array To String ESBActions101_AddByteArrayToString.Title=ESB Byte Array To String Converter @@ -474,3 +479,28 @@ ESBActions101_AddSystemPrintln.WindowTitle=Add System Println ESBActions101_AddSystemPrintln.Title=ESB System Println + +ESBActions101_AddSOAPProcessor.WindowTitle=Add SOAP Processor +ESBActions101_AddSOAPProcessor.Title=ESB SOAP Processor + +ESBActions101_AddSOAPClient.WindowTitle=Add SOAP Client +ESBActions101_AddSOAPClient.Title=ESB SOAP Client + +ESBPreActionAggregator101_Properties.Title=Aggregator +ESBPreActionByteArrayToString101_Properties.Title=Byte Array to String +ESBPreActionCommandInterpreter101_Properties.Title=Command Interpreter +ESBPreActionContentBasedRouter101_Properties.Title=Content Based Router +ESBPreActionGroovyProcessor101_Properties.Title=Groovy Processor +ESBPreActionLongToDateConverter101_Properties.Title=Long to Date Converter +ESBPreActionMessagePersister101_Properties.Title=Message Persister +ESBPreActionNotifier101_Properties.Title=Notifier +ESBPreActionObjectInvoke101_Properties.Title=Object Invoke +ESBPreActionObjectToCSVString101_Properties.Title=Object to CSV String +ESBPreActionObjectToXStream101_Properties.Title=Object to XStream +ESBPreActionSOAPClient101_Properties.Title=SOAP Client +ESBPreActionSOAPProcessor101_Properties.Title=SOAP Processor +ESBPreActionSmooksTransformer101_Properties.Title=Smooks Transformer +ESBPreActionStaticRouter101_Properties.Title=Static Router +ESBPreActionStaticWiretap101_Properties.Title=Static Wiretap +ESBPreActionSystemPrintln101_Properties.Title=System Println +ESBPreActionXStreamToObject101_Properties.Title=XStream to Object

15 years, 12 months

1
0
0 / 0

JBoss Tools SVN: r13306 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: resref and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2009-01-28 10:28:29 -0500 (Wed, 28 Jan 2009) New Revision: 13306 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java Log: https://jira.jboss.org/jira/browse/JBIDE-3643, dialog size and description messages were adjusted for page design options dialog Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-01-28 14:40:59 UTC (rev 13305) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-01-28 15:28:29 UTC (rev 13306) @@ -78,8 +78,8 @@ INSERT_AFTER=Insert After REPLACE_WITH=Replace With FROM_PALETTE=From Palette -PAGE_DESIGN_OPTIONS_ABOUT=Here you can configure Visual Page Editor arguments, which will be used for generating a preview -ACTUAL_RUN_TIME_FOLDERS_ABOUT=This parameters will be used by Visual Page Editor for replacing absolute and relative path values when generating a preview -INCLUDED_CSS_FILES_ABOUT=This CSS files will be linked by Visual Page Editor when generating a preview -INCLUDED_TAG_LIBS_ABOUT=This Taglibs will be used by Visual Page Editor for getting appropriate template for generating a preview, if this Taglibs doesn't included on page -SUBSTITUTED_EL_EXPRESSIONS_ABOUT=This EL expressions will be substituted by Visual Page Editor when generating a preview +PAGE_DESIGN_OPTIONS_ABOUT=Here you can configure Visual Page Editor options, which will be used for generating a preview +ACTUAL_RUN_TIME_FOLDERS_ABOUT=These options will be used by Visual Page Editor for replacing absolute and relative path values when generating a preview +INCLUDED_CSS_FILES_ABOUT=These CSS files will be linked by Visual Page Editor when generating a preview +INCLUDED_TAG_LIBS_ABOUT=These Taglibs will be used by Visual Page Editor for getting appropriate template for generating a preview, if this Taglibs doesn't included on page +SUBSTITUTED_EL_EXPRESSIONS_ABOUT=These EL expressions will be substituted by Visual Page Editor when generating a preview Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-01-28 14:40:59 UTC (rev 13305) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-01-28 15:28:29 UTC (rev 13306) @@ -111,7 +111,8 @@ return tabFolder; } - public void action(String command) { + @Override + public void action(String command) { if (OK.equals(command)) { absFolder.commit(); relFolder.commit(); @@ -122,7 +123,8 @@ super.action(command); } - public Point getPreferredSize() { + @Override + public Point getPreferredSize() { // changed by estherbin // http://jira.jboss.com/jira/browse/JBIDE-2010 String os_name = System.getProperty("os.name"); //$NON-NLS-1$ @@ -131,7 +133,7 @@ } // changed by estherbin // http://jira.jboss.com/jira/browse/JBIDE-2010 - return new Point(400, 285); + return new Point(580, 285); } }

15 years, 12 months

1
0
0 / 0

JBoss Tools SVN: r13305 - in workspace/max/jpaap: demo and 13 other directories.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2009-01-28 09:40:59 -0500 (Wed, 28 Jan 2009) New Revision: 13305 Added: workspace/max/jpaap/demo/ workspace/max/jpaap/demo/.classpath workspace/max/jpaap/demo/.factorypath workspace/max/jpaap/demo/.project workspace/max/jpaap/demo/.settings/ workspace/max/jpaap/demo/.settings/org.eclipse.jdt.apt.core.prefs workspace/max/jpaap/demo/.settings/org.eclipse.jdt.core.prefs workspace/max/jpaap/demo/README.txt workspace/max/jpaap/demo/ant-build.xml workspace/max/jpaap/demo/build.xml workspace/max/jpaap/demo/dist/ workspace/max/jpaap/demo/dist/demo.jar workspace/max/jpaap/demo/lib/ workspace/max/jpaap/demo/lib/jpa.jar workspace/max/jpaap/demo/lib/jpaap.jar workspace/max/jpaap/demo/nbproject/ workspace/max/jpaap/demo/nbproject/build-impl.xml workspace/max/jpaap/demo/nbproject/genfiles.properties workspace/max/jpaap/demo/nbproject/private/ workspace/max/jpaap/demo/nbproject/private/config.properties workspace/max/jpaap/demo/nbproject/private/private.properties workspace/max/jpaap/demo/nbproject/private/private.xml workspace/max/jpaap/demo/nbproject/project.properties workspace/max/jpaap/demo/nbproject/project.xml workspace/max/jpaap/demo/src/ workspace/max/jpaap/demo/src/META-INF/ workspace/max/jpaap/demo/src/META-INF/orm.xml workspace/max/jpaap/demo/src/Test.java workspace/max/jpaap/demo/src/model/ workspace/max/jpaap/demo/src/model/Item.java workspace/max/jpaap/demo/src/model/Order.java workspace/max/jpaap/demo/src/model/Product.java workspace/max/jpaap/demo/src/model/Shop.java Removed: workspace/max/jpaap/org.jboss.jpa.metamodel/ Modified: workspace/max/jpaap/jpaap/.classpath workspace/max/jpaap/jpaap/.project workspace/max/jpaap/jpaap/build.xml workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/ImportContextImpl.java workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java workspace/max/jpaap/test/ workspace/max/jpaap/test/.classpath workspace/max/jpaap/test/.factorypath workspace/max/jpaap/test/.settings/org.eclipse.jdt.apt.core.prefs workspace/max/jpaap/test/.settings/org.eclipse.jdt.core.prefs workspace/max/jpaap/test/test jpa-build.xml.launch Log: removed broken eclipse attempt added demo project with ant, eclipse and netbeans support Added: workspace/max/jpaap/demo/.classpath =================================================================== --- workspace/max/jpaap/demo/.classpath (rev 0) +++ workspace/max/jpaap/demo/.classpath 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="build/eclipse/gen-src"> + <attributes> + <attribute name="optional" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/jpa.jar"/> + <classpathentry kind="output" path="build/eclipse/classes"/> +</classpath> Added: workspace/max/jpaap/demo/.factorypath =================================================================== --- workspace/max/jpaap/demo/.factorypath (rev 0) +++ workspace/max/jpaap/demo/.factorypath 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,4 @@ +<factorypath> + <factorypathentry kind="WKSPJAR" id="/demo/lib/jpa.jar" enabled="true" runInBatchMode="false"/> + <factorypathentry kind="WKSPJAR" id="/demo/lib/jpaap.jar" enabled="true" runInBatchMode="false"/> +</factorypath> Added: workspace/max/jpaap/demo/.project =================================================================== --- workspace/max/jpaap/demo/.project (rev 0) +++ workspace/max/jpaap/demo/.project 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>demo</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: workspace/max/jpaap/demo/.settings/org.eclipse.jdt.apt.core.prefs =================================================================== --- workspace/max/jpaap/demo/.settings/org.eclipse.jdt.apt.core.prefs (rev 0) +++ workspace/max/jpaap/demo/.settings/org.eclipse.jdt.apt.core.prefs 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,5 @@ +#Wed Jan 28 12:29:15 CET 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=build/eclipse/gen-src +org.eclipse.jdt.apt.reconcileEnabled=true Added: workspace/max/jpaap/demo/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/max/jpaap/demo/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/max/jpaap/demo/.settings/org.eclipse.jdt.core.prefs 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,3 @@ +#Wed Jan 28 12:29:16 CET 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.processAnnotations=enabled Added: workspace/max/jpaap/demo/README.txt =================================================================== Added: workspace/max/jpaap/demo/ant-build.xml =================================================================== --- workspace/max/jpaap/demo/ant-build.xml (rev 0) +++ workspace/max/jpaap/demo/ant-build.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project basedir="." default="build" name="demo"> + <property environment="env"/> + <property name="debuglevel" value="source,lines,vars"/> + <property name="target" value="1.6"/> + <property name="source" value="1.6"/> + + <property name="build.classes.dir" value="build/ant/classes"/> + <property name="build.generated-src.dir" value="build/ant/gen-src"/> + + <target name="init"> + <mkdir dir="${build.classes.dir}"/> + <mkdir dir="${build.generated-src.dir}"/> + +  + <copy includeemptydirs="false" todir="${build.classes.dir}"> + <fileset dir="${build.generated-src.dir}" excludes="**/*.java"/> + </copy> + <copy includeemptydirs="false" todir="${build.classes.dir}"> + <fileset dir="src" excludes="***/*.java"/> + </copy> + </target> + + <target name="clean"> + <delete dir="${build.classes.dir}"/> + </target> + + <target depends="init" name="build"> + + <echo message="${ant.project.name}: ${ant.file}"/> + + <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes.dir}" source="${source}" target="${target}"> + <src path="${build.generated-src.dir}"/> + <src path="src"/> + <classpath> + <pathelement location="${build.classes.dir}"/> + <pathelement location="lib/jpa.jar"/> + <pathelement location="lib/jpaap.jar"/> + </classpath> + + </javac> + + </target> + +</project> Added: workspace/max/jpaap/demo/build.xml =================================================================== --- workspace/max/jpaap/demo/build.xml (rev 0) +++ workspace/max/jpaap/demo/build.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + +<project name="demo" default="default" basedir="."> + <description>Builds, tests, and runs the project demo.</description> + + <import file="nbproject/build-impl.xml"/> + <target name="init" depends="demo-impl.init"> + <mkdir dir="${build.apt.dir}"/> + </target> + + <target name="-pre-compile"> +  + <copy includeemptydirs="false" todir="${build.classes.dir}"> + <fileset dir="${src.dir}" excludes="**/*.java"/> + </copy> + </target> + +  +</project> Added: workspace/max/jpaap/demo/dist/demo.jar =================================================================== (Binary files differ) Property changes on: workspace/max/jpaap/demo/dist/demo.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/max/jpaap/demo/lib/jpa.jar =================================================================== (Binary files differ) Property changes on: workspace/max/jpaap/demo/lib/jpa.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/max/jpaap/demo/lib/jpaap.jar =================================================================== (Binary files differ) Property changes on: workspace/max/jpaap/demo/lib/jpaap.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/max/jpaap/demo/nbproject/build-impl.xml =================================================================== --- workspace/max/jpaap/demo/nbproject/build-impl.xml (rev 0) +++ workspace/max/jpaap/demo/nbproject/build-impl.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,637 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="demo-impl"> + <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> +  + <target name="-pre-init"> +  +  + </target> + <target depends="-pre-init" name="-init-private"> + <property file="nbproject/private/config.properties"/> + <property file="nbproject/private/configs/${config}.properties"/> + <property file="nbproject/private/private.properties"/> + </target> + <target depends="-pre-init,-init-private" name="-init-user"> + <property file="${user.properties.file}"/> +  +  + <property name="default.javac.source" value="1.4"/> + <property name="default.javac.target" value="1.4"/> + </target> + <target depends="-pre-init,-init-private,-init-user" name="-init-project"> + <property file="nbproject/configs/${config}.properties"/> + <property file="nbproject/project.properties"/> + </target> + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> + <available file="${manifest.file}" property="manifest.available"/> + <condition property="manifest.available+main.class"> + <and> + <isset property="manifest.available"/> + <isset property="main.class"/> + <not> + <equals arg1="${main.class}" arg2="" trim="true"/> + </not> + </and> + </condition> + <condition property="manifest.available+main.class+mkdist.available"> + <and> + <istrue value="${manifest.available+main.class}"/> + <isset property="libs.CopyLibs.classpath"/> + </and> + </condition> + <condition property="have.tests"> + <or/> + </condition> + <condition property="have.sources"> + <or> + <available file="${src.dir}"/> + <available file="${src.gen-src.dir}"/> + </or> + </condition> + <condition property="netbeans.home+have.tests"> + <and> + <isset property="netbeans.home"/> + <isset property="have.tests"/> + </and> + </condition> + <condition property="no.javadoc.preview"> + <and> + <isset property="javadoc.preview"/> + <isfalse value="${javadoc.preview}"/> + </and> + </condition> + <property name="run.jvmargs" value=""/> + <property name="javac.compilerargs" value=""/> + <property name="work.dir" value="${basedir}"/> + <condition property="no.deps"> + <and> + <istrue value="${no.dependencies}"/> + </and> + </condition> + <property name="javac.debug" value="true"/> + <property name="javadoc.preview" value="true"/> + <property name="application.args" value=""/> + <property name="source.encoding" value="${file.encoding}"/> + <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> + <and> + <isset property="javadoc.encoding"/> + <not> + <equals arg1="${javadoc.encoding}" arg2=""/> + </not> + </and> + </condition> + <property name="javadoc.encoding.used" value="${source.encoding}"/> + <property name="includes" value="**"/> + <property name="excludes" value=""/> + <property name="do.depend" value="false"/> + <condition property="do.depend.true"> + <istrue value="${do.depend}"/> + </condition> + <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'"> + <and> + <isset property="jaxws.endorsed.dir"/> + <available file="nbproject/jaxws-build.xml"/> + </and> + </condition> + </target> + <target name="-post-init"> +  +  + </target> + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check"> + <fail unless="src.dir">Must set src.dir</fail> + <fail unless="src.gen-src.dir">Must set src.gen-src.dir</fail> + <fail unless="build.dir">Must set build.dir</fail> + <fail unless="dist.dir">Must set dist.dir</fail> + <fail unless="build.classes.dir">Must set build.classes.dir</fail> + <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail> + <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail> + <fail unless="build.test.results.dir">Must set build.test.results.dir</fail> + <fail unless="build.classes.excludes">Must set build.classes.excludes</fail> + <fail unless="dist.jar">Must set dist.jar</fail> + </target> + <target name="-init-macrodef-property"> + <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute name="name"/> + <attribute name="value"/> + <sequential> + <property name="@{name}" value="${@{value}}"/> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-javac"> + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${src.dir}:${src.gen-src.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="${javac.debug}" name="debug"/> + <attribute default="" name="sourcepath"/> + <element name="customize" optional="true"/> + <sequential> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/> + <customize/> + </javac> + </sequential> + </macrodef> + <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${src.dir}:${src.gen-src.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}" name="classpath"/> + <sequential> + <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + </depend> + </sequential> + </macrodef> + <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${build.classes.dir}" name="destdir"/> + <sequential> + <fail unless="javac.includes">Must set javac.includes</fail> + <pathconvert pathsep="," property="javac.includes.binary"> + <path> + <filelist dir="@{destdir}" files="${javac.includes}"/> + </path> + <globmapper from="*.java" to="*.class"/> + </pathconvert> + <delete> + <files includes="${javac.includes.binary}"/> + </delete> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-junit"> + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="**" name="testincludes"/> + <sequential> + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> + <batchtest todir="${build.test.results.dir}"/> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + <jvmarg line="${run.jvmargs}"/> + </junit> + </sequential> + </macrodef> + </target> + <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> + <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="${main.class}" name="name"/> + <attribute default="${debug.classpath}" name="classpath"/> + <attribute default="" name="stopclassname"/> + <sequential> + <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + </nbjpdastart> + </sequential> + </macrodef> + <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="${build.classes.dir}" name="dir"/> + <sequential> + <nbjpdareload> + <fileset dir="@{dir}" includes="${fix.classes}"> + <include name="${fix.includes}*.class"/> + </fileset> + </nbjpdareload> + </sequential> + </macrodef> + </target> + <target name="-init-debug-args"> + <property name="version-output" value="java version "${ant.java.version}"/> + <condition property="have-jdk-older-than-1.4"> + <or> + <contains string="${version-output}" substring="java version "1.0"/> + <contains string="${version-output}" substring="java version "1.1"/> + <contains string="${version-output}" substring="java version "1.2"/> + <contains string="${version-output}" substring="java version "1.3"/> + </or> + </condition> + <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> + <istrue value="${have-jdk-older-than-1.4}"/> + </condition> + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> + <os family="windows"/> + </condition> + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}"> + <isset property="debug.transport"/> + </condition> + </target> + <target depends="-init-debug-args" name="-init-macrodef-debug"> + <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${main.class}" name="classname"/> + <attribute default="${debug.classpath}" name="classpath"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" dir="${work.dir}" fork="true"> + <jvmarg line="${debug-args-line}"/> + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <jvmarg line="${run.jvmargs}"/> + <classpath> + <path path="@{classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-java"> + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="${main.class}" name="classname"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" dir="${work.dir}" fork="true"> + <jvmarg line="${run.jvmargs}"/> + <classpath> + <path path="${run.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target name="-init-presetdef-jar"> + <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> + <jar compress="${jar.compress}" jarfile="${dist.jar}"> + <j2seproject1:fileset dir="${build.classes.dir}"/> + </jar> + </presetdef> + </target> + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/> +  + <target depends="init" name="deps-jar" unless="no.deps"/> + <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> + <target depends="init" name="-check-automatic-build"> + <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/> + </target> + <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build"> + <antcall target="clean"/> + </target> + <target depends="init,deps-jar" name="-pre-pre-compile"> + <mkdir dir="${build.classes.dir}"/> + </target> + <target name="-pre-compile"> +  +  + </target> + <target if="do.depend.true" name="-compile-depend"> + <j2seproject3:depend/> + </target> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile"> + <j2seproject3:javac/> + <copy todir="${build.classes.dir}"> + <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + <fileset dir="${src.gen-src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + </copy> + </target> + <target name="-post-compile"> +  +  + </target> + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/> + <target name="-pre-compile-single"> +  +  + </target> + <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + <j2seproject3:force-recompile/> + <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}:${src.gen-src.dir}"/> + </target> + <target name="-post-compile-single"> +  +  + </target> + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> +  + <target depends="init" name="-pre-pre-jar"> + <dirname file="${dist.jar}" property="dist.jar.dir"/> + <mkdir dir="${dist.jar.dir}"/> + </target> + <target name="-pre-jar"> +  +  + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available"> + <j2seproject1:jar/> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class"> + <j2seproject1:jar manifest="${manifest.file}"/> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> + <j2seproject1:jar manifest="${manifest.file}"> + <j2seproject1:manifest> + <j2seproject1:attribute name="Main-Class" value="${main.class}"/> + </j2seproject1:manifest> + </j2seproject1:jar> + <echo>To run this application from the command line without Ant, try:</echo> + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> + <property location="${dist.jar}" name="dist.jar.resolved"/> + <pathconvert property="run.classpath.with.dist.jar"> + <path path="${run.classpath}"/> + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> + </pathconvert> + <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries"> + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> + <pathconvert property="run.classpath.without.build.classes.dir"> + <path path="${run.classpath}"/> + <map from="${build.classes.dir.resolved}" to=""/> + </pathconvert> + <pathconvert pathsep=" " property="jar.classpath"> + <path path="${run.classpath.without.build.classes.dir}"/> + <chainedmapper> + <flattenmapper/> + <globmapper from="*" to="lib/*"/> + </chainedmapper> + </pathconvert> + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> + <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> + <fileset dir="${build.classes.dir}"/> + <manifest> + <attribute name="Main-Class" value="${main.class}"/> + <attribute name="Class-Path" value="${jar.classpath}"/> + </manifest> + </copylibs> + <echo>To run this application from the command line without Ant, try:</echo> + <property location="${dist.jar}" name="dist.jar.resolved"/> + <echo>java -jar "${dist.jar.resolved}"</echo> + </target> + <target name="-post-jar"> +  +  + </target> + <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/> +  + <target depends="init,compile" description="Run a main class." name="run"> + <j2seproject1:java> + <customize> + <arg line="${application.args}"/> + </customize> + </j2seproject1:java> + </target> + <target name="-do-not-recompile"> + <property name="javac.includes.binary" value=""/> + </target> + <target depends="init,-do-not-recompile,compile-single" name="run-single"> + <fail unless="run.class">Must select one file in the IDE or set run.class</fail> + <j2seproject1:java classname="${run.class}"/> + </target> +  + <target depends="init" if="netbeans.home" name="-debug-start-debugger"> + <j2seproject1:nbjpdastart name="${debug.class}"/> + </target> + <target depends="init,compile" name="-debug-start-debuggee"> + <j2seproject3:debug> + <customize> + <arg line="${application.args}"/> + </customize> + </j2seproject3:debug> + </target> + <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/> + <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto"> + <j2seproject1:nbjpdastart stopclassname="${main.class}"/> + </target> + <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/> + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single"> + <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> + <j2seproject3:debug classname="${debug.class}"/> + </target> + <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> + <target depends="init" name="-pre-debug-fix"> + <fail unless="fix.includes">Must set fix.includes</fail> + <property name="javac.includes" value="${fix.includes}.java"/> + </target> + <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix"> + <j2seproject1:nbjpdareload/> + </target> + <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> +  + <target depends="init" name="-javadoc-build"> + <mkdir dir="${dist.javadoc.dir}"/> + <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> + <classpath> + <path path="${javac.classpath}"/> + </classpath> + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> + <fileset dir="${src.gen-src.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> + </javadoc> + </target> + <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview"> + <nbbrowse file="${dist.javadoc.dir}/index.html"/> + </target> + <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/> +  + <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test"> + <mkdir dir="${build.test.classes.dir}"/> + </target> + <target name="-pre-compile-test"> +  +  + </target> + <target if="do.depend.true" name="-compile-test-depend"> + <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> + <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/> + <copy todir="${build.test.classes.dir}"/> + </target> + <target name="-post-compile-test"> +  +  + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/> + <target name="-pre-compile-test-single"> +  +  + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> + <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/> + <copy todir="${build.test.classes.dir}"/> + </target> + <target name="-post-compile-test-single"> +  +  + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/> +  + <target depends="init" if="have.tests" name="-pre-test-run"> + <mkdir dir="${build.test.results.dir}"/> + </target> + <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> + <j2seproject3:junit testincludes="**/*Test.java"/> + </target> + <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target depends="init" if="have.tests" name="test-report"/> + <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/> + <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/> + <target depends="init" if="have.tests" name="-pre-test-run-single"> + <mkdir dir="${build.test.results.dir}"/> + </target> + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail> + <j2seproject3:junit excludes="" includes="${test.includes}"/> + </target> + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> +  + <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test"> + <fail unless="test.class">Must select one file in the IDE or set test.class</fail> + <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/> + <delete file="${test.report.file}"/> + <mkdir dir="${build.test.results.dir}"/> + <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}"> + <customize> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <arg value="${test.class}"/> + <arg value="showoutput=true"/> + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/> + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/> + </customize> + </j2seproject3:debug> + </target> + <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> + <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> + </target> + <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> + <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> + <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/> + </target> + <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/> +  + <target depends="init,compile-single" name="run-applet"> + <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail> + <j2seproject1:java classname="sun.applet.AppletViewer"> + <customize> + <arg value="${applet.url}"/> + </customize> + </j2seproject1:java> + </target> +  + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet"> + <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail> + <j2seproject3:debug classname="sun.applet.AppletViewer"> + <customize> + <arg value="${applet.url}"/> + </customize> + </j2seproject3:debug> + </target> + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/> +  + <target depends="init" name="deps-clean" unless="no.deps"/> + <target depends="init" name="-do-clean"> + <delete dir="${build.dir}"/> + <delete dir="${dist.dir}"/> + </target> + <target name="-post-clean"> +  +  + </target> + <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/> +</project> Added: workspace/max/jpaap/demo/nbproject/genfiles.properties =================================================================== --- workspace/max/jpaap/demo/nbproject/genfiles.properties (rev 0) +++ workspace/max/jpaap/demo/nbproject/genfiles.properties 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,8 @@ +build.xml.data.CRC32=b4636918 +build.xml.script.CRC32=d97338d6 +build.xml.stylesheet.CRC32=958a1d3e +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=4784f849 +nbproject/build-impl.xml.script.CRC32=6c3f21a8 +nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5 Added: workspace/max/jpaap/demo/nbproject/private/config.properties =================================================================== Added: workspace/max/jpaap/demo/nbproject/private/private.properties =================================================================== --- workspace/max/jpaap/demo/nbproject/private/private.properties (rev 0) +++ workspace/max/jpaap/demo/nbproject/private/private.properties 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,7 @@ +compile.on.save=true +do.depend=false +do.jar=true +javac.debug=true +javadoc.preview=true +jaxws.endorsed.dir=C:\\work\\products\\netbeans-6.5\\java2\\modules\\ext\\jaxws21\\api:C:\\work\\products\\netbeans-6.5\\ide10\\modules\\ext\\jaxb\\api +user.properties.file=C:\\Users\\max\\.netbeans\\6.5\\build.properties Added: workspace/max/jpaap/demo/nbproject/private/private.xml =================================================================== --- workspace/max/jpaap/demo/nbproject/private/private.xml (rev 0) +++ workspace/max/jpaap/demo/nbproject/private/private.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-private xmlns="http://www.netbeans.org/ns/project-private/1"> + <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/> +</project-private> Added: workspace/max/jpaap/demo/nbproject/project.properties =================================================================== --- workspace/max/jpaap/demo/nbproject/project.properties (rev 0) +++ workspace/max/jpaap/demo/nbproject/project.properties 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,69 @@ +application.title=demo +application.vendor=max +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=${basedir}/build/netbeans +build.apt.dir=${build.dir}/gen-src +build.generated.dir=${build.dir}/generated +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/demo.jar +dist.javadoc.dir=${dist.dir}/javadoc +excludes= +file.reference.jpa.jar=lib/jpa.jar +file.reference.jpaap.jar=lib/jpaap.jar +includes=** +jar.compress=false +javac.classpath=\ + ${file.reference.jpa.jar}:\ + ${file.reference.jpaap.jar}:\ + ${build.apt.dir} +# Space-separated list of extra javac options +javac.compilerargs=-s ${build.apt.dir} +javac.deprecation=false +javac.source=1.6 +javac.target=1.6 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +main.class= +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +src.gen-src.dir=build\\netbeans\\gen-src Added: workspace/max/jpaap/demo/nbproject/project.xml =================================================================== --- workspace/max/jpaap/demo/nbproject/project.xml (rev 0) +++ workspace/max/jpaap/demo/nbproject/project.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.java.j2seproject</type> + <configuration> + <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> + <name>demo</name> + <minimum-ant-version>1.6.5</minimum-ant-version> + <source-roots> + <root id="src.dir"/> + <root id="src.gen-src.dir"/> + </source-roots> + <test-roots/> + </data> + </configuration> +</project> Added: workspace/max/jpaap/demo/src/META-INF/orm.xml =================================================================== --- workspace/max/jpaap/demo/src/META-INF/orm.xml (rev 0) +++ workspace/max/jpaap/demo/src/META-INF/orm.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd" + version="2.0" + > +  + <package>model</package>  + <entity class="Order" access="FIELD" metadata-complete="true">  + <attributes> + <id name="id"> + <column name="fld_id"/> + </id> + <basic name="filled"></basic> + <basic name="date"></basic> + <one-to-many name="items" target-entity="Item" fetch="EAGER">  + <cascade> + <cascade-persist/> + </cascade> + </one-to-many> + <many-to-one name="shop"/> + <element-collection name="notes"/>  + </attributes> + </entity> +</entity-mappings> + + +  \ No newline at end of file Added: workspace/max/jpaap/demo/src/Test.java =================================================================== --- workspace/max/jpaap/demo/src/Test.java (rev 0) +++ workspace/max/jpaap/demo/src/Test.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,146 @@ +import static javax.jpa.criteria.JoinType.*; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.Set; + +import javax.jpa.criteria.Expression; +import javax.jpa.criteria.Join; +import javax.jpa.criteria.ListJoin; +import javax.jpa.criteria.Path; +import javax.jpa.criteria.Query; +import javax.jpa.criteria.QueryBuilder; +import javax.jpa.criteria.Root; +import javax.jpa.metamodel.Entity; + +import model.metamodel.Item_; +import model.metamodel.Order_; +import model.metamodel.Product_; +import model.metamodel.Shop_; +import model.Item; +import model.Order; +import model.Product; + +/** + * Writing queries involves passing typesafe, statically cached, metamodel + * objects to the query builder in order to create the various parts of + * the query. The typesafe metamodel objects were validated at init time, + * so it is impossible to build invalid queries in the application code. + */ +public class Test { + + QueryBuilder qb; + + public void test() { + Query q = qb.create(); + + Root<Order> order = q.addRoot(Order.class); + Join<Item, Product> product = order.join(Order_.items) + .join(Item_.product); + + Path<BigDecimal> price = product.get(Product_.price); + Path<Boolean> filled = order.get(Order_.filled); + Path<Date> date = order.get(Order_.date); + + q.select(order, product) + .where( qb.and( qb.gt(price, 100.00), qb.not(filled) ) ) + .order( qb.ascending(price), qb.descending(date) ); + } + + public void testUntypesafe() { + Query q = qb.create(); + + Root<Order> order = q.addRoot(Order.class); + Join<Item, Product> product = order.join("items") + .join("product"); + + Path<BigDecimal> price = product.get("price"); + Path<Boolean> filled = order.get("filled"); + Path<Date> date = order.get("date"); + + q.select(order, product) + .where( qb.and( qb.gt(price, 100.00), qb.not(filled) ) ) + .order( qb.ascending(price), qb.descending(date) ); + } + + /** + * Navigation by joining + */ + public void test2() { + Query q = qb.create(); + + Root<Product> product = q.addRoot(Product.class); + Join<Item, Order> order = product.join(Product_.items) + .join(Item_.order); + + q.select(product) + .where( qb.equal(order.get(Order_.id), 12345l) ); + } + + public void testMap() { + Query q = qb.create(); + + Root<Item> item = q.addRoot(Item.class); + Join<Item, Order> io = item.join(Item_.namedOrders); + + } + + /** + * Navigation by compound Path + */ + public void test3() { + Query q = qb.create(); + + Root<Item> item = q.addRoot(Item.class); + Path<String> shopName = item.get(Item_.order) + .get(Order_.shop) + .get(Shop_.name); + q.select(item) + .where( qb.equal(shopName, "amazon.com") ); + } + + public void test4() { + Query q = qb.create(); + + Root<Order> order = q.addRoot(Order.class); + ListJoin<Order, String> note = order.join(Order_.notes); + Expression<Set<Item>> items = order.get(Order_.items); + order.fetch(Order_.items, inner); + + q.select(note) + .where( qb.and( qb.lt(note.index(), 10), qb.isNotEmpty(items) ) ); + } + + public void test4Untypesafe() { + Query q = qb.create(); + + Root<Order> order = q.addRoot(Order.class); + ListJoin<Order, String> note = order.joinList("notes"); + Expression<Set<Item>> items = order.get("items"); + order.fetch("items", inner); + + q.select(note) + .where( qb.and( qb.lt(note.index(), 10), qb.isNotEmpty(items) ) ); + } + + /*public void test5() { + Expression<Long> l= null; + Expression<Integer> i= null; + Expression<Float> x= null; + Expression<Float> y= null; + + Expression<Number> n; + Expression<Float> f; + Expression<String> s = null; + + n = qb.quot(l, i); + + f = qb.sum(x, y); + + n = qb.quot(x, y); + + javax.jpa.criteria.Order o = qb.asc(n); + javax.jpa.criteria.Order p = qb.ascending(s); + }*/ + +} Added: workspace/max/jpaap/demo/src/model/Item.java =================================================================== --- workspace/max/jpaap/demo/src/model/Item.java (rev 0) +++ workspace/max/jpaap/demo/src/model/Item.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,63 @@ +package model; + +import java.util.Map; +import java.util.Set; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; + +@Entity +public class Item { + + long _id; + + int _quantity; + + Product _product; + + Order _order; + + @Id + public long getId() { + return _id; + } + + public void setId(long id) { + this._id = id; + } + + public int getQuantity() { + return _quantity; + } + + public void setQuantity(int quantity) { + this._quantity = quantity; + } + + @ManyToOne + public Product getProduct() { + return _product; + } + + public void setProduct(Product product) { + this._product = product; + } + + @ManyToOne + public Order getOrder() { + return _order; + } + + public void setOrder(Order order) { + this._order = order; + } + + @OneToMany + public Map<String, Order> getNamedOrders() { + return null; + } + + +} Added: workspace/max/jpaap/demo/src/model/Order.java =================================================================== --- workspace/max/jpaap/demo/src/model/Order.java (rev 0) +++ workspace/max/jpaap/demo/src/model/Order.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,28 @@ +package model; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import java.util.Date; +import java.util.List; +import java.util.Set; + +//@Entity +public class Order { + + //@Id + long id; + + //@OneToMany + Set<Item> items; + + boolean filled; + Date date; + + //@OneToMany + List<String> notes; + + //@ManyToOne + Shop shop; +} Added: workspace/max/jpaap/demo/src/model/Product.java =================================================================== --- workspace/max/jpaap/demo/src/model/Product.java (rev 0) +++ workspace/max/jpaap/demo/src/model/Product.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,27 @@ +package model; + +import java.math.BigDecimal; +import java.util.Set; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; + +@Entity +public class Product { + + @Id + long id; + + int test; + + String description; + BigDecimal price; + + @ManyToOne + Shop shop; + + @OneToMany + Set<Item> items; +} Added: workspace/max/jpaap/demo/src/model/Shop.java =================================================================== --- workspace/max/jpaap/demo/src/model/Shop.java (rev 0) +++ workspace/max/jpaap/demo/src/model/Shop.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,12 @@ +package model; + +import javax.persistence.Entity; +import javax.persistence.Id; + +@Entity +public class Shop { + @Id + long id; + String name; +} + \ No newline at end of file Modified: workspace/max/jpaap/jpaap/.classpath =================================================================== --- workspace/max/jpaap/jpaap/.classpath 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/.classpath 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="target/gen-src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry combineaccessrules="false" kind="src" path="/javax.persistence"/> Modified: workspace/max/jpaap/jpaap/.project =================================================================== --- workspace/max/jpaap/jpaap/.project 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/.project 2009-01-28 14:40:59 UTC (rev 13305) @@ -9,20 +9,9 @@ <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> + </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> </natures> </projectDescription> Modified: workspace/max/jpaap/jpaap/build.xml =================================================================== --- workspace/max/jpaap/jpaap/build.xml 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/build.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -32,7 +32,9 @@  <target name="jaxb" depends="init"> <mkdir dir="${gen.dir}"/> - <exec executable="${java.home}/bin/xjc"> + <exec executable="xjc"> + <arg value="-p"/> + <arg value="org.jboss.jpa.metamodel.xml.jaxb"/> <arg value="-d"/> <arg value="${gen.dir}"/> <arg value="${resource.dir}/orm_2_0.xsd"/> @@ -49,6 +51,7 @@ <mkdir dir="${classes.dir}"/> <echo message="${ant.project.name}: ${ant.file}"/> <javac debug="true" debuglevel="${debuglevel}" destdir="${classes.dir}" source="${source}" target="${target}"> + <compilerarg value="-proc:none"/>  <src path="${src.dir}"/> <src path="${gen.dir}"/> <classpath refid="lib.path"/> Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/ImportContextImpl.java =================================================================== --- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/ImportContextImpl.java 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/ImportContextImpl.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -51,6 +51,8 @@ public String importType(String fqcn) { String result = fqcn; + //if(fqcn==null) return "/** (null) **/"; + String additionalTypePart = null; if(fqcn.indexOf('<')>=0) { additionalTypePart = result.substring(fqcn.indexOf('<')); Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java =================================================================== --- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,8 +1,7 @@ package org.jboss.jpa.metamodel.ap; -import com.sun.java.xml.ns.persistence.orm.EntityMappings; -import com.sun.java.xml.ns.persistence.orm.Entity; + import static javax.lang.model.SourceVersion.RELEASE_6; import java.io.*; @@ -17,43 +16,72 @@ import javax.lang.model.util.Elements; import javax.tools.Diagnostic; import javax.tools.FileObject; +import javax.tools.StandardLocation; +import javax.tools.JavaFileManager.Location; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import org.jboss.jpa.metamodel.ap.annotation.MetaEntity; import org.jboss.jpa.metamodel.ap.xml.XmlMetaEntity; +import org.jboss.jpa.metamodel.xml.jaxb.Entity; +import org.jboss.jpa.metamodel.xml.jaxb.EntityMappings; +import org.jboss.jpa.metamodel.xml.jaxb.ObjectFactory; -@SupportedAnnotationTypes("javax.persistence.Entity") +//@SupportedAnnotationTypes("javax.persistence.Entity") +@SupportedAnnotationTypes("*") // TODO: this is not very effective @SupportedSourceVersion(RELEASE_6) public class JPAMetaModelEntityProcessor extends AbstractProcessor { - private static final String ORM_XML_LOCATION = "/META-INF/orm.xml"; + //private static final String ORM_XML_LOCATION = "/META-INF/orm.xml"; private static final Map<String, IMetaEntity> metaEntities = new HashMap<String, IMetaEntity>(); private boolean ormProcessed = false; public JPAMetaModelEntityProcessor() { + System.out.println("Created Processor " + this); } - public void init(ProcessingEnvironment env) { + public void init(ProcessingEnvironment env) { super.init(env); - parsingOrmXml(); + System.out.println("Init Processor " + this); } + + private void parsingOrmXmls() { + //make sure that we process ORM files only once per round + if (ormProcessed) return; + parsingOrmXml("/META-INF", "orm.xml"); + //simulate 20 different ORM files to parse + //Removed since these causes issues in Eclipse APT + //for (int i = 1 ; i <= 20 ; i++) parsingOrmXml("/model" + i , "orm.xml"); + + ormProcessed = true; + } /** * Tries to check whether a orm.xml file exists and parses it using JAXB */ - private void parsingOrmXml() { - processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Checking for orm.xml"); - InputStream ormStream = this.getClass().getResourceAsStream(ORM_XML_LOCATION); + private void parsingOrmXml(String pkg, String name) { + String resource = pkg +"/"+name; + processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "XYZ Checking for " + resource); + + InputStream ormStream = null; + try { + FileObject resource2 = processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, pkg, name); + ormStream = resource2.openInputStream(); + } catch (IOException e1) { + processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, "Could not locate " + resource + " via APT api"); + //TODO: possible remove this fallback since it should not be needed. + ormStream = this.getClass().getResourceAsStream(resource); + } + if (ormStream == null) { - processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "No orm.xml found."); + processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, resource + " not found."); return; } try { - JAXBContext jc = JAXBContext.newInstance(com.sun.java.xml.ns.persistence.orm.ObjectFactory.class); + JAXBContext jc = JAXBContext.newInstance(ObjectFactory.class); Unmarshaller unmarshaller = jc.createUnmarshaller(); EntityMappings mappings = (EntityMappings) unmarshaller.unmarshal(ormStream); Collection<Entity> entities = mappings.getEntity(); @@ -70,6 +98,12 @@ } catch (JAXBException e) { processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Error unmarshalling orm.xml"); e.printStackTrace(); + } catch (Exception e) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "Problem while reading " + resource + " " + e.getMessage()); + e.printStackTrace(); + //TODO: too bad you can't mark resources as having issues } } @@ -86,9 +120,14 @@ if (aRoundEnvironment.processingOver()) { - return false; + //assuming that when processing is over, we are done and clear resources like ORM parsing + //we could keep some ORM parsing in memory but how to detect that a file has changed / not changed? + ormProcessed = false; + metaEntities.clear(); + processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Clear ORM processing resources"); + return false; } - + parsingOrmXmls(); Set<? extends Element> elements = aRoundEnvironment.getRootElements(); for (Element element : elements) { @@ -147,7 +186,7 @@ Diagnostic.Kind.ERROR, "Problem opening file to write MetaModel for " + entity.getSimpleName() + ioEx.getMessage()); - } + } } /** Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java =================================================================== --- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -17,7 +17,7 @@ */ package org.jboss.jpa.metamodel.ap.xml; -import com.sun.java.xml.ns.persistence.orm.*; +import org.jboss.jpa.metamodel.xml.jaxb.*; import org.jboss.jpa.metamodel.ap.IMetaEntity; import org.jboss.jpa.metamodel.ap.IMetaMember; import org.jboss.jpa.metamodel.ap.ImportContext; Property changes on: workspace/max/jpaap/test ___________________________________________________________________ Name: svn:ignore - build bin target + build bin target .apt_generated gen-src Modified: workspace/max/jpaap/test/.classpath =================================================================== --- workspace/max/jpaap/test/.classpath 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/.classpath 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="**/*.class" kind="src" path="build/classes"/> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="gen-src"> @@ -8,7 +7,7 @@ <attribute name="optional" value="true"/> </attributes> </classpathentry> - <classpathentry combineaccessrules="false" kind="src" path="/javax.persistence"/> <classpathentry combineaccessrules="false" kind="src" path="/jpaap"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="lib" path="/javax.persistence/target/jpa.jar"/> + <classpathentry kind="output" path="build/eclipse/classes"/> </classpath> Modified: workspace/max/jpaap/test/.factorypath =================================================================== --- workspace/max/jpaap/test/.factorypath 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/.factorypath 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,4 +1,4 @@ <factorypath> - <factorypathentry kind="WKSPJAR" id="/jpaap/jpaap.jar" enabled="false" runInBatchMode="false"/> - <factorypathentry kind="WKSPJAR" id="/javax.persistence/jpa.jar" enabled="false" runInBatchMode="false"/> + <factorypathentry kind="WKSPJAR" id="/javax.persistence/target/jpa.jar" enabled="true" runInBatchMode="false"/> + <factorypathentry kind="WKSPJAR" id="/jpaap/target/jpaap.jar" enabled="true" runInBatchMode="false"/> </factorypath> Modified: workspace/max/jpaap/test/.settings/org.eclipse.jdt.apt.core.prefs =================================================================== --- workspace/max/jpaap/test/.settings/org.eclipse.jdt.apt.core.prefs 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/.settings/org.eclipse.jdt.apt.core.prefs 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,4 +1,4 @@ -#Fri Jan 16 13:37:51 CET 2009 +#Wed Jan 28 10:11:38 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.apt.aptEnabled=true org.eclipse.jdt.apt.genSrcDir=gen-src Modified: workspace/max/jpaap/test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/max/jpaap/test/.settings/org.eclipse.jdt.core.prefs 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/.settings/org.eclipse.jdt.core.prefs 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,3 +1,3 @@ -#Fri Jan 16 13:37:51 CET 2009 +#Wed Jan 28 10:11:38 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.processAnnotations=enabled Modified: workspace/max/jpaap/test/test jpa-build.xml.launch =================================================================== --- workspace/max/jpaap/test/test jpa-build.xml.launch 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/test jpa-build.xml.launch 2009-01-28 14:40:59 UTC (rev 13305) @@ -2,18 +2,13 @@ <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/test/jpa-build.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/> <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="test"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.6.0_10"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/test/jpa-build.xml}"/> <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> </launchConfiguration>

16 years

1
0
0 / 0

JBoss Tools SVN: r13304 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-01-28 06:06:19 -0500 (Wed, 28 Jan 2009) New Revision: 13304 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta Log: JBIDE-3656 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2009-01-28 10:42:00 UTC (rev 13303) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2009-01-28 11:06:19 UTC (rev 13304) @@ -2298,7 +2298,7 @@ <Editor name="ListString"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general" - default="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..." + default="180" name="parameter reload secs" xmlname="parameterReloadSecs"/> </XModelAttributes> <XActionItem kind="list">

16 years

1
0
0 / 0

JBoss Tools SVN: r13303 - trunk/jsf/docs/userguide/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-01-28 05:42:00 -0500 (Wed, 28 Jan 2009) New Revision: 13303 Modified: trunk/jsf/docs/userguide/en/modules/editors.xml Log: https://jira.jboss.org/jira/browse/JBDS-475 - updating the "Content Assist" section; Modified: trunk/jsf/docs/userguide/en/modules/editors.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/editors.xml 2009-01-28 10:41:29 UTC (rev 13302) +++ trunk/jsf/docs/userguide/en/modules/editors.xml 2009-01-28 10:42:00 UTC (rev 13303) @@ -220,6 +220,28 @@ </listitem> </itemizedlist> + <para>Notice, that code completion for EL variables has icons illustrating what they are from. + Currently it's performed for resource bundles, JSF and Seam components.</para> + + <figure> + <title>JSF Content Assist</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/editors_features/editors_features_8d.png"/> + </imageobject> + </mediaobject> + </figure> + + <figure> + <title>Seam Content Assist</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/editors_features/editors_features_8c.png"/> + </imageobject> + </mediaobject> + </figure> + + <para>Also, as you can see, the ranking and sorting are available in EL code completions.</para> <section id="JSFProjectFiles3087"> @@ -567,7 +589,7 @@ <title>JavaScript Tags Content Assist</title> <mediaobject> <imageobject> - <imagedata fileref="images/ediors_features/editors_features_27.png" + <imagedata fileref="images/editors_features/editors_features_27.png" scale="75"/> </imageobject> </mediaobject> @@ -581,7 +603,15 @@ <title>RichFaces components</title> <para>JBDS indeed provides code completion for <ulink url="http://www.jboss.org/jbossrichfaces">RichFaces</ulink> framework - components. All you have to do is to install RichFaces libraries into your + components.</para> + + <tip> + <title>Tip:</title> + + <para>RichFaces 3.2 is now fully supported in code completion.</para> + </tip> + + <para>All you have to do is to install RichFaces libraries into your project. See <ulink url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..." >here</ulink> how to install it.</para> @@ -655,8 +685,8 @@ <para>Follow these steps to set what is available for code assist:</para> <itemizedlist> <listitem> - <para>Adds code assist for JSF pre-defined objects, such as <![CDATA[value=]]><emphasis - role="italic"> + <para>Adds code assist for JSF pre-defined objects, such as + <![CDATA[value=]]><emphasis role="italic"> <property>"#{param}"</property> </emphasis>:</para> </listitem> @@ -933,15 +963,16 @@ <title>Support for Taglib versions</title> <para>VPE templates now support various versions of tag libraries. It means that the - <property>VPE</property> takes control under those components which have different parameters or - preview according to the framework version (like seam 1.2 and seam 2.0, or JSF - 1.1 and JSF 1.2).</para> + <property>VPE</property> takes control under those components which have + different parameters or preview according to the framework version (like seam + 1.2 and seam 2.0, or JSF 1.1 and JSF 1.2).</para> <para>For example, <emphasis> - <property><s:decorate></property></emphasis> element in seam has different - parameters in versions 1.2 and 2.0 as well as <emphasis> - <property><h:outputLink></property></emphasis> JSF - element has different preview in versions 1.1 and 1.2.</para> + <property><s:decorate></property> + </emphasis> element in seam has different parameters in versions 1.2 and 2.0 as + well as <emphasis> + <property><h:outputLink></property> + </emphasis> JSF element has different preview in versions 1.1 and 1.2.</para> </section> </section>

16 years

1
0
0 / 0

JBoss Tools SVN: r13302 - trunk/jsf/docs/userguide/en/images/editors_features.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-01-28 05:41:29 -0500 (Wed, 28 Jan 2009) New Revision: 13302 Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_12.png trunk/jsf/docs/userguide/en/images/editors_features/editors_features_13.png trunk/jsf/docs/userguide/en/images/editors_features/editors_features_14.png trunk/jsf/docs/userguide/en/images/editors_features/editors_features_27.png trunk/jsf/docs/userguide/en/images/editors_features/editors_features_29.png Log: https://jira.jboss.org/jira/browse/JBDS-475 - updating the screens; Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_12.png =================================================================== (Binary files differ) Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_13.png =================================================================== (Binary files differ) Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_14.png =================================================================== (Binary files differ) Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_27.png =================================================================== (Binary files differ) Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_29.png =================================================================== (Binary files differ)

16 years

1
0
0 / 0

JBoss Tools SVN: r13301 - trunk/jsf/docs/userguide/en/images/editors_features.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-01-28 05:40:56 -0500 (Wed, 28 Jan 2009) New Revision: 13301 Added: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8a.png trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8b.png trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8c.png trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8d.png Log: https://jira.jboss.org/jira/browse/JBDS-475 - adding new screens; Added: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8a.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8a.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8b.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8c.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8c.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8d.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8d.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years

1
0
0 / 0

JBoss Tools SVN: r13300 - in trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: internal and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2009-01-27 19:27:44 -0500 (Tue, 27 Jan 2009) New Revision: 13300 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java Log: JBIDE-3660 Portlet facet doesn't recognize JBoss Portal server within EPP distribution Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2009-01-28 00:17:44 UTC (rev 13299) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2009-01-28 00:27:44 UTC (rev 13300) @@ -72,6 +72,8 @@ static final String USER_LIBRARY_NAME = "userLibraryName"; //$NON-NLS-1$ static final String SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR = "deploy/jboss-portal.sar"; //$NON-NLS-1$ + + static final String SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR = "deploy/jboss-portal-ha.sar"; //$NON-NLS-1$ static final String SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL = "deploy/simple-portal"; //$NON-NLS-1$ Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2009-01-28 00:17:44 UTC (rev 13299) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2009-01-28 00:27:44 UTC (rev 13300) @@ -54,10 +54,16 @@ IPath jbossLocation = runtime.getLocation(); IPath configPath = jbossLocation.append(IJBossServerConstants.SERVER).append(jbossRuntime.getJBossConfiguration()); File configFile = configPath.toFile(); + // JBoss Portal server if (exists(configFile, IPortletConstants.SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR)) { return true; } + // JBoss Portal clustering server + if (exists(configFile, + IPortletConstants.SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR)) { + return true; + } // JBoss portletcontainer if (exists(configFile, IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL)) {

16 years

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits January 2009