JBoss Tools SVN: r19667 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-06 17:08:00 -0500 (Wed, 06 Jan 2010)
New Revision: 19667
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
Log:
JBIDE-5597 - changing explanation text
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2010-01-06 20:26:23 UTC (rev 19666)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2010-01-06 22:08:00 UTC (rev 19667)
@@ -41,7 +41,7 @@
swf_BaseName=JBoss _VERSION_ Server
swf_NameInUse=Server name already in use
swf_DeployEditorHeading=Default Settings
-swf_DeploymentDescription=This section sets where any non-customized module will be deployed to.\nThe temporary deploy folder should be on the same file-system as the deploy folder.\nThis will ensure safe and complete file copies.\nCustomizations can be made in the table below on a per-module basis.\nBlank columns will use the default values.
+swf_DeploymentDescription=This section sets where any non-customized module will be deployed to.\nThe temporary deploy folder should be on the same file-system as the deploy folder.\nThis will ensure safe and complete file copies.\nCustomizations can be made in the table below on a per-module basis.\nBlank columns will use the default values.\nChanges should *not* be made to this page while the server is running.
swf_DeployDirectory=Deploy Directory
swf_TempDeployDirectory=Temporary Deploy Directory
swf_CloneConfiguration=Copy this configuration into workspace metadata
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19666 - in trunk: esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-06 15:26:23 -0500 (Wed, 06 Jan 2010)
New Revision: 19666
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
Log:
JBIDE-4889 - committing once more with changes to ESB
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2010-01-06 15:12:29 UTC (rev 19665)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2010-01-06 20:26:23 UTC (rev 19666)
@@ -66,7 +66,7 @@
IClasspathEntry[] entries =
new WebtoolsProjectJBossClasspathContainer(path).getClasspathEntries();
return Arrays.asList(entries);
- } else /*if( isPrimaryFacet(fv.getProjectFacet())) */{
+ } else if( isPrimaryFacet(fv.getProjectFacet())) {
String id = rc.getProperty("id"); //$NON-NLS-1$
IPath containerPath = new Path("org.eclipse.jst.server.core.container").append("org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget"); //$NON-NLS-1$ //$NON-NLS-2$
path = containerPath.append(id);
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java 2010-01-06 15:12:29 UTC (rev 19665)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java 2010-01-06 20:26:23 UTC (rev 19666)
@@ -42,7 +42,6 @@
IProject project;
private IDataModel model;
- private String serverRuntimeId;
public JBossClassPathCommand(IProject project, IDataModel model) {
this.project = project;
@@ -57,30 +56,38 @@
public IStatus executeOverride(IProgressMonitor monitor) {
IStatus status = Status.OK_STATUS;
try {
-
// store runtime name and runtime location to the project
boolean isServerSupplied = model.getBooleanProperty(IJBossESBFacetDataModelProperties.RUNTIME_IS_SERVER_SUPPLIED);
+ IPath esbContainerPath = null;
if(isServerSupplied){
- serverRuntimeId = getProjectTargetRuntimeID(project);
- String[] segments = new String[]{JBossRuntimeClassPathInitializer.JBOSS_ESB_RUNTIME_CLASSPATH_SERVER_SUPPLIED,
- serverRuntimeId};
- status = addClassPath(project, segments);
+ String serverRuntimeId = getProjectTargetRuntimeID(project);
+ esbContainerPath = new Path(JBossRuntimeClassPathInitializer.JBOSS_ESB_RUNTIME_CLASSPATH_CONTAINER_ID)
+ .append(JBossRuntimeClassPathInitializer.JBOSS_ESB_RUNTIME_CLASSPATH_SERVER_SUPPLIED)
+ .append(serverRuntimeId);
}else{
String runtimeName = model
.getStringProperty(IJBossESBFacetDataModelProperties.RUNTIME_ID);
String runtimeLocation = model
.getStringProperty(IJBossESBFacetDataModelProperties.RUNTIME_HOME);
String esbcontentFolder = model.getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
- project
- .setPersistentProperty(
+ project.setPersistentProperty(
IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME,
runtimeName);
project.setPersistentProperty(
IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_RNTIME_LOCATION,
runtimeLocation);
project.setPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER, esbcontentFolder);
- status = addClassPath(project, new String[]{runtimeName});
+ esbContainerPath = new Path(JBossRuntimeClassPathInitializer.JBOSS_ESB_RUNTIME_CLASSPATH_SERVER_SUPPLIED)
+ .append(runtimeName );
}
+
+ // Add the esb container
+ status = addClassPath(project, esbContainerPath);
+
+ // Add the regular server container
+// IPath containerPath = new Path("org.eclipse.jst.server.core.container").append("org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget"); //$NON-NLS-1$ //$NON-NLS-2$
+// path = containerPath.append(id);
+
} catch (CoreException e) {
status = StatusUtils.errorStatus(
JBossFacetCoreMessages.Error_Add_Facet_JBossESB, e);
@@ -98,16 +105,18 @@
}
- public IStatus addClassPath(IProject project, String[] segments) {
+ /**
+ * This can add *any* container path
+ * @param project
+ * @param path
+ * @return
+ */
+ public static IStatus addClassPath(IProject project, IPath path) {
IStatus status = Status.OK_STATUS;
try {
IClasspathEntry newClasspath;
IJavaProject javaProject = JavaCore.create(project);
- IPath path = new Path(JBossRuntimeClassPathInitializer.JBOSS_ESB_RUNTIME_CLASSPATH_CONTAINER_ID);
- for(String segment: segments ){
- path = path.append(segment);
- }
newClasspath = JavaCore.newContainerEntry(path);
IClasspathEntry[] oldClasspathEntries = javaProject
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2010-01-06 15:12:29 UTC (rev 19665)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2010-01-06 20:26:23 UTC (rev 19666)
@@ -20,18 +20,25 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jst.server.core.internal.JavaServerPlugin;
+import org.eclipse.jst.server.core.internal.RuntimeClasspathContainer;
+import org.eclipse.jst.server.core.internal.RuntimeClasspathProviderWrapper;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
+import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.jboss.tools.esb.core.ESBProjectConstant;
import org.jboss.tools.esb.core.ESBProjectCorePlugin;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
+import org.jboss.tools.esb.core.facet.JBossClassPathCommand;
import org.jboss.tools.esb.project.ui.ESBSharedImages;
import org.jboss.tools.esb.project.ui.messages.JBossESBUIMessages;
import org.jboss.tools.esb.project.ui.wizards.pages.ESBProjectFirstPage;
@@ -86,6 +93,16 @@
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
IDE.openEditor(page, esbFile);
+ // Add the server runtime as well
+ IFacetedProject fp = ProjectFacetsManager.create(project);
+ IRuntime runtime = fp.getPrimaryRuntime();
+ String name = runtime.getName();
+ org.eclipse.wst.server.core.IRuntime serverRuntime = ServerCore.findRuntime(name);
+ RuntimeClasspathProviderWrapper rcpw = JavaServerPlugin.findRuntimeClasspathProvider(serverRuntime.getRuntimeType());
+ IPath serverContainerPath = new Path(RuntimeClasspathContainer.SERVER_CONTAINER)
+ .append(rcpw.getId()).append(serverRuntime.getId());
+ JBossClassPathCommand.addClassPath(project, serverContainerPath);
+
} catch (CoreException e) {
ESBProjectCorePlugin.getDefault().getLog().log(e.getStatus());
}
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19665 - trunk/documentation/whatsnew/bpel.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-01-06 10:12:29 -0500 (Wed, 06 Jan 2010)
New Revision: 19665
Modified:
trunk/documentation/whatsnew/bpel/bpel-news-1.0.0.CR1.html
Log:
Updating BPEL what's new document
Modified: trunk/documentation/whatsnew/bpel/bpel-news-1.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/bpel/bpel-news-1.0.0.CR1.html 2010-01-06 14:14:29 UTC (rev 19664)
+++ trunk/documentation/whatsnew/bpel/bpel-news-1.0.0.CR1.html 2010-01-06 15:12:29 UTC (rev 19665)
@@ -9,7 +9,7 @@
<title>BPEL Tools 1.0.0.CR1 What's New</title>
</head>
<body>
-<h1>BPEL Tools 1.0.0.CR1 What's New</h1>
+<h1>JBoss Eclipse BPEL Editor 1.0.0.CR1 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19664 - in trunk/documentation/whatsnew: bpel and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-01-06 09:14:29 -0500 (Wed, 06 Jan 2010)
New Revision: 19664
Added:
trunk/documentation/whatsnew/bpel/bpel-news-1.0.0.CR1.html
Removed:
trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html
Modified:
trunk/documentation/whatsnew/esb/esb-news-1.3.0.CR1.html
trunk/documentation/whatsnew/index.html
Log:
updated bpel whatsnew
Deleted: trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html
===================================================================
--- trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html 2010-01-06 14:12:55 UTC (rev 19663)
+++ trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html 2010-01-06 14:14:29 UTC (rev 19664)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Language" content="en-us" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="../whatsnew.css"/>
-<title>BPEL Editor 1.0.0.GA What's New</title>
-</head>
-<body>
-<h1>BPEL Editor 1.0.0.GA What's New</h1>
-
-<p align="right"><a href="../index.html">< Main Index</a></p>
-<table border="0" cellpadding="10" cellspacing="0" width="80%">
- <tr>
- <td colspan="2">
- <hr/>
- <h3>General</h3>
- <hr/>
- </td>
- </tr>
- <tr>
- <td valign="top" align="right">
- <a name="itemname3" id="itemname3"></a><b>JBoss BPEL Editor</b>
- </td>
- <td valign="top">The JBoss BPEL Editor project has been added, which means you can now create, edit and deploy BPEL artifacts for the JBoss BPEL Runtime.
-<p><img src="images/bpel_editor.png" style=" width : 571px; height : 411px;"/></p>
- </td>
- </tr>
- <tr>
- <td colspan="2"><hr />
- </td>
- </tr>
- <tr>
- <td valign="top" align="right">
- <a name="itemname3" id="itemname3"></a><b>Wizards</b>
- </td>
- <td valign="top">Added a 'New' Wizard to create a BPEL project in Eclipse. See the JBoss BPEL Editor tools documentation for details.
- <p><img src="images/bpel_wizard.png"/></p>
- </td>
-
- </tr>
-
-</table>
-
-</body>
-
-</html>
\ No newline at end of file
Added: trunk/documentation/whatsnew/bpel/bpel-news-1.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/bpel/bpel-news-1.0.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/bpel/bpel-news-1.0.0.CR1.html 2010-01-06 14:14:29 UTC (rev 19664)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>BPEL Tools 1.0.0.CR1 What's New</title>
+</head>
+<body>
+<h1>BPEL Tools 1.0.0.CR1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>General</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemname3" id="itemname3"></a><b>BPEL Editor</b>
+ </td>
+ <td valign="top">A BPEL Editor based on the Eclipse BPEL project has been added to JBoss Tools. This means you can now create, edit and deploy BPEL artifacts for the Riftsaw BPEL Runtime.
+<p><img src="images/bpel_editor.png" style=" width : 571px; height : 411px;"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemname3" id="itemname3"></a><b>Wizards</b>
+ </td>
+ <td valign="top">Added a 'New' Wizard to create a BPEL project in Eclipse which creates WTP compatible .bpel project that can be deployed
+to a BPEL runtime such as Riftsaw or Apache ODE. See the BPEL tools documentation for details.
+ <p><img src="images/bpel_wizard.png"/></p>
+ </td>
+
+ </tr>
+
+</table>
+
+</body>
+
+</html>
Modified: trunk/documentation/whatsnew/esb/esb-news-1.3.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/esb/esb-news-1.3.0.CR1.html 2010-01-06 14:12:55 UTC (rev 19663)
+++ trunk/documentation/whatsnew/esb/esb-news-1.3.0.CR1.html 2010-01-06 14:14:29 UTC (rev 19664)
@@ -11,7 +11,7 @@
<body>
<h1>ESB tools 1.3.0.CR1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../bpel/bpel-news-1.0.0.CR1.html">BPEL Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2010-01-06 14:12:55 UTC (rev 19663)
+++ trunk/documentation/whatsnew/index.html 2010-01-06 14:14:29 UTC (rev 19664)
@@ -35,6 +35,7 @@
<p><a href="smooks/smooks-news-1.1.0.CR1.html">Smooks Tools</a></p>
<p><a href="examples/examples-news-1.1.0.M4.html">Project Examples</a></p>
<p><a href="esb/esb-news-1.3.0.CR1.html">ESB Tools</a></p>
+ <p><a href="bpel/bpel-news-1.0.0.CR1.html">BPEL Tools</a></p>
</td>
</tr>
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19663 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui: wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-01-06 09:12:55 -0500 (Wed, 06 Jan 2010)
New Revision: 19663
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5330 - update GenerateMapping first page title
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2010-01-06 13:30:43 UTC (rev 19662)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2010-01-06 14:12:55 UTC (rev 19663)
@@ -42,6 +42,7 @@
public static String AddRemoveTableComposite_java_select_types;
public static String AddRemoveTableComposite_java_select_packages;
+ public static String NewHibernateMappingElementsSelectionPage2_title;
public static String NewHibernateMappingElementsSelectionPage2_description;
public static String NewHibernateMappingFilePage_class_name_column;
public static String NewHibernateMappingFilePage_file_name_column;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2010-01-06 13:30:43 UTC (rev 19662)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2010-01-06 14:12:55 UTC (rev 19663)
@@ -47,13 +47,14 @@
AddRemoveTableComposite_java_select_packages=Select packages to search for java types
NewHibernateMappingElementsSelectionPage_select=Select compilation units or containers
+NewHibernateMappingElementsSelectionPage2_title=Create Hibernate XML Mapping file(s)
NewHibernateMappingElementsSelectionPage2_description=Add classes and packages or wizard will create an empty mapping file
NewHibernateMappingFilePage_class_name_column=Class name
NewHibernateMappingFilePage_file_name_column=File name
NewHibernateMappingFilePage_hibernate_xml_mapping_file=Hibernate XML Mapping file
NewHibernateMappingFilePage_project_name_column=Project name
NewHibernateMappingFilePage_this_wizard_creates=This wizard creates new Hibernate XML Mapping file skeletons
-NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file=New Hibernate XML Mapping file (hbm.xml)
+NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file=New Hibernate XML Mapping files (hbm.xml)
NewHibernateMappingFileWizard_create_empty_xml_mapping_file=Create a new empty XML Mapping files
NewHibernateMappingFileWizard_look_for_dependent_cu=Search for dependent compilation units...
NewHibernateMappingFileWizard_selection_cant_be_empty=Selection can't be empty
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-01-06 13:30:43 UTC (rev 19662)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-01-06 14:12:55 UTC (rev 19663)
@@ -111,6 +111,7 @@
}
page0 = new NewHibernateMappingElementsSelectionPage2(JdtUiMessages.NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file, selection);
+ page0.setTitle(JdtUiMessages.NewHibernateMappingElementsSelectionPage2_title);
page0.setDescription(JdtUiMessages.NewHibernateMappingElementsSelectionPage2_description);
addPage(page0);
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19662 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-01-06 08:30:43 -0500 (Wed, 06 Jan 2010)
New Revision: 19662
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/AddRemoveTableComposite.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5159 - step 2 implementation - JBIDE-5159 fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2010-01-06 12:39:12 UTC (rev 19661)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2010-01-06 13:30:43 UTC (rev 19662)
@@ -504,6 +504,7 @@
public static String DeleteProjectParticipant_delete_console_configuration;
public static String AddRemoveTableComposite_no_dependencies;
+ public static String AddRemoveTableComposite_control_depth_level;
//
static {
// initialize resource bundle
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2010-01-06 12:39:12 UTC (rev 19661)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2010-01-06 13:30:43 UTC (rev 19662)
@@ -506,3 +506,4 @@
ConnectionProfileRenameParticipant_launch_configurations_updates=Launch Configurations updates
AddRemoveTableComposite_no_dependencies=no dependencies
+AddRemoveTableComposite_control_depth_level=depth control
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/AddRemoveTableComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/AddRemoveTableComposite.java 2010-01-06 12:39:12 UTC (rev 19661)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/AddRemoveTableComposite.java 2010-01-06 13:30:43 UTC (rev 19662)
@@ -27,13 +27,18 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.SelectionDialog;
@@ -49,6 +54,7 @@
public class AddRemoveTableComposite extends UpDownListComposite {
protected Button depthControl;
+ protected Text depthNumbers;
public AddRemoveTableComposite(Composite parent, int style) {
super(parent, style, "", //$NON-NLS-1$
@@ -69,14 +75,41 @@
gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
gridData.grabExcessHorizontalSpace = false;
gridData.grabExcessVerticalSpace = false;
- gridData.verticalAlignment = SWT.BOTTOM;
+ GridData gridData2 = new org.eclipse.swt.layout.GridData();
+ gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
+ gridData2.grabExcessHorizontalSpace = false;
+ gridData2.grabExcessVerticalSpace = false;
depthControl = new Button(parent, SWT.CHECK);
- depthControl.setText(HibernateConsoleMessages.AddRemoveTableComposite_no_dependencies);
+ //depthControl.setText(HibernateConsoleMessages.AddRemoveTableComposite_no_dependencies);
+ depthControl.setText(HibernateConsoleMessages.AddRemoveTableComposite_control_depth_level);
depthControl.setLayoutData(gridData);
+ depthNumbers = new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.TRAIL);
+ depthNumbers.setText("0"); //$NON-NLS-1$
+ depthNumbers.setLayoutData(gridData2);
+ depthNumbers.setEnabled(false);
+ depthNumbers.addListener(SWT.Verify, new Listener() {
+ public void handleEvent(Event e) {
+ String string = e.text;
+ char [] chars = new char[string.length()];
+ string.getChars (0, chars.length, chars, 0);
+ for (int i = 0; i < chars.length; i++) {
+ if (!('0' <= chars [i] && chars [i] <= '9')) {
+ e.doit = false;
+ return;
+ }
+ }
+ }
+ });
+ depthControl.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ depthNumbers.setEnabled(depthControl.getSelection());
+ }
+ });
}
public int getProcessDepth() {
- return depthControl.getSelection() ? 0 : Integer.MAX_VALUE;
+ String num = depthNumbers.getText();
+ return depthControl.getSelection() ? Integer.parseInt(num) : Integer.MAX_VALUE;
}
protected void createColumns(Table table) {
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19661 - in trunk: jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-01-06 07:39:12 -0500 (Wed, 06 Jan 2010)
New Revision: 19661
Added:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java
Modified:
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/CreateNewStrutsProjectTest.java
Log:
Added test of adding and removing Struts capabilites
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-01-06 10:15:31 UTC (rev 19660)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-01-06 12:39:12 UTC (rev 19661)
@@ -381,7 +381,12 @@
}
}
-
+ /**
+ * Test if tree contains item with itemLabel
+ * @param tree
+ * @param itemLabel
+ * @return
+ */
public static boolean treeContainsItemWithLabel(SWTBotTree tree, String itemLabel){
boolean containsItem = false;
try {
@@ -391,5 +396,18 @@
}
return containsItem;
}
+ /**
+ * if Open Associated Perspective Shell is opened close it
+ * and depend on switchPerspective parameter change current perspective
+ * @param switchPerspective
+ */
+ public void closeOpenAssociatedPerspectiveShellIfOpened(boolean switchPerspective){
+ try{
+ bot.shell(IDELabel.Shell.OPEN_ASSOCIATED_PERSPECTIVE).activate();
+ bot.button(switchPerspective ? IDELabel.Button.YES : IDELabel.Button.NO).click();
+ } catch (WidgetNotFoundException wnfe){
+ // do nothing
+ }
+ }
}
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-01-06 10:15:31 UTC (rev 19660)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-01-06 12:39:12 UTC (rev 19661)
@@ -11,12 +11,15 @@
package org.jboss.tools.ui.bot.ext;
+import static org.jboss.tools.ui.bot.ext.SWTTestExt.eclipse;
+
import org.apache.log4j.Logger;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.types.ViewType;
@@ -150,4 +153,40 @@
bot.shell(IDELabel.Shell.DELETE_SERVER).activate();
bot.button(IDELabel.Button.OK).click();
}
+ /**
+ * Remove Project from all Servers
+ */
+ public void removeProjectFromServers(String projectName){
+
+ eclipse.showView(ViewType.SERVERS);
+
+ delay();
+
+ SWTBotTree serverTree = bot.viewByTitle(IDELabel.View.SERVERS).bot().tree();
+
+ // Expand All
+ for (SWTBotTreeItem serverTreeItem : serverTree.getAllItems()){
+ serverTreeItem.expand();
+ // if JSF Test Project is deployed to server remove it
+ int itemIndex = 0;
+ SWTBotTreeItem[] serverTreeItemChildren = serverTreeItem.getItems();
+ while (itemIndex < serverTreeItemChildren.length
+ && !serverTreeItemChildren[itemIndex].getText().startsWith(projectName)){
+ itemIndex++;
+ }
+ // Server Tree Item has Child with Text equal to JSF TEst Project
+ if (itemIndex < serverTreeItemChildren.length){
+ ContextMenuHelper.prepareTreeItemForContextMenu(serverTree,serverTreeItemChildren[itemIndex]);
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, IDELabel.Menu.REMOVE, false)).click();
+ bot.shell("Server").activate();
+ bot.button(IDELabel.Button.OK).click();
+ }
+ }
+ delay();
+ }
+
+ public void delay() {
+ bot.sleep(500);
+ }
+
}
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2010-01-06 10:15:31 UTC (rev 19660)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2010-01-06 12:39:12 UTC (rev 19661)
@@ -25,6 +25,7 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.swt.finder.utils.SWTUtils;
import org.jboss.tools.ui.bot.ext.types.JobLists;
@@ -322,7 +323,33 @@
log.error(msg);
fail(msg);
}
-
-
-
+ /**
+ * Write all running processes names to log
+ */
+ public void logAllRunningProcesses(){
+ Job[] jobs = Job.getJobManager().find(null);
+
+ for (Job job : jobs) {
+ log.info(job.getName());
+ }
+ }
+ /**
+ * Write all menu items of menu to log
+ * @param menu
+ */
+ public void logAllSubmenus(MenuItem menuItem){
+
+ final MenuItem miTmp = menuItem;
+
+ menuItem.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ int index = 0;
+ for (MenuItem miSubmenu : miTmp.getMenu().getItems()){
+ log.info(index++ + ": " + miSubmenu);
+ }
+
+ }
+ });
+
+ }
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-01-06 10:15:31 UTC (rev 19660)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-01-06 12:39:12 UTC (rev 19661)
@@ -56,6 +56,10 @@
public static final String STOP = "Stop";
public static final String STRUTS_PROJECT = "Struts Project";
public static final String PREFERENCES = "Preferences";
+ public static final String JBDS_REMOVE_STRUTS_CAPABILITIES = "Remove Red Hat Capabilities";
+ public static final String JBT_REMOVE_STRUTS_CAPABILITIES = "Remove Struts Capabilities";
+ public static final String ADD_STRUTS_CAPABILITIES = "Add Struts Capabilities...";
+ public static final String WEB_PROJECT_JBT_STRUTS = "JBoss Tools Struts";
}
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2010-01-06 10:15:31 UTC (rev 19660)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2010-01-06 12:39:12 UTC (rev 19661)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.struts.ui.bot.test;
+import org.jboss.tools.struts.ui.bot.test.smoke.AddRemoveStrutsCapabilities;
import org.jboss.tools.struts.ui.bot.test.smoke.CreateNewStrutsProjectTest;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -27,8 +28,10 @@
*
*/
@RunWith(Suite.class)
-@SuiteClasses( {CreateNewStrutsProjectTest.class})
+@SuiteClasses( {CreateNewStrutsProjectTest.class,
+ AddRemoveStrutsCapabilities.class})
public class StrutsAllBotTests extends SWTTestExt {
+ public static final String STRUTS_PROJECT_NAME = "strutsTest";
@BeforeClass
public static void setUp() {
properties = util.loadProperties(Activator.PLUGIN_ID);
Added: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java (rev 0)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java 2010-01-06 12:39:12 UTC (rev 19661)
@@ -0,0 +1,124 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.struts.ui.bot.test.smoke;
+
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.struts.ui.bot.test.StrutsAllBotTests;
+import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.types.ViewType;
+import org.junit.Test;
+/**
+ * Test adding and removing Struts Capabilities from/to Struts Project
+ * @author Vladimir Pakan
+ *
+ */
+public class AddRemoveStrutsCapabilities extends SWTTestExt{
+ private SWTJBTExt swtJbtExt = null;
+ public AddRemoveStrutsCapabilities (){
+ swtJbtExt = new SWTJBTExt(bot);
+ }
+ @Test
+ public void testCreateNewStrutsProject() {
+ boolean jbdsIsRunning = SWTJBTExt.isJBDSRun(bot);
+ removeStrutsCapabilities(jbdsIsRunning);
+ addStrutsCapabilities();
+ }
+
+ /**
+ * Remove Struts Capabilities from Struts Project
+ * @param jbdsIsRunning
+ */
+ private void removeStrutsCapabilities(boolean jbdsIsRunning) {
+
+ swtJbtExt.removeProjectFromServers(StrutsAllBotTests.STRUTS_PROJECT_NAME);
+ util.delay();
+ eclipse.showView(ViewType.WEB_PROJECTS);
+
+ SWTBotTree tree = bot.viewByTitle(IDELabel.View.WEB_PROJECTS).bot().tree();
+
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree,
+ tree.getTreeItem(StrutsAllBotTests.STRUTS_PROJECT_NAME));
+
+ if (jbdsIsRunning){
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree,
+ IDELabel.Menu.JBDS_REMOVE_STRUTS_CAPABILITIES, true)).click();
+ }
+ else{
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree,
+ IDELabel.Menu.WEB_PROJECT_JBT_STRUTS, false)).menu(
+ IDELabel.Menu.JBT_REMOVE_STRUTS_CAPABILITIES).click();
+ }
+
+ bot.shell("Confirmation").activate();
+ bot.button(IDELabel.Button.OK).click();
+
+ util.waitForNonIgnoredJobs(5L*1000);
+
+ assertTrue(
+ "Project "
+ + StrutsAllBotTests.STRUTS_PROJECT_NAME
+ + " was not removed from Web Projects view after Struts Capabilities were removed.",
+ !SWTEclipseExt.treeContainsItemWithLabel(bot.viewByTitle(IDELabel.View.WEB_PROJECTS).bot().tree(),
+ StrutsAllBotTests.STRUTS_PROJECT_NAME));
+
+ }
+
+ /**
+ * Add Struts Capabilities to JSF Project
+ */
+ private void addStrutsCapabilities() {
+
+ swtJbtExt.removeProjectFromServers(StrutsAllBotTests.STRUTS_PROJECT_NAME);
+
+ SWTBotTree tree = eclipse.showView(ViewType.PACKAGE_EXPLORER).tree();
+
+ util.delay();
+
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree,
+ tree.getTreeItem(StrutsAllBotTests.STRUTS_PROJECT_NAME));
+
+ try{
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree,
+ IDELabel.Menu.PACKAGE_EXPLORER_JBT, false)).menu(
+ IDELabel.Menu.ADD_STRUTS_CAPABILITIES).click();
+ } catch (WidgetNotFoundException wnfe){
+ // From 3.1.0.RC1 version this menu is moved to Configure submenu
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree,
+ IDELabel.Menu.PACKAGE_EXPLORER_CONFIGURE, false)).menu(
+ IDELabel.Menu.ADD_STRUTS_CAPABILITIES).click();
+ }
+
+ bot.shell("Add Struts Capabilities").activate();
+ bot.button(IDELabel.Button.NEXT).click();
+ bot.button(IDELabel.Button.FINISH).click();
+
+ eclipse.closeOpenAssociatedPerspectiveShellIfOpened(false);
+
+ util.waitForNonIgnoredJobs(5L*1000);
+
+ eclipse.showView(ViewType.WEB_PROJECTS);
+
+ assertTrue("JSF Capabilities were not added to project "
+ + StrutsAllBotTests.STRUTS_PROJECT_NAME,
+ SWTEclipseExt.treeContainsItemWithLabel(bot.viewByTitle(IDELabel.View.WEB_PROJECTS).bot().tree(),
+ StrutsAllBotTests.STRUTS_PROJECT_NAME));
+
+ }
+}
Property changes on: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/CreateNewStrutsProjectTest.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/CreateNewStrutsProjectTest.java 2010-01-06 10:15:31 UTC (rev 19660)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/CreateNewStrutsProjectTest.java 2010-01-06 12:39:12 UTC (rev 19661)
@@ -13,7 +13,6 @@
import static org.junit.Assert.assertTrue;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.types.EntityType;
@@ -28,12 +27,12 @@
*/
public class CreateNewStrutsProjectTest extends SWTTestExt{
- public static final String STRUTS_PROJECT_NAME = "strutsTest";
-
+ /**
+ * Test create new Struts Project
+ */
@Test
public void testCreateNewStrutsProject() {
-
- // Test create new Struts Project
+
eclipse.showView(ViewType.WEB_PROJECTS);
eclipse.addServerRuntime(IDELabel.ServerRuntimeName.JBOSS_EAP_4_3,
IDELabel.ServerGroup.JBOSS_EAP_4_3,
@@ -41,21 +40,16 @@
StrutsAllBotTests.getProperty("JBossEap4.3Home"));
eclipse.createNew(EntityType.STRUTS_PROJECT);
bot.shell(IDELabel.Shell.NEW_STRUTS_PROJECT).activate();
- bot.textWithLabel(IDELabel.NewStrutsProjectDialog.NAME).setText(STRUTS_PROJECT_NAME);
+ bot.textWithLabel(IDELabel.NewStrutsProjectDialog.NAME).setText(StrutsAllBotTests.STRUTS_PROJECT_NAME);
bot.comboBoxWithLabel(IDELabel.NewStrutsProjectDialog.TEMPLATE).setSelection(IDELabel.NewStrutsProjectDialog.TEMPLATE_KICK_START);
bot.button(IDELabel.Button.NEXT).click();
bot.button(IDELabel.Button.NEXT).click();
bot.button(IDELabel.Button.FINISH).click();
- // if Open Associated Perspective Shell is opened close it
- try{
- bot.shell(IDELabel.Shell.OPEN_ASSOCIATED_PERSPECTIVE).activate();
- bot.button(IDELabel.Button.NO).click();
- } catch (WidgetNotFoundException wnfe){
- // do nothing
- }
+ eclipse.closeOpenAssociatedPerspectiveShellIfOpened(false);
- assertTrue("Project "+ STRUTS_PROJECT_NAME + " was not created properly.",
- SWTEclipseExt.treeContainsItemWithLabel(bot.viewByTitle(IDELabel.View.WEB_PROJECTS).bot().tree(),STRUTS_PROJECT_NAME));
+ assertTrue("Project "+ StrutsAllBotTests.STRUTS_PROJECT_NAME + " was not created properly.",
+ SWTEclipseExt.treeContainsItemWithLabel(bot.viewByTitle(IDELabel.View.WEB_PROJECTS).bot().tree(),
+ StrutsAllBotTests.STRUTS_PROJECT_NAME));
}
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19660 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-01-06 05:15:31 -0500 (Wed, 06 Jan 2010)
New Revision: 19660
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanGraphModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java
Log:
JBIDE-5605
Fixed
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanGraphModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanGraphModel.java 2010-01-06 07:59:28 UTC (rev 19659)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanGraphModel.java 2010-01-06 10:15:31 UTC (rev 19660)
@@ -84,7 +84,14 @@
if (m instanceof FreemarkerTemplateXMLModel) {
if (data instanceof EObject) {
if (SmooksUIUtils.isCollectionJavaGraphModel((EObject) data)) {
- return ((FreemarkerTemplateXMLModel) m).isManyOccurs();
+ boolean flag = ((FreemarkerTemplateXMLModel) m).isManyOccurs()
+ && gm.getTargetConnections().isEmpty();
+ Object p = SmooksFreemarkerTemplateGraphicalEditor.parentIsRequriedCollectionNode(gm);
+ if(p != null) {
+ return false;
+ }else{
+ return flag;
+ }
}
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-01-06 07:59:28 UTC (rev 19659)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-01-06 10:15:31 UTC (rev 19660)
@@ -17,6 +17,7 @@
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.gef.EditPartFactory;
+import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject;
import org.jboss.tools.smooks.editor.ISmooksModelProvider;
import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.ConnectionModelFactory;
@@ -90,23 +91,62 @@
AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = (AbstractSmooksGraphicalModel) iterator.next();
Object data = abstractSmooksGraphicalModel.getData();
if (data instanceof IFreemarkerTemplateModel) {
- if (((IFreemarkerTemplateModel) data).isRequired() && !((IFreemarkerTemplateModel) data).isHidden(root)) {
- if (abstractSmooksGraphicalModel.getTargetConnections().isEmpty()) {
- abstractSmooksGraphicalModel.addMessage("This node must be linked with source node");
- abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR);
- }
+ AbstractSmooksGraphicalModel requiredCollectionLinkParent = parentIsRequriedCollectionNode(abstractSmooksGraphicalModel);
+ if(requiredCollectionLinkParent != null){
+ AbstractXMLObject parentNode = (AbstractXMLObject)requiredCollectionLinkParent.getData();
+ abstractSmooksGraphicalModel.addMessage("Its parent node '" + parentNode.getName() + "' should be connected first.");
+ abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR);
}
- if (((IFreemarkerTemplateModel) data).isManyOccurs()) {
- if (abstractSmooksGraphicalModel.getTargetConnections().isEmpty()) {
- abstractSmooksGraphicalModel.addMessage("This node must be linked with collection java node");
- abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR);
- }
+ if (isRequiredNode(abstractSmooksGraphicalModel)) {
+ abstractSmooksGraphicalModel.addMessage("This node must be linked with source node");
+ abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR);
}
+ if (isRequiredCollectionNode(abstractSmooksGraphicalModel)) {
+ abstractSmooksGraphicalModel.addMessage("This node must be linked with collection java node");
+ abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR);
+ }
}
validateTemplateContentsModel(type, abstractSmooksGraphicalModel.getChildren());
}
}
+
+ public static AbstractSmooksGraphicalModel parentIsRequriedCollectionNode(AbstractSmooksGraphicalModel abstractSmooksGraphicalModel) {
+ AbstractSmooksGraphicalModel parent = abstractSmooksGraphicalModel.getParent();
+ Object data = abstractSmooksGraphicalModel.getData();
+ if (data instanceof IFreemarkerTemplateModel) {
+ if (isRequiredCollectionNode(parent)) {
+ return parent;
+ }
+ return parentIsRequriedCollectionNode(parent);
+ }
+ return null;
+ }
+
+ private boolean isRequiredNode(AbstractSmooksGraphicalModel abstractSmooksGraphicalModel) {
+ Object data = abstractSmooksGraphicalModel.getData();
+ if (data instanceof IFreemarkerTemplateModel) {
+ if (((IFreemarkerTemplateModel) data).isRequired() && !((IFreemarkerTemplateModel) data).isHidden(root)) {
+ if (abstractSmooksGraphicalModel.getTargetConnections().isEmpty()) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public static boolean isRequiredCollectionNode(AbstractSmooksGraphicalModel abstractSmooksGraphicalModel) {
+ Object data = abstractSmooksGraphicalModel.getData();
+ if (data instanceof IFreemarkerTemplateModel) {
+ if (((IFreemarkerTemplateModel) data).isManyOccurs()) {
+ if (abstractSmooksGraphicalModel.getTargetConnections().isEmpty()) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
/*
* (non-Javadoc)
*
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19659 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical: editors and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-01-06 02:59:28 -0500 (Wed, 06 Jan 2010)
New Revision: 19659
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties
Log:
JBIDE-5602
Fixed it
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java 2010-01-06 07:18:47 UTC (rev 19658)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java 2010-01-06 07:59:28 UTC (rev 19659)
@@ -52,8 +52,15 @@
if (parentID.equals(TaskTypeManager.TASK_ID_FREEMARKER_CSV_TEMPLATE)) {
if (!TaskTypeManager.TASK_ID_JAVA_MAPPING.equals(currentTask.getId())) {
return false;
+ }else{
+ for (Iterator<?> iterator = taskList.iterator(); iterator.hasNext();) {
+ TaskType taskType = (TaskType) iterator.next();
+ if (TaskTypeManager.TASK_ID_FREEMARKER_CSV_TEMPLATE.equals(taskType.getId())) {
+ return false;
+ }
+ }
+ return true;
}
- return true;
}
if (parentID.equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java 2010-01-06 07:18:47 UTC (rev 19658)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java 2010-01-06 07:59:28 UTC (rev 19659)
@@ -34,6 +34,7 @@
public static String SmooksProcessGraphicalEditor_No_Input_File_Active;
public static String SmooksProcessGraphicalEditor_No_Input_Specified;
public static String SmooksProcessGraphicalEditor_No_Input_Task_Found;
+ public static String SmooksProcessGraphicalEditor_ValidationError_MultipleTemplate;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-01-06 07:18:47 UTC (rev 19658)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-01-06 07:59:28 UTC (rev 19659)
@@ -94,6 +94,7 @@
import org.jboss.tools.smooks.graphical.editors.process.TemplateAppyTaskNode;
import org.jboss.tools.smooks.graphical.editors.template.SmooksFreemarkerCSVTemplateGraphicalEditor;
import org.jboss.tools.smooks.graphical.editors.template.SmooksFreemarkerTemplateGraphicalEditor;
+import org.jboss.tools.smooks.model.freemarker.Freemarker;
import org.jboss.tools.smooks.model.javabean12.BeanType;
import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig;
import org.jboss.tools.smooks.model.smooks.DocumentRoot;
@@ -1142,6 +1143,7 @@
SmooksResourceListType sr = getSmooksResourceListType();
List<AbstractResourceConfig> rcs = sr.getAbstractResourceConfig();
boolean correct = false;
+
for (Iterator<?> iterator = rcs.iterator(); iterator.hasNext();) {
AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next();
if (abstractResourceConfig instanceof BeanType) {
@@ -1159,10 +1161,22 @@
SmooksResourceListType sr = getSmooksResourceListType();
List<AbstractResourceConfig> rcs = sr.getAbstractResourceConfig();
boolean correct = false;
+ boolean multipleTemplate = false;
+ int freemarkerCount = 0;
for (Iterator<?> iterator = rcs.iterator(); iterator.hasNext();) {
AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next();
if (abstractResourceConfig instanceof BeanType) {
correct = true;
+ // break;
+ }
+ if (abstractResourceConfig instanceof Freemarker) {
+ freemarkerCount++;
+ }
+ if (freemarkerCount > 1) {
+ multipleTemplate = true;
+ // break;
+ }
+ if (!correct && multipleTemplate) {
break;
}
}
@@ -1170,6 +1184,10 @@
task.setProblemType(IFieldMarker.TYPE_WARINING);
task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_4);
}
+ if (multipleTemplate) {
+ task.setProblemType(IFieldMarker.TYPE_ERROR);
+ task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_ValidationError_MultipleTemplate);
+ }
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties 2010-01-06 07:18:47 UTC (rev 19658)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties 2010-01-06 07:59:28 UTC (rev 19659)
@@ -12,6 +12,7 @@
SmooksJavaMappingGraphicalEditor_NodeMustLinkWithSource=The node must be linked with input source
SmooksJavaMappingGraphicalEditor_NullLabel=<NULL>
SmooksProcessGraphicalEditor_4=No java mapping has been specified in the Java Mapping task.
+SmooksProcessGraphicalEditor_ValidationError_MultipleTemplate=Doesn't support multiple template task.
SmooksProcessGraphicalEditor_AddTaskActionText=Add Task
SmooksProcessGraphicalEditor_FormText=Smooks Processing
SmooksProcessGraphicalEditor_TaskConfigurationSectionTitle=Selected Task Details
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19658 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors: csv12 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-01-06 02:18:47 -0500 (Wed, 06 Jan 2010)
New Revision: 19658
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ModelMultiChildrenTabelPanelCreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/MultiContainerChildrenAddtionTablePanel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java
Log:
JBIDE-5564
Fixed it
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizard.java 2010-01-06 00:53:40 UTC (rev 19657)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizard.java 2010-01-06 07:18:47 UTC (rev 19658)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
@@ -30,7 +31,7 @@
private PrivateWizardDialog dialog;
public ChildrenSelectionWizard(Shell shell, Collection<?> childrenDescriptor,
- AdapterFactoryEditingDomain editingDomain) {
+ AdapterFactoryEditingDomain editingDomain , ILabelProvider customeLabelProvider) {
super();
dialog = new PrivateWizardDialog(shell, this){
@@ -38,6 +39,7 @@
page = new ChildrenSelectionWizardPage(childrenDescriptor, editingDomain, "children selection", //$NON-NLS-1$
"Select children", null); //$NON-NLS-1$
page.setWizardDialog(dialog);
+ page.setCustomeLabelProvider(customeLabelProvider);
}
public CommandParameter getChildDescriptor(){
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizardPage.java 2010-01-06 00:53:40 UTC (rev 19657)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizardPage.java 2010-01-06 07:18:47 UTC (rev 19658)
@@ -16,9 +16,11 @@
import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -39,6 +41,8 @@
*
*/
public class ChildrenSelectionWizardPage extends WizardPage {
+
+ private ILabelProvider customeLabelProvider = null;
private Collection<?> childrenDescriptor = new ArrayList<CommandParameter>();
@@ -77,12 +81,12 @@
}
});
tableViewer.addDoubleClickListener(new IDoubleClickListener() {
-
+
public void doubleClick(DoubleClickEvent event) {
dialog.close();
}
});
- if(childrenDescriptor != null){
+ if (childrenDescriptor != null) {
tableViewer.setInput(childrenDescriptor);
}
updatePage();
@@ -92,7 +96,15 @@
public Object getChild() {
return child;
}
+
+ /**
+ * @param customeLabelProvider the customeLabelProvider to set
+ */
+ public void setCustomeLabelProvider(ILabelProvider customeLabelProvider) {
+ this.customeLabelProvider = customeLabelProvider;
+ }
+
protected void updatePage() {
String error = null;
if (child == null) {
@@ -103,8 +115,8 @@
this.setPageComplete(error == null);
}
- public ChildrenSelectionWizardPage(Collection<?> childrenDescriptor,
- AdapterFactoryEditingDomain editingDomain, String pageName, String title, ImageDescriptor titleImage) {
+ public ChildrenSelectionWizardPage(Collection<?> childrenDescriptor, AdapterFactoryEditingDomain editingDomain,
+ String pageName, String title, ImageDescriptor titleImage) {
super(pageName, title, titleImage);
this.childrenDescriptor = childrenDescriptor;
this.editingDomain = editingDomain;
@@ -112,8 +124,8 @@
this.setDescription(Messages.ChildrenSelectionWizardPage_wizardtitle);
}
- public ChildrenSelectionWizardPage(Collection<?> childrenDescriptor,
- AdapterFactoryEditingDomain editingDomain,String pageName) {
+ public ChildrenSelectionWizardPage(Collection<?> childrenDescriptor, AdapterFactoryEditingDomain editingDomain,
+ String pageName) {
super(pageName);
this.childrenDescriptor = childrenDescriptor;
this.editingDomain = editingDomain;
@@ -155,19 +167,31 @@
@Override
public Image getImage(Object element) {
+ Image image = null;
+ if(customeLabelProvider != null){
+ image = customeLabelProvider.getImage(element);
+ }
+ if(image != null){
+ return image;
+ }
element = getValue(element);
IItemLabelProvider provider = (IItemLabelProvider) editingDomain.getAdapterFactory().adapt(element,
IItemLabelProvider.class);
Object img = provider.getImage(element);
- if(img instanceof Image){
- return ((Image)img);
- }
- return null;
+ image = ExtendedImageRegistry.getInstance().getImage(img);
+ return image;
}
@Override
public String getText(Object element) {
+ String label = null;
+ if(customeLabelProvider != null){
+ label = customeLabelProvider.getText(element);
+ }
+ if(label != null){
+ return label;
+ }
element = getValue(element);
IItemLabelProvider provider = (IItemLabelProvider) editingDomain.getAdapterFactory().adapt(element,
IItemLabelProvider.class);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ModelMultiChildrenTabelPanelCreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ModelMultiChildrenTabelPanelCreator.java 2010-01-06 00:53:40 UTC (rev 19657)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ModelMultiChildrenTabelPanelCreator.java 2010-01-06 07:18:47 UTC (rev 19658)
@@ -19,6 +19,7 @@
import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -40,20 +41,30 @@
private EObject newChild = null;
+ private ILabelProvider customeChildrenSelectionViewerLabelProvider = null;
+
public ModelMultiChildrenTabelPanelCreator(Shell shell, Collection<?> children,
AdapterFactoryEditingDomain editingDomain, ISmooksModelProvider smooksModelProvider, EObject parentModel,
- FormToolkit toolkit, IEditorPart editorPart) {
+ FormToolkit toolkit, IEditorPart editorPart, ILabelProvider customeChildrenSelectionViewerLabelProvider) {
super(smooksModelProvider, parentModel, toolkit, editorPart);
this.shell = shell;
this.children = children;
this.editingDomain = editingDomain;
+ this.customeChildrenSelectionViewerLabelProvider = customeChildrenSelectionViewerLabelProvider;
}
+ public ModelMultiChildrenTabelPanelCreator(Shell shell, Collection<?> children,
+ AdapterFactoryEditingDomain editingDomain, ISmooksModelProvider smooksModelProvider, EObject parentModel,
+ FormToolkit toolkit, IEditorPart editorPart) {
+ this(shell, children, editingDomain, smooksModelProvider, parentModel, toolkit, editorPart, null);
+ }
+
@Override
protected boolean performNewChild() {
List<Object> cloneChildren = new ArrayList<Object>();
cloneChildren.addAll(children);
- ChildrenSelectionWizard wizard = new ChildrenSelectionWizard(shell, cloneChildren, editingDomain);
+ ChildrenSelectionWizard wizard = new ChildrenSelectionWizard(shell, cloneChildren, editingDomain,
+ customeChildrenSelectionViewerLabelProvider);
if (wizard.open() == Dialog.OK) {
CommandParameter param = wizard.getChildDescriptor();
if (param != null) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/MultiContainerChildrenAddtionTablePanel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/MultiContainerChildrenAddtionTablePanel.java 2010-01-06 00:53:40 UTC (rev 19657)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/MultiContainerChildrenAddtionTablePanel.java 2010-01-06 07:18:47 UTC (rev 19658)
@@ -19,6 +19,7 @@
import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -39,21 +40,30 @@
private EStructuralFeature feature;
private EObject newChild = null;
+
+ private ILabelProvider cutomeChildrenSelectionViewerLabelProvider;
public MultiContainerChildrenAddtionTablePanel(Shell shell, Collection<?> children,
AdapterFactoryEditingDomain editingDomain, ISmooksModelProvider smooksModelProvider, EObject rootModel,
- FormToolkit toolkit, IEditorPart editorPart) {
+ FormToolkit toolkit, IEditorPart editorPart , ILabelProvider cutomeChildrenSelectionViewerLabelProvider) {
super(smooksModelProvider, rootModel, toolkit, editorPart);
this.shell = shell;
this.children = children;
this.editingDomain = editingDomain;
+ this.cutomeChildrenSelectionViewerLabelProvider = cutomeChildrenSelectionViewerLabelProvider;
}
+
+ public MultiContainerChildrenAddtionTablePanel(Shell shell, Collection<?> children,
+ AdapterFactoryEditingDomain editingDomain, ISmooksModelProvider smooksModelProvider, EObject rootModel,
+ FormToolkit toolkit, IEditorPart editorPart){
+ this(shell, children, editingDomain, smooksModelProvider, rootModel, toolkit, editorPart, null);
+ }
@Override
protected boolean performNewChild() {
List<Object> cloneChildren = new ArrayList<Object>();
cloneChildren.addAll(children);
- ChildrenSelectionWizard wizard = new ChildrenSelectionWizard(shell, cloneChildren, editingDomain);
+ ChildrenSelectionWizard wizard = new ChildrenSelectionWizard(shell, cloneChildren, editingDomain , cutomeChildrenSelectionViewerLabelProvider);
if (wizard.open() == Dialog.OK) {
CommandParameter param = wizard.getChildDescriptor();
if (param != null) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2010-01-06 00:53:40 UTC (rev 19657)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2010-01-06 07:18:47 UTC (rev 19658)
@@ -442,6 +442,7 @@
createReaderPanel((EObject) list.getAbstractReader().get(0));
} else {
disposeCompositeControls(readerConfigComposite, null);
+ createSimpleReaderPanel(reader);
}
}
@@ -731,20 +732,7 @@
}
} else {
- Label formText = this.getManagedForm().getToolkit().createLabel(readerConfigComposite, ""); //$NON-NLS-1$
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 50;
- gd.horizontalSpan = 2;
- formText.setLayoutData(gd);
- if (reader instanceof XMLReader || reader instanceof JavaReader || reader instanceof XSDReader) {
- formText.setText(Messages.SmooksReaderFormPage_Warning_Specify_Sample_Data);
- }
-
- if (reader instanceof NullReader) {
- formText.setText(Messages.SmooksReaderFormPage_Warning_Specify_Input_Type);
- }
- readerConfigComposite.layout();
- scrolledPageBook.reflow(false);
+ createSimpleReaderPanel(reader);
}
deactiveAllInputFile(compoundCommand);
if (!compoundCommand.isEmpty() && compoundCommand.canExecute()) {
@@ -771,7 +759,24 @@
}
}
}
+
+ private void createSimpleReaderPanel(Object reader){
+ Label formText = this.getManagedForm().getToolkit().createLabel(readerConfigComposite, ""); //$NON-NLS-1$
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ gd.heightHint = 50;
+ gd.horizontalSpan = 2;
+ formText.setLayoutData(gd);
+ if (reader instanceof XMLReader || reader instanceof JavaReader || reader instanceof XSDReader) {
+ formText.setText(Messages.SmooksReaderFormPage_Warning_Specify_Sample_Data);
+ }
+ if (reader instanceof NullReader) {
+ formText.setText(Messages.SmooksReaderFormPage_Warning_Specify_Input_Type);
+ }
+ readerConfigComposite.layout();
+ scrolledPageBook.reflow(false);
+ }
+
private void createReaderPanel(EObject reader) {
disposeCompositeControls(readerConfigComposite, null);
try {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java 2010-01-06 00:53:40 UTC (rev 19657)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java 2010-01-06 07:18:47 UTC (rev 19658)
@@ -15,10 +15,13 @@
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -37,8 +40,10 @@
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
import org.jboss.tools.smooks.editor.ISmooksModelProvider;
import org.jboss.tools.smooks.graphical.wizard.freemarker.Messages;
+import org.jboss.tools.smooks.model.csv12.Binding;
import org.jboss.tools.smooks.model.csv12.CSV12Reader;
import org.jboss.tools.smooks.model.csv12.Csv12Package;
+import org.jboss.tools.smooks.model.csv12.MapBinding;
/**
* @author Dart Peng (dpeng(a)redhat.com) Date Apr 10, 2009
@@ -113,22 +118,8 @@
final Collection<?> children = p.getNewChildDescriptors(reader, editingDomain, null);
ModelMultiChildrenTabelPanelCreator creator = new ModelMultiChildrenTabelPanelCreator(shell, children,
- editingDomain, modelProvider, reader, toolkit, editorPart) {
- //
- // @Override
- // protected EStructuralFeature getChildFeature(CommandParameter
- // model) {
- // return model.getEStructuralFeature();
- // }
- //
- // @Override
- // protected EObject getNewChildInstance(CommandParameter feature2)
- // {
- // return feature2.getEValue();
- // }
+ editingDomain, modelProvider, reader, toolkit, editorPart, new ReaderBindingLabelProvider());
- };
-
creator.createChildrenTablePanel(group);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 180;
@@ -156,7 +147,8 @@
final IItemPropertyDescriptor descriptor = propertySource.getPropertyDescriptor(model,
Csv12Package.Literals.CSV12_READER__SEPARATOR);
- final AttributeFieldEditPart separatorEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Separator_Char,
+ final AttributeFieldEditPart separatorEditPart = SmooksUIUtils.createStringFieldEditor(
+ org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Separator_Char,
parent, editingdomain, toolkit, descriptor, model, false, false, false, null, 0, null,
SmooksUIUtils.VALUE_TYPE_VALUE, null, false);
Text separateText = (Text) separatorEditPart.getContentControl();
@@ -165,7 +157,8 @@
final IItemPropertyDescriptor quotedescriptor = propertySource.getPropertyDescriptor(model,
Csv12Package.Literals.CSV12_READER__QUOTE);
- final AttributeFieldEditPart quoteEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Quote_Char, parent,
+ final AttributeFieldEditPart quoteEditPart = SmooksUIUtils.createStringFieldEditor(
+ org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Quote_Char, parent,
editingdomain, toolkit, quotedescriptor, model, false, false, false, null, 0, null,
SmooksUIUtils.VALUE_TYPE_VALUE, null, false);
Text quoteText = (Text) quoteEditPart.getContentControl();
@@ -176,7 +169,8 @@
String fields = (String) SmooksUIUtils.getEditValue(fieldsDescriptor, model);
- final AttributeFieldEditPart fieldsEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Fields, parent,
+ final AttributeFieldEditPart fieldsEditPart = SmooksUIUtils.createStringFieldEditor(
+ org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Fields, parent,
editingdomain, toolkit, fieldsDescriptor, model, false, false, false, null, 0, null,
SmooksUIUtils.VALUE_TYPE_VALUE, null, false);
Text text = (Text) fieldsEditPart.getContentControl();
@@ -191,14 +185,16 @@
final IItemPropertyDescriptor recorddescriptor = propertySource.getPropertyDescriptor(model,
Csv12Package.Literals.CSV12_READER__RECORD_ELEMENT_NAME);
- final AttributeFieldEditPart recordEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Record_Name, parent,
+ final AttributeFieldEditPart recordEditPart = SmooksUIUtils.createStringFieldEditor(
+ org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Record_Name, parent,
editingdomain, toolkit, recorddescriptor, model, false, false, false, null, 0, null,
SmooksUIUtils.VALUE_TYPE_VALUE, null, false);
final IItemPropertyDescriptor rootdescriptor = propertySource.getPropertyDescriptor(model,
Csv12Package.Literals.CSV12_READER__ROOT_ELEMENT_NAME);
- final AttributeFieldEditPart rootEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Root_Name, parent,
+ final AttributeFieldEditPart rootEditPart = SmooksUIUtils.createStringFieldEditor(
+ org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Root_Name, parent,
editingdomain, toolkit, rootdescriptor, model, false, false, false, null, 0, null,
SmooksUIUtils.VALUE_TYPE_VALUE, null, false);
@@ -247,4 +243,68 @@
editPart.getFieldMarker().setMessage(error);
}
}
+
+ /**
+ * newChildDescriptors.add (createChildParameter
+ * (Csv12Package.Literals.CSV12_READER__SINGLE_BINDING,
+ * Csv12Factory.eINSTANCE.createBinding()));
+ *
+ * newChildDescriptors.add (createChildParameter
+ * (Csv12Package.Literals.CSV12_READER__SINGLE_BINDING,
+ * Csv12Factory.eINSTANCE.createMapBinding()));
+ *
+ * newChildDescriptors.add (createChildParameter
+ * (Csv12Package.Literals.CSV12_READER__LIST_BINDING,
+ * Csv12Factory.eINSTANCE.createBinding()));
+ *
+ * newChildDescriptors.add (createChildParameter
+ * (Csv12Package.Literals.CSV12_READER__LIST_BINDING,
+ * Csv12Factory.eINSTANCE.createMapBinding()));
+ *
+ * newChildDescriptors.add (createChildParameter
+ * (Csv12Package.Literals.CSV12_READER__MAP_BINDING,
+ * Csv12Factory.eINSTANCE.createMapBinding()));
+ *
+ * @author Dart
+ *
+ */
+
+ private class ReaderBindingLabelProvider extends LabelProvider {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
+ */
+ @Override
+ public String getText(Object element) {
+ if (element instanceof CommandParameter) {
+ Object v = ((CommandParameter) element).getValue();
+ v = AdapterFactoryEditingDomain.unwrap(v);
+ EStructuralFeature feature = ((CommandParameter) element).getEStructuralFeature();
+ if (v instanceof MapBinding) {
+ if (feature == Csv12Package.Literals.CSV12_READER__MAP_BINDING) {
+ return "Map MapBinding";
+ }
+ if (feature == Csv12Package.Literals.CSV12_READER__SINGLE_BINDING) {
+ return "Single MapBinding";
+ }
+ if (feature == Csv12Package.Literals.CSV12_READER__LIST_BINDING) {
+ return "List MapBinding";
+ }
+ }
+ if (v instanceof Binding) {
+ if (feature == Csv12Package.Literals.CSV12_READER__SINGLE_BINDING) {
+ return "Single Binding";
+ }
+ if (feature == Csv12Package.Literals.CSV12_READER__LIST_BINDING) {
+ return "List Binding";
+ }
+ }
+ }
+ return super.getText(element);
+ }
+
+ }
}
\ No newline at end of file
14 years, 3 months
- 1
- 0