JBoss Tools SVN: r12320 - trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-05 17:38:50 -0500 (Fri, 05 Dec 2008)
New Revision: 12320
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF
Log:
JBIDE-3321 Bad metadata for various features
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF 2008-12-05 22:38:45 UTC (rev 12319)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF 2008-12-05 22:38:50 UTC (rev 12320)
@@ -17,3 +17,4 @@
Export-Package: org.hibernate.eclipse.jdt.ui.test
Bundle-Activator: org.hibernate.eclipse.jdt.ui.test.HibernateJDTuiTestPlugin
Bundle-ClassPath: org.hibernate.eclipse.jdt.ui.test.jar
+Bundle-Vendor: JBoss, a division of Red Hat
17 years, 4 months
JBoss Tools SVN: r12319 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-05 17:38:45 -0500 (Fri, 05 Dec 2008)
New Revision: 12319
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF/MANIFEST.MF
Log:
JBIDE-3321 Bad metadata for various features
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF/MANIFEST.MF 2008-12-05 22:38:36 UTC (rev 12318)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF/MANIFEST.MF 2008-12-05 22:38:45 UTC (rev 12319)
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.hibernate.eclipse.jdt.ui;singleton:=true
Bundle-Version: 3.2.0.beta9
Bundle-Activator: org.hibernate.eclipse.jdt.ui.Activator
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat
Bundle-Localization: plugin
Require-Bundle: org.eclipse.jdt.ui,
org.eclipse.jdt.core,
17 years, 4 months
JBoss Tools SVN: r12318 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-05 17:38:36 -0500 (Fri, 05 Dec 2008)
New Revision: 12318
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF
Log:
JBIDE-3321 Bad metadata for various features
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2008-12-05 20:28:20 UTC (rev 12317)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2008-12-05 22:38:36 UTC (rev 12318)
@@ -7,7 +7,7 @@
lib/hibernate-tools-tests.jar,
lib/hsqldb.jar,
lib/jaxen-1.1-beta-7.jar
-Bundle-Vendor: JBoss, a division of Red Hat.
+Bundle-Vendor: JBoss, a division of Red Hat
Bundle-Localization: plugin
Export-Package: org.hibernate.eclipse.console.test,
org.hibernate.eclipse.console.test.mappingproject,
17 years, 4 months
JBoss Tools SVN: r12317 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-12-05 15:28:20 -0500 (Fri, 05 Dec 2008)
New Revision: 12317
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/shuttle.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
Log:
RESOLVED - issue JBIDE-3279: rich:listShuttle bugs.
https://jira.jboss.org/jira/browse/JBIDE-3279
Item #2 has been fixed: Text-align shouldn't be applyed for caption and target labels
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/shuttle.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/shuttle.css 2008-12-05 19:10:47 UTC (rev 12316)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/shuttle.css 2008-12-05 20:28:20 UTC (rev 12317)
@@ -1,11 +1,11 @@
.rich-list-shuttle {
-
}
.rich-shuttle-source-caption,.rich-shuttle-target-caption {
font-family: Arial, Verdana, sans-serif;
font-size: 11px;
font-weight: bold;
+ text-align:left;
}
.rich-shuttle-list-header {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-12-05 19:10:47 UTC (rev 12316)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-12-05 20:28:20 UTC (rev 12317)
@@ -191,8 +191,8 @@
"rich-shuttle-button rich-shuttle-bottom"); //$NON-NLS-1$
// styles of captions
- defaultStyleClasses.put("sourceCaption", "rich-shuttle-source-caption"); //$NON-NLS-1$ //$NON-NLS-2$
- defaultStyleClasses.put("targetCaption", "rich-shuttle-target-caption"); //$NON-NLS-1$ //$NON-NLS-2$
+ defaultStyleClasses.put(SOURCE_CAPTION, "rich-shuttle-source-caption"); //$NON-NLS-1$
+ defaultStyleClasses.put(TARGET_CAPTION, "rich-shuttle-target-caption"); //$NON-NLS-1$
// styles of rows
defaultStyleClasses.put("sourceRow", "rich-shuttle-source-row"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -224,9 +224,8 @@
defaultLabels.put("bottomControl", "Last"); //$NON-NLS-1$ //$NON-NLS-2$
// caption labels
- defaultLabels.put("sourceCaption", ""); //$NON-NLS-1$ //$NON-NLS-2$
- defaultLabels.put("targetCaption", ""); //$NON-NLS-1$ //$NON-NLS-2$
-
+ defaultLabels.put(SOURCE_CAPTION, ""); //$NON-NLS-1$
+ defaultLabels.put(TARGET_CAPTION, ""); //$NON-NLS-1$
}
/**
17 years, 4 months
JBoss Tools SVN: r12316 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-12-05 14:10:47 -0500 (Fri, 05 Dec 2008)
New Revision: 12316
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml
Log:
CODING IN PROGRESS - issue JBIDE-3279: rich:listShuttle bugs.
https://jira.jboss.org/jira/browse/JBIDE-3279
Item #1 has been fixed: Attributes sourceListWidth, targetListWidth, listsHeight don't work
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-12-05 18:10:15 UTC (rev 12315)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-12-05 19:10:47 UTC (rev 12316)
@@ -803,33 +803,26 @@
// prepare lists attributes
- String listsHeightString = sourceElement
- .getAttribute(ATTR_LISTS_HEIGHT);
- try {
- Integer.parseInt(listsHeightString);
- listsHeight = listsHeightString;
- } catch (NumberFormatException e) {
+ listsHeight = sourceElement.getAttribute(ATTR_LISTS_HEIGHT);
+ if (listsHeight == null) {
listsHeight = DEFAULT_LIST_HEIGHT;
+ } else {
+ listsHeight = VpeStyleUtil.addPxIfNecessary(listsHeight);
}
- String sourceListWithString = sourceElement
- .getAttribute(ATTR_SOURCE_LIST_WIDTH);
- try {
- Integer.parseInt(sourceListWithString);
- sourceListsWidth = sourceListWithString;
- } catch (NumberFormatException e) {
+ sourceListsWidth = sourceElement.getAttribute(ATTR_SOURCE_LIST_WIDTH);
+ if (sourceListsWidth == null) {
sourceListsWidth = DEFAULT_LIST_WIDTH;
+ } else {
+ sourceListsWidth = VpeStyleUtil.addPxIfNecessary(sourceListsWidth);
}
-
- String targetListWithString = sourceElement
- .getAttribute(ATTR_TARGET_LIST_WIDTH);
- try {
- Integer.parseInt(targetListWithString);
- targetListsWidth = targetListWithString;
- } catch (NumberFormatException e) {
+
+ targetListsWidth = sourceElement.getAttribute(ATTR_TARGET_LIST_WIDTH);
+ if (targetListsWidth == null) {
targetListsWidth = DEFAULT_LIST_WIDTH;
+ } else {
+ targetListsWidth = VpeStyleUtil.addPxIfNecessary(targetListsWidth);
}
-
}
private void clearData() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml 2008-12-05 18:10:15 UTC (rev 12315)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml 2008-12-05 19:10:47 UTC (rev 12316)
@@ -13,7 +13,10 @@
<f:view>
<rich:listShuttle id="listShuttle" sourceValue="#{person.source}"
- targetValue="#{person.target}" var="items" targetListWidth="200"
+ targetValue="#{person.target}" var="items"
+ sourceListWidth="234"
+ targetListWidth="278"
+ listsHeight="245"
sourceCaptionLabel="source label" targetCaptionLabel="target label">
<rich:column>
<f:facet name="header">
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 2008-12-05 18:10:15 UTC (rev 12315)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml 2008-12-05 19:10:47 UTC (rev 12316)
@@ -7,7 +7,7 @@
</TR>
<TR>
<TD>
- <DIV CLASS="rich-shuttle-list-content" STYLE="width: 140px; height: 140px;">
+ <DIV CLASS="rich-shuttle-list-content" STYLE="width: 234px; height: 245px;">
<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0">
<TR CLASS="">
<TH
@@ -101,7 +101,7 @@
</DIV>
</TD>
<TD>
- <DIV CLASS="rich-shuttle-list-content" STYLE="height: 140px;">
+ <DIV CLASS="rich-shuttle-list-content" STYLE="width: 278px; height: 245px;">
<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0">
<TR CLASS="">
<TH
17 years, 4 months
JBoss Tools SVN: r12315 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-05 13:10:15 -0500 (Fri, 05 Dec 2008)
New Revision: 12315
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamProjectNewWizardTest.java
Log:
fix for seam.ui JUnit test errors
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-12-05 17:17:44 UTC (rev 12314)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-12-05 18:10:15 UTC (rev 12315)
@@ -42,7 +42,7 @@
suite.addTestSuite(OpenSeamComponentDialogTest.class);
suite.addTest(SeamComponentsViewAllTests.suite());
- suite.addTestSuite(SeamProjectNewWizardTest.class);
+ suite.addTest(SeamProjectNewWizardTest.suite());
suite.addTestSuite(SeamFormNewWizardTest.class);
suite.addTestSuite(SeamPreferencesPageTest.class);
suite.addTestSuite(SeamViewHyperlinkPartitionerTest.class);
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java 2008-12-05 17:17:44 UTC (rev 12314)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java 2008-12-05 18:10:15 UTC (rev 12315)
@@ -15,97 +15,102 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.jboss.tools.common.util.WorkbenchUtils;
import org.jboss.tools.seam.ui.ISeamUiConstants;
import org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage;
import org.jboss.tools.test.util.JobUtils;
+
/**
* @author dazarov
* JBIDE-3254 tests
*/
public class PackageNamesTest extends TestCase{
NewProjectDataModelFacetWizard wizard;
- IWizardPage startSeamPrjWzPg;
+ SeamInstallWizardPage seamWizPg;
+ WizardDialog dialog;
protected void setUp() throws Exception {
- super.setUp();
+ wizard = (NewProjectDataModelFacetWizard)WorkbenchUtils.findWizardByDefId(ISeamUiConstants.NEW_SEAM_PROJECT_WIZARD_ID);
+
+ dialog = new WizardDialog(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ wizard);
+
}
+
+ @Override
+ protected void tearDown() {
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "");
+ wizard.performCancel();
+ dialog.close();
+ }
public void testProjectNameWithSpaces() {
- SeamInstallWizardPage seamWizPg = startCreateSeamWizard("Seam Test Project");
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam Test Project");
+ showWizard();
+
String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
String testsPkgName = seamWizPg.getTestsPkgName();
- wizard.performCancel();
assertEquals("org.domain.seamtestproject.session", sessionBeanPkgName);
assertEquals("org.domain.seamtestproject.entity", entityBeanPkgName);
assertEquals("org.domain.seamtestproject.test", testsPkgName);
}
+ private void showWizard() {
+ dialog.create();
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+ // delay is needed to wait for dialog initialization is finished
+ // such as default runtime and configuration for seam wizard
+ JobUtils.delay(2000);
+ seamWizPg = (SeamInstallWizardPage)wizard.getPages()[3];
+ }
+
public void testProjectNameWithUnderlines() {
- SeamInstallWizardPage seamWizPg = startCreateSeamWizard("Seam_Test_Project");
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam_Test_Project");
+ showWizard();
+
String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
String testsPkgName = seamWizPg.getTestsPkgName();
- wizard.performCancel();
assertEquals("org.domain.seamtestproject.session", sessionBeanPkgName);
assertEquals("org.domain.seamtestproject.entity", entityBeanPkgName);
assertEquals("org.domain.seamtestproject.test", testsPkgName);
}
public void testProjectNameWithMinuses() {
- SeamInstallWizardPage seamWizPg = startCreateSeamWizard("Seam-Test-Project");
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam-Test-Project");
+ showWizard();
+
String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
String testsPkgName = seamWizPg.getTestsPkgName();
- wizard.performCancel();
assertEquals("org.domain.seamtestproject.session", sessionBeanPkgName);
assertEquals("org.domain.seamtestproject.entity", entityBeanPkgName);
assertEquals("org.domain.seamtestproject.test", testsPkgName);
}
public void testProjectNameWithMultipleDots() {
- SeamInstallWizardPage seamWizPg = startCreateSeamWizard("Seam...Test....Project");
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam...Test....Project");
+ showWizard();
+
String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
String testsPkgName = seamWizPg.getTestsPkgName();
- wizard.performCancel();
assertEquals("org.domain.seam.test.project.session", sessionBeanPkgName);
assertEquals("org.domain.seam.test.project.entity", entityBeanPkgName);
assertEquals("org.domain.seam.test.project.test", testsPkgName);
}
-
- private SeamInstallWizardPage startCreateSeamWizard(String projectName){
- wizard = (NewProjectDataModelFacetWizard)WorkbenchUtils.findWizardByDefId(ISeamUiConstants.NEW_SEAM_PROJECT_WIZARD_ID);
- wizard.getDataModel().setStringProperty("IProjectCreationPropertiesNew.PROJECT_NAME", projectName);
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- wizard);
-
- dialog.create();
- dialog.setBlockOnOpen(false);
- dialog.open();
- // delay is needed to wait for dialog initialization is finished
- // such as default runtime and configuration for seam wizard
- JobUtils.delay(2000);
- startSeamPrjWzPg = wizard.getStartingPage();
- assertNotNull("Cannot create seam start wizard page", startSeamPrjWzPg);
- IWizardPage webModuleWizPg = wizard.getNextPage(startSeamPrjWzPg);
- assertNotNull("Cannot create dynamic web project wizard page",webModuleWizPg);
- IWizardPage jsfCapabilitiesWizPg = wizard.getNextPage(webModuleWizPg);
- assertNotNull("Cannot create JSF capabilities wizard page",jsfCapabilitiesWizPg);
- SeamInstallWizardPage seamWizPg = (SeamInstallWizardPage)wizard.getNextPage(jsfCapabilitiesWizPg);
- assertNotNull("Cannot create seam facet wizard page",seamWizPg);
- return seamWizPg;
- }
}
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamProjectNewWizardTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamProjectNewWizardTest.java 2008-12-05 17:17:44 UTC (rev 12314)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamProjectNewWizardTest.java 2008-12-05 18:10:15 UTC (rev 12315)
@@ -11,22 +11,21 @@
package org.jboss.tools.seam.ui.test.wizard;
import java.io.File;
-import java.io.IOException;
-import java.net.URL;
+import java.text.MessageFormat;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.datatools.connectivity.ConnectionProfileException;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.jboss.tools.common.util.WorkbenchUtils;
@@ -35,55 +34,46 @@
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.ui.ISeamUiConstants;
import org.jboss.tools.test.util.JobUtils;
-import org.osgi.framework.Bundle;
/**
* @author eskimo, akazakov
*
*/
public class SeamProjectNewWizardTest extends TestCase{
-
-
/**
*
*/
- private static final String SEAM_2_0_0_RT_NAME = "Seam 2.0";
- /**
- *
- */
private static final String SEAM_1_2_1_RT_NAME = "Seam 1.2.1";
- public static final String JBOSS_AS_42_HOME
- = System.getProperty("jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA");
- NewProjectDataModelFacetWizard wizard;
- IWizardPage startSeamPrjWzPg;
- SeamRuntimeManager manager = SeamRuntimeManager.getInstance();
-
+ NewProjectDataModelFacetWizard wizard;
+ WizardDialog dialog;
public SeamProjectNewWizardTest() {
super("New Seam Web Project tests");
}
+ public static TestSuite suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new WizardTestSetup(new TestSuite(SeamProjectNewWizardTest.class,"Seam Project New Wizard Tests")));
+ return suite;
+ }
+
@Override
protected void setUp() throws Exception {
- super.setUp();
-
- }
-
- /**
- *
- */
- public void testSeamProjectNewWizardInstanceIsCreated() {
wizard = (NewProjectDataModelFacetWizard)WorkbenchUtils.findWizardByDefId(ISeamUiConstants.NEW_SEAM_PROJECT_WIZARD_ID);
- WizardDialog dialog = new WizardDialog(
+ dialog = new WizardDialog(
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
wizard);
dialog.create();
dialog.setBlockOnOpen(false);
dialog.open();
JobUtils.delay(2000);
- boolean canFinish = wizard.canFinish();
- assertFalse("Finish button is enabled at first wizard page before all requerd fileds are valid.", canFinish);
- startSeamPrjWzPg = wizard.getStartingPage();
+ }
+
+ /**
+ *
+ */
+ public void testSeamProjectNewWizardInstanceIsCreated() {
+ IWizardPage startSeamPrjWzPg = wizard.getStartingPage();
wizard.getDataModel().setStringProperty("IProjectCreationPropertiesNew.PROJECT_NAME","testName");
assertNotNull("Cannot create seam start wizard page", startSeamPrjWzPg);
IWizardPage webModuleWizPg = wizard.getNextPage(startSeamPrjWzPg);
@@ -94,6 +84,11 @@
assertNotNull("Cannot create seam facet wizard page",seamWizPg);
wizard.performCancel();
}
+
+ public void testSeamProjectNewWizardFinisDisableByDefaul() {
+ boolean canFinish = wizard.canFinish();
+ assertFalse("Finish button is enabled at first wizard page before all requerd fileds are valid.", canFinish);
+ }
/**
* If all fields of all pages are valid then
@@ -101,69 +96,62 @@
* See http://jira.jboss.com/jira/browse/JBIDE-1111
*/
public void testJiraJbide1111() {
- wizard = (NewProjectDataModelFacetWizard)WorkbenchUtils.findWizardByDefId(ISeamUiConstants.NEW_SEAM_PROJECT_WIZARD_ID);
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- wizard);
- dialog.create();
- dialog.setBlockOnOpen(false);
-
- startSeamPrjWzPg = wizard.getStartingPage();
- wizard.getDataModel().setStringProperty("IProjectCreationPropertiesNew.PROJECT_NAME","testName");
- assertNotNull("Cannot create seam start wizard page", startSeamPrjWzPg);
- // Check Finish button
-
-
- // Create JBoss AS Runtime, Server, HSQL DB Driver
- try {
- IServerWorkingCopy server = JBossASAdapterInitializer.initJBossAS(JBOSS_AS_42_HOME, new NullProgressMonitor());
- System.out.println(server.getName());
- System.out.println(server.getRuntime().getName());
- } catch (CoreException e) {
- fail("Cannot create JBoss AS Runtime, Server or HSQL Driver for unexisted AS location to test New Seam Project Wizard. " + e.getMessage());
- } catch (ConnectionProfileException e) {
- fail("Cannot create HSQL Driver for nonexistent AS location to test New Seam Project Wizard. " + e.getMessage());
- }
-
- // Create Seam Runtime and set proper field
- Bundle seamTest = Platform.getBundle("org.jboss.tools.seam.ui.test");
- try {
- URL seamUrl = FileLocator.resolve(seamTest.getEntry("/seam"));
- File folder = new File(seamUrl.getPath());
- manager.addRuntime(SEAM_1_2_1_RT_NAME, folder.getAbsolutePath(), SeamVersion.SEAM_1_2, true);
- manager.addRuntime(SEAM_2_0_0_RT_NAME, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true);
- } catch (IOException e) {
- fail("Cannot create Seam Runtime to test New Seam Project Wizard. " + e.getMessage());
- }
- dialog.open();
- JobUtils.delay(2000);
-
- // Check Finish button
- boolean canFinish = wizard.canFinish();
- assertFalse("Finish button is enabled at first wizard page before user entered the project name.", canFinish);
- wizard.performCancel();
-
// Set project name
IDataModel model = wizard.getDataModel();
- model.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "testSeamProjectNewWizardAllowsToFinishAtFirstPageProjectName");
-
- dialog.open();
- JobUtils.delay(2000);
-
- // Check Finish button
- canFinish = wizard.canFinish();
- assertTrue("Finish button is disabled at first wizard page in spite of created JBoss AS Runtime, Server, DB Connection and Seam Runtime and valid project name.", canFinish);
-
- wizard.performCancel();
-
- manager.removeRuntime(manager.findRuntimeByName(SEAM_1_2_1_RT_NAME));
- manager.removeRuntime(manager.findRuntimeByName(SEAM_2_0_0_RT_NAME));
-
+ model.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "testSeamProject");
+ JobUtils.delay(1000);
+ assertTrue("Finish button is disabled at first wizard page in spite of created JBoss AS Runtime, Server, DB Connection and Seam Runtime and valid project name.", wizard.canFinish());
}
@Override
protected void tearDown() throws Exception {
- super.tearDown();
+ wizard.performCancel();
+ dialog.close();
}
+ public static final String INIT_ERROR_MЕSSAGE = "System property ''{0}'' must be configured with -D to run these tests";
+ public static final String PROP_JBOSS_AS_4_2_HOME = "jbosstools.test.jboss.home.4.2";
+ public static final String JBOSS_AS_42_HOME_PATH;
+ public static final String PROP_SEAM_1_2_HOME_PATH = "jbosstools.test.seam.1.2.1.eap.home";
+ public static final String SEAM_1_2_HOME_PATH;
+
+ static {
+ SEAM_1_2_HOME_PATH = System.getProperty(PROP_SEAM_1_2_HOME_PATH);
+ if(SEAM_1_2_HOME_PATH == null) {
+ throw new IllegalArgumentException(MessageFormat.format(INIT_ERROR_MЕSSAGE, PROP_SEAM_1_2_HOME_PATH));
+ }
+ JBOSS_AS_42_HOME_PATH = System.getProperty(PROP_JBOSS_AS_4_2_HOME);
+ if(JBOSS_AS_42_HOME_PATH == null) {
+ throw new IllegalArgumentException(MessageFormat.format(INIT_ERROR_MЕSSAGE,PROP_JBOSS_AS_4_2_HOME));
+ }
+ }
+
+ public static class WizardTestSetup extends TestSetup {
+
+ SeamRuntimeManager manager = SeamRuntimeManager.getInstance();
+
+ public WizardTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ File folder = new File(SEAM_1_2_HOME_PATH);
+ manager.addRuntime(SEAM_1_2_1_RT_NAME, folder.getAbsolutePath(), SeamVersion.SEAM_1_2, true);
+
+ // Create JBoss AS Runtime, Server, HSQL DB Driver
+ try {
+ IServerWorkingCopy server = JBossASAdapterInitializer.initJBossAS(JBOSS_AS_42_HOME_PATH, new NullProgressMonitor());
+ } catch (CoreException e) {
+ fail("Cannot create JBoss AS Runtime, Server or HSQL Driver for unexisted AS location to test New Seam Project Wizard. " + e.getMessage());
+ } catch (ConnectionProfileException e) {
+ fail("Cannot create HSQL Driver for nonexistent AS location to test New Seam Project Wizard. " + e.getMessage());
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ manager.removeRuntime(manager.findRuntimeByName(SEAM_1_2_1_RT_NAME));
+ }
+ }
}
\ No newline at end of file
17 years, 4 months
JBoss Tools SVN: r12314 - trunk/smooks/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-12-05 12:17:44 -0500 (Fri, 05 Dec 2008)
New Revision: 12314
Modified:
trunk/smooks/docs/reference/en/modules/introduction.xml
trunk/smooks/docs/reference/en/modules/quick_start.xml
trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml
trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml
trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3296
unnecessary spaces in text are deleted, syntax is corrected - para tags were missing in several places
Modified: trunk/smooks/docs/reference/en/modules/introduction.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/introduction.xml 2008-12-05 16:21:55 UTC (rev 12313)
+++ trunk/smooks/docs/reference/en/modules/introduction.xml 2008-12-05 17:17:44 UTC (rev 12314)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="introduction">
- <?dbhtml filename="introduction.html"?>
+ <?dbhtml filename="introduction.html"?>
<chapterinfo>
<keywordset>
<keyword>JBoss Tools</keyword>
@@ -11,52 +11,34 @@
<title>Introduction</title>
<sect1>
<title>What is Smooks?</title>
- <para>Smooks is a Java Framework/Engine for processing XML and
- non XML data (CSV, EDI, Java, JSON etc).</para>
+ <para>Smooks is a Java Framework/Engine for processing XML and non XML data (CSV, EDI, Java, JSON etc).</para>
<para></para>
<para>
<orderedlist numeration="Upperroman" inheritnum="inherit">
- <listitem>Transformation:Perform a wide range
- of Data
- Transforms. Supports many different Source and Result types
- -
- XML/CSV/EDI/Java/JSON to XML/CSV/EDI/Java/JSON.
- </listitem>
+ <listitem><para>Transformation: Perform a wide range of Data Transforms. Supports many different Source and Result types -XML/CSV/EDI/Java/JSON to XML/CSV/EDI/Java/JSON.</para>
+ </listitem>
<listitem>
- Java Binding:
- Bind into a Java Object Model from any data
- source (CSV, EDI, XML,
- Java, JSON etc).
- </listitem>
-
+ <para>Java Binding: Bind into a Java Object Model from any data source (CSV, EDI, XML, Java, JSON etc). </para>
+ </listitem>
+
<listitem>
- Huge Message
- Processing:
- Process huge messages (GBs) -
- Split, Transform and Route message fragments
- to JMS, File, Database
- etc destinations. Route multiple message
- formats to multiple
- destinations in a single pass over a message.
+ <para>Huge Message Processing: Process huge messages (GBs) - Split, Transform and Route message fragments to JMS, File, Database etc destinations. Route multiple message formats to multiple destinations in a single pass over a message.
+ </para>
</listitem>
-
+
<listitem>
- <bold>Message
- Enrichment:</bold>
- Enrich a message with data from a
- Database, or other Datasources.
+ <para>Message Enrichment: Enrich a message with data from a Database, or other Datasources.
+ </para>
</listitem>
-
+
<listitem>
- Combine : Combine the above features in different ways
- e.g.
- add Message Enrichment as part of a Splitting and Routing
- process.
+ <para>Combine: Combine the above features in different ways e.g. add Message Enrichment as part of a Splitting and Routing process.
+ </para>
</listitem>
</orderedlist>
</para>
<figure>
- <title>SmooKs</title>
+ <title>Smooks</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/common/smooks-usecase.png"
@@ -64,15 +46,13 @@
</imageobject>
</mediaobject>
</figure>
- <para>
- More informations about Smooks , please visit here :
- <link>http://www.smooks.org</link>
+ <para> For More informations about Smooks, please visit Smooks official site:
+ <ulink url="http://www.smooks.org">Smooks official site</ulink>
</para>
</sect1>
<sect1>
<title>What is Smooks dev tools?</title>
- <para>Smooks dev tools is a sets of graphical tools for editing
- Smooks configuration file base on Eclipse.</para>
+ <para>Smooks dev tools is a sets of graphical tools for editing Smooks configuration file base on Eclipse.</para>
<figure>
<title>Smooks form editor</title>
<mediaobject>
@@ -84,25 +64,15 @@
</sect1>
<sect1>
<title>How to install Smooks dev tools?</title>
- <para>
- The Smooks dev tools was included by the JBossTools since 3.0.0
- beta1
- version. You can download the JBossTools from :
+ <para> The Smooks dev tools was included by the JBossTools since 3.0.0 beta1 version. You can download the JBossTools from:
<link>http://www.jboss.org/tools/download/index.html
</link>
.
</para>
- <para>
- Smooks dev tools(JBossTools) run with the latest Eclipse and
- other
- required plug-ins(GEF,EMF,etc.).</para>
- <para>
- User should download the latest IDE for
- Java EE developers from this
+ <para> Smooks dev tools(JBossTools) run with the latest Eclipse and other required plug-ins(GEF,EMF,etc.).</para>
+ <para> User should download the latest IDE for Java EE developers from this
<link linkend="http://www.eclipse.org/downloads/">site
- </link>
- . It contains many plug-ins ( GEF,EMF,etc. ) required by Smooks dev
- tools.
+ </link>. It contains many plug-ins ( GEF,EMF,etc. ) required by Smooks dev tools.
</para>
</sect1>
</chapter>
Modified: trunk/smooks/docs/reference/en/modules/quick_start.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/quick_start.xml 2008-12-05 16:21:55 UTC (rev 12313)
+++ trunk/smooks/docs/reference/en/modules/quick_start.xml 2008-12-05 17:17:44 UTC (rev 12314)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="quickstart" xreflabel="Quick Start">
- <?dbhtml filename="quick_start.html"?>
+ <?dbhtml filename="quick_start.html"?>
<chapterinfo>
<keywordset>
<keyword>JBoss Tools</keyword>
@@ -20,19 +20,17 @@
the
Smooks
dev tools.
- </para>
+ </para>
<section>
<title>Download Smooks Java-to-Java example</title>
- <para>
- Visit
+ <para> Visit
<ulink
- url="http://www.smooks.org/documentation/documentation-smooks-1-1-x/examples/e...">here</ulink>
- to download the "java-to-java" example project.
+ url="http://www.smooks.org/documentation/documentation-smooks-1-1-x/examples/e...">here</ulink> to download the "java-to-java" example project.
</para>
<tip>
<title>Tip:</title>
<para>
- The example projects is base on Maven , we suggest user to
+ The example projects is base on Maven, we suggest user to
create a
new eclipse Java project and copy the example codes and .jar
files
@@ -44,12 +42,10 @@
</section>
<section>
<title>Smooks configuration file wizard</title>
- <para>Select the Smooks Java-to-Java example project what you
- created and right-click , select the menu: “New” ->
- “Other...” , find
- the
- “Smooks Configuration File” wizard. Click
- “Next” button.
+ <para>Select the Smooks Java-to-Java example project what you created and right-click, select the menu: "New" ->
+ "Other...", find the
+ "Smooks Configuration File" wizard. Click
+ "Next" button.
</para>
<figure>
<title>To select Smooks Configuration File wizard</title>
@@ -60,8 +56,8 @@
</mediaobject>
</figure>
<para>First wizard page is file path creation page. Select the
- “src” to be the file's container , and input
- “smooks-newconfig.smooks”. Click “Next”.</para>
+ "src" to be the file's container, and input
+ "smooks-newconfig.smooks". Click "Next".</para>
<figure>
<title>Choose the configuration file container and type the
file's name</title>
@@ -72,17 +68,16 @@
</imageobject>
</mediaobject>
</figure>
- <para>The second wizard page is the transform data type choose
- page.</para>
+ <para>The second wizard page is the transform data type choose page.</para>
<tip>
<title>Note</title>
<para>
Because the quick start introduce how to create/edit the
Java-to-Java
- Smooks configuration file , so choose "Java" type
+ Smooks configuration file, so choose "Java" type
to be
the source/target transform data type please.
- </para>
+ </para>
</tip>
<figure>
<title>Select Data Type</title>
@@ -96,11 +91,10 @@
</section>
<section id="quickstart_formeditor">
<title>Smooks form editor</title>
- <para>When the wizard was finished , a new Smooks configuration
- file was created and the Smooks editor will be opened automatically.
+ <para>When the wizard was finished, a new Smooks configuration file was created and the Smooks editor will be opened automatically.
</para>
<para> We will see the
- “Smooks Form Editor”:
+ "Smooks Form Editor":
</para>
<figure>
<title>Smooks form editor</title>
@@ -110,55 +104,33 @@
</imageobject>
</mediaobject>
</figure>
-
- <para>
- This editor contains several parts:
+
+ <para> This editor contains several parts:
<orderedlist numeration="loweralpha" inheritnum="inherit">
<listitem>
- Notify message display
- area. If there are any errors when
- users are editing the file ,
- the error
- area will
- display them.
+ <para>Notify message display area. If there are any errors when users are editing the file,
+ the error area will display them.</para>
</listitem>
<listitem>
- Source data
- tree. The tree will display the
- structured of
- transform source
- data.
- </listitem>
-
+ <para>Source data tree. The tree will display the structured of transform source data.</para>
+ </listitem>
+
<listitem>
- Target data tree. The tree
- will display the structured of
- transform
- target
- data.
- </listitem>
-
+ <para>Target data tree. The tree will display the structured of transform target data.</para>
+ </listitem>
+
<listitem>
- Mapping
- graphical area. Show the data
- mapping connection
- lines.
+ <para>Mapping graphical area. Show the data mapping connection lines.</para>
</listitem>
-
+
<listitem>
- Source/Target data
- selection links. Click the
- link ,
- there
- will
- open the
- <link linkend="graphicaleditor_datalink">"Data
- Selection
- Wizard"</link>
- to help user to choose
- the
- source/target
- data.
+ <para>Source/Target data selection links. Click the link,
+ there will open the
+ <link linkend="graphicaleditor_datalink">"Data
+ Selection
+ Wizard"</link>
+ to help user to choose the source/target
+ data.</para>
</listitem>
</orderedlist>
</para>
@@ -166,10 +138,7 @@
<section id="graphicaleditor_datalink">
<title>Choose the source/target data
</title>
- <para>Click the data selection links to choose the transform
- data. The "Data Selection Wizard" is opened , and there are two data
- types on the list :
- XML and Java.
+ <para>Click the data selection links to choose the transform data. The "Data Selection Wizard" is opened, and there are two data types on the list: XML and Java.
</para>
<tip>
<title>Note</title>
@@ -187,8 +156,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Select the “JavaBean Data Type” and click “Next” , you
- will see a java class selection page :
+ <para>Select the "JavaBean Data Type" and click "Next", you will see a java class selection page:
</para>
<figure>
<title>JavaBean data selection wizard</title>
@@ -199,12 +167,8 @@
</imageobject>
</mediaobject>
</figure>
- <para>When you finished the java class selection , click “Finish”
- , we
- will see , the structured of the java class was be displayed on
- the Source
- data tree. Please do the same operation with the target
- data link.
+ <para>When you finished the java class selection, click "Finish"
+ , we will see, the structured of the java class was be displayed on the Source data tree. Please do the same operation with the target data link.
</para>
<figure>
<title>Display structure of the transform data</title>
@@ -218,75 +182,46 @@
</section>
<section id="quickstart_mapping">
<title>Mapping</title>
- <para>
- As you see , the source/target data tree display the structure
- of the
- java class. </para>
+ <para> As you see, the source/target data tree display the structure of the java class. </para>
<para>How to mapping it?</para>
- <para>
- First , we should know what is
- we
- want to transform:
+ <para> First, we should know what is we want to transform:
<orderedlist numeration="loweralpha" inheritnum="inherit">
- <listitem>
- Bind the “customerName” property of the
+ <listitem><para>Bind the "customerName" property of the
Order#header to
the
- “customerName” property of LineOrder.
- </listitem>
- <listitem>
- Bind the
- “customerNumber” property of the Order#header to
+ "customerName" property of LineOrder.</para>
+ </listitem>
+ <listitem><para>Bind the
+ "customerNumber" property of the Order#header to
the
- “customerId”
- property of LineOrder.
- </listitem>
- <listitem>
- Bind the “price” property of the OrderItem
+ "customerId"
+ property of LineOrder.</para>
+ </listitem>
+ <listitem><para>Bind the "price" property of the OrderItem
to
the
- “unitPrice” property of
- LineItem.
- </listitem>
- <listitem>
- Bind the “productId”
+ "unitPrice" property of
+ LineItem.</para>
+ </listitem>
+ <listitem><para>Bind the "productId"
property
of the OrderItem to the
- “productCode”
- property of LineItem.
- </listitem>
- <listitem>
- Bind the
- “quantity” property of the OrderItem to the
- “unitQuantity”
+ "productCode"
+ property of LineItem.</para>
+ </listitem>
+ <listitem><para>Bind the
+ "quantity" property of the OrderItem to the
+ "unitQuantity"
property of
- LineItem.
- </listitem>
+ LineItem.</para>
+ </listitem>
</orderedlist>
</para>
- <para>
- Make sense ?</para>
- <para> OK, let's select the “customerName”
- item of the
- “header”
- item on
- the source data tree and start to drag
- it. When the
- drag item
- cross into
- the Mapping graphical area , we will
- see a
- connection
- line. Drop the
- item onto the “customerName” of the
- “LineOrder” on the
- target data
- view.</para>
- <para>
- Now there will open a dialog to
- ask you to
- connect the
- root node:
+ <para> Make sense?</para>
+ <para> OK, let's select the "customerName" item of the
+ "header" item on the source data tree and start to drag it. When the drag item cross into the Mapping graphical area, we will see a connection line. Drop the item onto the "customerName" of the
+ "LineOrder" on the target data view.</para>
+ <para> Now there will open a dialog to ask you to connect the root node:
</para>
<figure>
<title>A dialog to ask user to connect the root nodes</title>
@@ -297,29 +232,21 @@
</imageobject>
</mediaobject>
</figure>
- <para>
- Please click “Yes” to connect the root node , if you didn't do
- that,
- this dialog
- will open again when you connect other nodes.
+ <para> Please click "Yes" to connect the root node, if you didn't do that, this dialog will open again when you connect other nodes.
</para>
<tip>
<title>Note</title>
<para>Please
- remember that :
+ remember that:
The root nodes of the source data
and target data
*MUST*
be connected.</para>
- <para>This rule is not only for Java-to-Java , same with
+ <para>This rule is not only for Java-to-Java, same with
XML-to-Java too </para>
</tip>
- <para>
- Now let's do the same operation with the “customerNumber” ,
- that
- is the
- what we want to see :
-
+ <para> Now let's do the same operation with the "customerNumber", that is the what we want to see:
+
</para>
<figure>
<title>Correctly mapping editor</title>
@@ -330,14 +257,10 @@
</imageobject>
</mediaobject>
</figure>
- <para>Next , we are going to try to bind the properties of the
- “OrderItem” to the properties of the “LineItem”.
+ <para>Next, we are going to try to bind the properties of the
+ "OrderItem" to the properties of the "LineItem".
</para>
- <para>Select the “price” and drag it onto the “unitPrice” of
- the
- other side tree viewer. The error message display area will show
- an
- error :
+ <para>Select the "price" and drag it onto the "unitPrice" of the other side tree viewer. The error message display area will show an error:
</para>
<figure>
<title>Connection Error 1</title>
@@ -349,15 +272,11 @@
</mediaobject>
</figure>
<para>How to deal with the error ?</para>
- <para>Please click the “Fix it” link , there pop a menu and
- there are several "resolve methods" on the menu.
+ <para>Please click the "Fix it" link, there pop a menu and there are several "resolve methods" on the menu.
</para>
- <para>
- Select the first resolve method: 'Connect the “OrderItem” to the
- “LineItem” ' ,
- then the “OrderItem” was connected
- with the
- “LineItem”.
+ <para> Select the first resolve method: 'Connect the "OrderItem" to the
+ "LineItem" ', then the "OrderItem" was connected with the
+ "LineItem".
</para>
<para>But the notify message area still show some other errors:
</para>
@@ -370,41 +289,34 @@
</imageobject>
</mediaobject>
</figure>
- <para>OK,Deal it with the fire error ---- Click “Fix it” link
- and select the first resolve method. The “orderItems” was connected
- with the “lineItems”.
+ <para>OK,Deal it with the fire error ---- Click "Fix it" link and select the first resolve method. The "orderItems" was connected with the "lineItems".
</para>
<tip>
<title>Tip</title>
<para>
Why there will occur error?</para>
- <para> We will find that , if we only
+ <para> We will find that, if we only
connect the
property node without
to connect the parent node of the
- property ,
- the “connection error”
+ property,
+ the "connection error"
will happen. </para>
<para>The
connection of
- the “price-to-unitPrice” is
- the “Binding
- Connection” ,
+ the "price-to-unitPrice" is
+ the "Binding
+ Connection",
but there need
- a “Instance
+ a "Instance
Creation
- Connection” ---- the
+ Connection" ---- the
connection
of
the
- “OrderItem-to-LineItem”.</para>
+ "OrderItem-to-LineItem".</para>
</tip>
- <para>
- After that , connect the quantity to
- the
- unitQuantity ; connect
- the
- productId to the productCode:
+ <para> After that, connect the quantity to the unitQuantity ; connect the productId to the productCode:
</para>
<figure>
<title>Complete mapping</title>
@@ -415,12 +327,9 @@
</imageobject>
</mediaobject>
</figure>
- <para>Now , we should save the file.The Smooks tools will generate
- the correct configuration file contents.</para>
- <para>OK,Let run the test class : example.Main (Please make
- sure
- that the Smooks engine load the correct configuration file)
- </para>
+ <para>Now, we should save the file.The Smooks tools will generate the correct configuration file contents.</para>
+ <para>OK, Let run the test class: example.Main (Please make sure that the Smooks engine load the correct configuration file)
+ </para>
<para>Success!
</para>
</section>
Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml 2008-12-05 16:21:55 UTC (rev 12313)
+++ trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml 2008-12-05 17:17:44 UTC (rev 12314)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="smooksformeditor_configurationtab" xreflabel="Smooks Configuration Editor Page">
- <?dbhtml filename="smooks_form_editor_configurationtab.html"?>
+ <?dbhtml filename="smooks_form_editor_configurationtab.html"?>
<chapterinfo>
<keywordset>
<keyword>JBoss Tools</keyword>
@@ -40,8 +40,8 @@
</para>
<section id="configurationpage_parsetype">
<title>Smooks parse type</title>
- <para>Open the "Other configuration" section , we will see there
- is a sets of radio buttons :</para>
+ <para>Open the "Other configuration" section, we will see there
+ is a sets of radio buttons:</para>
<figure>
<title>Smooks parse type</title>
<mediaobject>
@@ -58,7 +58,7 @@
<section id="configurationpage_importfile">
<title>Import file</title>
<para>
- Open the "Other configuration" section , there is a "Import
+ Open the "Other configuration" section, there is a "Import
File" list under the "Smooks parse type" buttons.
</para>
<figure>
@@ -79,7 +79,7 @@
If the import file dosen't exist, the image of the import file
will change to "Error Image".
If user double-click the import file in
- the "Import File" list , the file will be open with a new default
+ the "Import File" list, the file will be open with a new default
editor.
</para>
</tip>
@@ -103,10 +103,10 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>There are several resource type on the list. Select the
"Date
- Decoder" and click "Finish" button , a new "Date Decoder" item
+ Decoder" and click "Finish" button, a new "Date Decoder" item
was
added and shown on the resource type list.
</para>
@@ -116,14 +116,11 @@
</para>
<para>
<orderedlist numeration="loweralpha" inheritnum="inherit">
- <listitem>
- locale-language
+ <listitem><para>locale-language</para>
</listitem>
- <listitem>
- format
+ <listitem><para>format</para>
</listitem>
- <listitem>
- locale-country
+ <listitem><para>locale-country</para>
</listitem>
</orderedlist>
</para>
@@ -141,10 +138,8 @@
</mediaobject>
</figure>
<para>
- When user defined new "Date Decoder" , they can use the
- <link linkend="graphicalpage_propertiesview"> "JavaBean Properties"</link> GUI
- to set the them to
- be the "Java type".
+ When user defined new "Date Decoder", they can use the
+ <link linkend="graphicalpage_propertiesview"> "JavaBean Properties"</link> GUI to set the them to be the "Java type".
</para>
<!--
<para> The XML fragment generated by Smooks tools for the "Date
Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml 2008-12-05 16:21:55 UTC (rev 12313)
+++ trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml 2008-12-05 17:17:44 UTC (rev 12314)
@@ -34,17 +34,13 @@
</para>
<section>
<title>Introduce the areas of graphical editor</title>
- <para>
- Please read the
+ <para> Please read the
<link linkend="quickstart_formeditor">"Quick Start/Smooks Form Editor"</link>
</para>
</section>
<section>
<title>Load source/target data</title>
- <para>
- Click the links under the data viewer , the data type selection
- wizard
- page will be shown.
+ <para> Click the links under the data viewer, the data type selection wizard page will be shown.
</para>
<figure>
<title>Data type selection wizard page</title>
@@ -55,9 +51,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>
- There are a sets of transform data type on the wizard page,select one
- type and click
+ <para> There are a sets of transform data type on the wizard page,select one type and click
<property>Next</property>
, the data source selection wizard page will be shown.
<tip>
@@ -85,50 +79,37 @@
</imageobject>
</mediaobject>
</figure>
- <para>
- When finish the data selection(file path selection) , Click
+ <para> When finish the data selection(file path selection), Click
<property>Finish</property>
, the data viewer will display the selected data structure.
</para>
</section>
<section>
<title>User the graphical editor to mapping</title>
- <para>
- Please read the
+ <para> Please read the
<link linkend="quickstart_mapping">"Quick Start/Mapping"</link>
</para>
</section>
<section>
<title>Error messages</title>
- <para>
- When user do any mapping operaions , the Smooks tools will
- validate
- the file contents with "Mapping Logic" , If there is any errors of
- the configuration file contents
- ,error messages will be shown on
- the
+ <para> When user do any mapping operations, the Smooks tools will validate the file contents with "Mapping Logic", If there is any errors of the configuration file contents
+ ,error messages will be shown on the
<link linkend="quickstart_formeditor">"Error
message area"</link>
.
</para>
- <para>
- Please read the
- <link linkend="quickstart_mapping">"Quick Start/Mapping"</link>
- to find how to fix the errors.
+ <para> Please read the
+ <link linkend="quickstart_mapping">"Quick Start/Mapping"</link> to find how to fix the errors.
</para>
</section>
<section id="graphicalpage_propertiesview">
<title>Properties Viewer</title>
- <para>
- User can edit the properties of the "connection lines" with the
- properties viewer.
+ <para> User can edit the properties of the "connection lines" with the properties viewer.
</para>
- <para>
- Select the menu : "Window -> Show View -> Other -> Properties" ,
- the properties viewer will be opened.
+ <para> Select the menu: "Window -> Show View -> Other -> Properties", the properties viewer will be opened.
</para>
<para>
- When user select on the connection lines , the properties viewer
+ When user select on the connection lines, the properties viewer
will show a sets of section GUI for editing the properties of the
connection line.
</para>
@@ -142,17 +123,17 @@
</para>
<para>
If the source data type of the selected connection line was
- "XML" ,The properties viewer will show a "XML Properties" section
+ "XML",The properties viewer will show a "XML Properties" section
GUI.
</para>
<para>
But the source data type of the selected connection line was
- "Java" ,
- the "XML Properties" section GUI dosen't display.
+ "Java",
+ the "XML Properties" section GUI doesn't display.
</para>
<para>
It means that if the source/target data type of the selected
- connection line was different , the properties viewer will show
+ connection line was different, the properties viewer will show
different GUI.
</para>
</tip>
Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml 2008-12-05 16:21:55 UTC (rev 12313)
+++ trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml 2008-12-05 17:17:44 UTC (rev 12314)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="smooksformeditor_sourcetab" xreflabel="Smooks Source Editor Page">
- <?dbhtml filename="smooks_form_editor_sourcetab.html"?>
+ <?dbhtml filename="smooks_form_editor_sourcetab.html"?>
<chapterinfo>
<keywordset>
<keyword>JBoss Tools</keyword>
@@ -11,9 +11,7 @@
<title>Smooks Source Editor Page</title>
<section>
<title>XML Source Editor</title>
- <para>
- User can use this editor to edit the Smooks configuration file
- directly.
+ <para> User can use this editor to edit the Smooks configuration file directly.
</para>
<figure>
<title>Graphical Editor</title>
@@ -27,11 +25,7 @@
</section>
<section>
<title>Error Messages GUI</title>
- <para>
- If the Smooks tools can't understand the configuration file or
- the configuration file was illegal(XML structure isn't right for
- Smooks configuration file , etc.),The error message panel will
- display above the XML editor.
+ <para> If the Smooks tools can't understand the configuration file or the configuration file was illegal(XML structure isn't right for Smooks configuration file, etc.),The error message panel will display above the XML editor.
</para>
<figure>
<title>Graphical Editor</title>
@@ -45,8 +39,8 @@
<tip>
<title>Note</title>
<para>
- When the error message panel was displayed , other editors (
- Graphical Editor , Configuration Editor ) will be disabled.
+ When the error message panel was displayed, other editors (
+ Graphical Editor, Configuration Editor ) will be disabled.
</para>
<para>
User can't edit the configuration file with other editors until
17 years, 4 months
JBoss Tools SVN: r12313 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog.
by jbosstools-commits＠lists.jboss.org
Author: izhukov
Date: 2008-12-05 11:21:55 -0500 (Fri, 05 Dec 2008)
New Revision: 12313
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
Log:
set delay to any change event on classStyle combo component: changes applied with 1 second delay
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-12-05 15:37:41 UTC (rev 12312)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-12-05 16:21:55 UTC (rev 12313)
@@ -276,8 +276,6 @@
styleChanged = true;
if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)
&& currentFile != null && !currentFile.equals(Constants.EMPTY)) {
-// styleComposite.updateStyle();
-// cssModel.setCSS(currentClassStyle, styleAttributes);
applyButton.setEnabled(true);
}
}
@@ -362,7 +360,6 @@
});
button.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
- // TODO:
// IResource project = Util.getCurrentProject();
IResource project = ResourcesPlugin.getWorkspace().getRoot();
@@ -422,7 +419,7 @@
}
});
}
-
+
/**
* This method is used to create and initialize style class comboBox component.
*
@@ -448,19 +445,13 @@
return;
}
}
- cssStyleClassChanged();
- applyButton.setEnabled(false);
keyInputSelector = false;
}
});
// add key modified listener
classCombo.addKeyListener(new KeyAdapter() {
public void keyReleased(KeyEvent e) {
- if ((currentClassStyle != null && currentClassStyle.equals(classCombo.getText().trim()))
- || (currentClassStyle == null && classCombo.getText().trim().equals(Constants.EMPTY))) {
- return;
- }
- notifyKeyChanged();
+ keyInputSelector = true;
}
});
// this listener is responsible for processing dialog header message events
@@ -476,14 +467,21 @@
IStatus status = findMostSevere();
notifyListeners(classCombo, status);
applyToStatusLine(status);
+ // update CSS style cmposite if needed
+ if ((currentClassStyle != null && currentClassStyle.equals(classCombo.getText().trim()))
+ || (currentClassStyle == null && classCombo.getText().trim().equals(Constants.EMPTY))) {
+ return;
+ }
+ notifyStyleClassChanged();
+ applyButton.setEnabled(false);
}
});
}
/**
- * This method is invoked to correctly process class style combo key event.
+ * This method is invoked to correctly process class style combo modify event.
*/
- private void notifyKeyChanged() {
+ private void notifyStyleClassChanged() {
Display display = null;
if (PlatformUI.isWorkbenchRunning()) {
display = PlatformUI.getWorkbench().getDisplay();
@@ -500,8 +498,6 @@
// start operation
cssStyleClassChanged();
- applyButton.setEnabled(true);
- keyInputSelector = true;
// end operation
monitor.done();
@@ -550,11 +546,8 @@
clearButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
styleComposite.clearStyleComposite(currentClassStyle);
- styleComposite.revertPreview();
+ styleComposite.updatePreview(currentClassStyle);
styleComposite.updateStyle();
-// if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) {
-// cssModel.setCSS(currentClassStyle, styleAttributes);
-// }
applyButton.setEnabled(true);
styleChanged = true;
}
17 years, 4 months
JBoss Tools SVN: r12312 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-05 10:37:41 -0500 (Fri, 05 Dec 2008)
New Revision: 12312
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
Log:
JBIDE-3341 The wrong labels are shown in the Facelets' content assistant
The labels are fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-12-05 14:43:54 UTC (rev 12311)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-12-05 15:37:41 UTC (rev 12312)
@@ -246,6 +246,15 @@
Image image = kbProposal.hasImage() ? kbProposal.getImage() :
JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_EL_IMAGE_PATH);
+ if (!replacementString.startsWith("#{") && !replacementString.startsWith("${")) {
+ if (label.startsWith("#") || label.startsWith("$"))
+ label = label.substring(1);
+ if (label.startsWith("{"))
+ label = label.substring(1);
+ if (label.endsWith("}"))
+ label = label.substring(0, label.length() - 1);
+ }
+
AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString,
replacementBeginPosition, replacementLength, cursorPosition,
image,
@@ -281,6 +290,15 @@
Image image = kbProposal.hasImage() ? kbProposal.getImage() :
JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_EL_IMAGE_PATH);
+ if (!replacementString.startsWith("#{") && !replacementString.startsWith("${")) {
+ if (label.startsWith("#") || label.startsWith("$"))
+ label = label.substring(1);
+ if (label.startsWith("{"))
+ label = label.substring(1);
+ if (label.endsWith("}"))
+ label = label.substring(0, label.length() - 1);
+ }
+
AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString,
replacementBeginPosition, replacementLength, cursorPosition,
image,
17 years, 4 months
JBoss Tools SVN: r12311 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-12-05 09:43:54 -0500 (Fri, 05 Dec 2008)
New Revision: 12311
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
JBIDE-3133
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-12-05 13:45:38 UTC (rev 12310)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-12-05 14:43:54 UTC (rev 12311)
@@ -48,9 +48,12 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo;
import org.jboss.tools.common.kb.KbProposal;
import org.jboss.tools.seam.core.ISeamComponent;
+import org.jboss.tools.seam.core.ISeamContextShortVariable;
import org.jboss.tools.seam.core.ISeamContextVariable;
import org.jboss.tools.seam.core.ISeamElement;
+import org.jboss.tools.seam.core.ISeamMessages;
import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.ISeamScope;
import org.jboss.tools.seam.core.ISeamXmlFactory;
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -927,7 +930,7 @@
}
public static boolean isSeamMessagesComponentVariable(ISeamContextVariable variable) {
- if (variable instanceof SeamMessagesComponent) {
+ if (variable instanceof ISeamMessages) {
return true;
} else if (variable instanceof ISeamXmlFactory) {
ISeamXmlFactory factory = (ISeamXmlFactory)variable;
@@ -944,13 +947,16 @@
List<ISeamContextVariable> resolvedValues = SeamExpressionResolver.resolveVariables(p, null, value, true);
for (ISeamContextVariable var : resolvedValues) {
if (var.getName().equals(value)) {
- if (var instanceof SeamMessagesComponent) {
+ if (var instanceof ISeamMessages) {
return true;
}
}
}
}
}
+ } else if(variable instanceof ISeamContextShortVariable) {
+ ISeamContextShortVariable sv = (ISeamContextShortVariable)variable;
+ return isSeamMessagesComponentVariable(sv.getOriginal());
}
return false;
}
17 years, 4 months