JBoss Tools SVN: r23031 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-06-25 07:19:15 -0400 (Fri, 25 Jun 2010)
New Revision: 23031
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java
Log:
https://jira.jboss.org/browse/JBIDE-6439
- VpeDND refactoring
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-06-25 11:16:43 UTC (rev 23030)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-06-25 11:19:15 UTC (rev 23031)
@@ -396,7 +396,7 @@
* @param dragetElement
*/
private void startDragSession(nsIDOMElement element) {
- rememberDragNode((Element) getSourceNode(element));
+ rememberDragNode(getSourceNode(element));
nsISupportsArray transArray = (nsISupportsArray) getComponentManager()
.createInstanceByContractID(XPCOM.NS_SUPPORTSARRAY_CONTRACTID, null,
nsISupportsArray.NS_ISUPPORTSARRAY_IID);
13 years, 11 months
JBoss Tools SVN: r23030 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-25 07:16:43 -0400 (Fri, 25 Jun 2010)
New Revision: 23030
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/Messages.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.properties
Log:
https://jira.jboss.org/browse/JBIDE-6514
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/Messages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/Messages.java 2010-06-25 11:00:42 UTC (rev 23029)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/Messages.java 2010-06-25 11:16:43 UTC (rev 23030)
@@ -13,6 +13,8 @@
public static String ERR_APP_NAME_IS_NOT_SPECIFIED;
public static String ERR_SERVLET_VERSION_IS_NOT_SET;
public static String ERR_SERVLET_VERSION_IS_NOT_VALID;
+ public static String ERR_SERVLET_VERSION_IS_NOT_SUPPORTED;
+ public static String ERR_SERVLET_VERSION_IS_NOT_SUPPORTED_BY_RUNTIME;
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.java 2010-06-25 11:00:42 UTC (rev 23029)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.java 2010-06-25 11:16:43 UTC (rev 23030)
@@ -11,10 +11,16 @@
package org.jboss.tools.jst.web.context;
import java.text.MessageFormat;
+import java.util.Iterator;
+import java.util.Set;
import java.util.StringTokenizer;
import org.eclipse.core.resources.IProject;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
@@ -177,7 +183,7 @@
IModule module = RegistrationHelper.findModule(project);
boolean isFakeModule = false;
if(module == null) {
- if(serverErrorCache != null) {
+ if(serverErrorCache != null && serverErrorCache.length() > 0) {
return serverErrorCache;
}
ModuleFactory f = ServerPlugin.findModuleFactory("org.eclipse.jst.j2ee.server"); //$NON-NLS-1$
@@ -186,7 +192,7 @@
} else {
serverErrorCache = null;
}
- for (int i = 0; i < targetServers.length; i++) {
+ if(serverErrorCache == null) for (int i = 0; i < targetServers.length; i++) {
if(RegistrationHelper.isRegistered(applicationName, targetServers[i])) {
return NLS.bind(WebUIMessages.APPLICATION_IS_ALREADY_REGISTERED, applicationName, targetServers[i].getName());
}
@@ -205,12 +211,30 @@
}
}
}
+ serverErrorCache = ""; //$NON-NLS-1$
}
if(servletVersion != null && servletVersion.length() == 0) {
return Messages.ERR_SERVLET_VERSION_IS_NOT_SET;
} else if(!checkServletVersionFormat()) {
return Messages.ERR_SERVLET_VERSION_IS_NOT_VALID;
}
+ if(runtime != null) {
+ IProjectFacet f = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$
+ if(f != null) {
+ IProjectFacetVersion v = f.getVersion(servletVersion);
+ if (v == null) return NLS.bind(Messages.ERR_SERVLET_VERSION_IS_NOT_SUPPORTED, servletVersion);
+ org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = null;
+ Set<?> set = RuntimeManager.getRuntimes();
+ Iterator<?> it = set.iterator();
+ while(it.hasNext()) {
+ org.eclipse.wst.common.project.facet.core.runtime.IRuntime r = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)it.next();
+ if(runtimeName.equals(r.getName())) facetRuntime = r;
+ }
+ if(facetRuntime != null && !facetRuntime.supports(v)) {
+ return NLS.bind(Messages.ERR_SERVLET_VERSION_IS_NOT_SUPPORTED_BY_RUNTIME, runtimeName, servletVersion);
+ }
+ }
+ }
return null;
}
@@ -226,7 +250,7 @@
try {
Integer.parseInt(t);
} catch (NumberFormatException e) {
- WebModelPlugin.getPluginLog().logError(e);
+ //Do not log! This is the validation of user input!
return false;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.properties 2010-06-25 11:00:42 UTC (rev 23029)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.properties 2010-06-25 11:16:43 UTC (rev 23030)
@@ -4,3 +4,5 @@
ERR_APP_NAME_IS_NOT_SPECIFIED=Application Name is not specified.
ERR_SERVLET_VERSION_IS_NOT_SET=Servlet version is not specified.
ERR_SERVLET_VERSION_IS_NOT_VALID=Servlet version is not valid.
+ERR_SERVLET_VERSION_IS_NOT_SUPPORTED=Servlet version {0} is not supported.
+ERR_SERVLET_VERSION_IS_NOT_SUPPORTED_BY_RUNTIME=Runtime {0} does not support servlet version {1}.
13 years, 11 months
JBoss Tools SVN: r23029 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-06-25 07:00:42 -0400 (Fri, 25 Jun 2010)
New Revision: 23029
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java
Log:
GPD-396
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java 2010-06-25 10:55:26 UTC (rev 23028)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java 2010-06-25 11:00:42 UTC (rev 23029)
@@ -58,6 +58,7 @@
combo = new Combo(versionControlsParent, SWT.BORDER | SWT.READ_ONLY);
combo.setFont(parent.getFont());
combo.setSize(50, combo.getSize().y);
+ combo.add(" 4.4");
combo.add(" 4.3");
combo.add(" 4.2");
combo.add(" 4.1");
13 years, 11 months
JBoss Tools SVN: r23028 - in workspace/Denny/test/org.guvnor.tools.test.junit: .settings and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2010-06-25 06:55:26 -0400 (Fri, 25 Jun 2010)
New Revision: 23028
Added:
workspace/Denny/test/org.guvnor.tools.test.junit/.classpath
workspace/Denny/test/org.guvnor.tools.test.junit/.project
workspace/Denny/test/org.guvnor.tools.test.junit/.settings/
workspace/Denny/test/org.guvnor.tools.test.junit/.settings/org.eclipse.jdt.core.prefs
workspace/Denny/test/org.guvnor.tools.test.junit/META-INF/
workspace/Denny/test/org.guvnor.tools.test.junit/META-INF/MANIFEST.MF
workspace/Denny/test/org.guvnor.tools.test.junit/build.properties
workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/
workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/.project
workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/guvnorMetadata
workspace/Denny/test/org.guvnor.tools.test.junit/src/
workspace/Denny/test/org.guvnor.tools.test.junit/src/org/
workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/
workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/
workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/
workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/GuvnorJunitTests.java
workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/GuvnorToolsAllTests.java
Log:
Added: workspace/Denny/test/org.guvnor.tools.test.junit/.classpath
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/.classpath (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/.classpath 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/Denny/test/org.guvnor.tools.test.junit/.project
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/.project (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/.project 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.guvnor.tools.test.junit</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: workspace/Denny/test/org.guvnor.tools.test.junit/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/.settings/org.eclipse.jdt.core.prefs 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,12 @@
+#Thu Jun 24 23:14:59 CST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: workspace/Denny/test/org.guvnor.tools.test.junit/META-INF/MANIFEST.MF
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/META-INF/MANIFEST.MF (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/META-INF/MANIFEST.MF 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.guvnor.tools.test.junit
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.guvnor.tools;bundle-version="5.1.0",
+ org.junit;bundle-version="3.8.2",
+ org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.jdt.core;bundle-version="3.5.0",
+ org.eclipse.jdt.launching;bundle-version="3.5.0",
+ org.eclipse.jst.j2ee;bundle-version="1.1.300",
+ org.jboss.tools.tests;bundle-version="3.1.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Added: workspace/Denny/test/org.guvnor.tools.test.junit/build.properties
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/build.properties (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/build.properties 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/.project
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/.project (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/.project 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>guvnorTestProj</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/guvnorMetadata
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/guvnorMetadata (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/guvnorTestProj/guvnorMetadata 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,6 @@
+#Tue Jun 08 19:24:00 CST 2010
+filename=guvnorMetadata
+revision=
+lastmodified=Tue, 08 Jun 2010 11\:24\:00 GMT
+repository=http\://localhost\:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav
+fullpath=http\://localhost\:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav/packages/defaultPackage/aaa
Added: workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/GuvnorJunitTests.java
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/GuvnorJunitTests.java (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/GuvnorJunitTests.java 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,43 @@
+package org.guvnor.tools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.guvnor.tools.utils.GuvnorMetadataUtils;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class GuvnorJunitTests extends TestCase {
+
+ TestProjectProvider provider;
+ IProject project;
+
+ public GuvnorJunitTests() {
+
+ }
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.guvnor.tools.test.junit", "guvnorTestProj", "guvnorTestProj", true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+ public void tearDown() throws Exception{
+
+ }
+
+
+ public void testJBIDE5265() throws Exception{
+ IFile meta = project.getFile("guvnorMetadata");
+ GuvnorMetadataUtils.loadGuvnorMetadata(meta);
+
+ meta.delete(true, null);
+ project.refreshLocal(0, null);
+
+ assertFalse("The metadata file can not be deleted", meta.exists());
+
+ }
+
+}
Added: workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/GuvnorToolsAllTests.java
===================================================================
--- workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/GuvnorToolsAllTests.java (rev 0)
+++ workspace/Denny/test/org.guvnor.tools.test.junit/src/org/guvnor/tools/tests/GuvnorToolsAllTests.java 2010-06-25 10:55:26 UTC (rev 23028)
@@ -0,0 +1,15 @@
+
+package org.guvnor.tools.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class GuvnorToolsAllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test Guvnor Tools");
+ suite.addTestSuite(GuvnorJunitTests.class);
+ return suite;
+ }
+
+}
13 years, 11 months
JBoss Tools SVN: r23026 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editor and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-06-25 06:24:56 -0400 (Fri, 25 Jun 2010)
New Revision: 23026
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewayDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewaySerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForeachParallelGateway.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachInSection.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachVarSection.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java
Log:
GPD-394
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2010-06-25 09:51:32 UTC (rev 23025)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2010-06-25 10:24:56 UTC (rev 23026)
@@ -253,6 +253,16 @@
</node>
</element>
<element
+ class="org.jboss.tools.flow.jpdl4.model.ForeachParallelGateway"
+ figure="icons/16/gateway_parallel.png"
+ id="org.jboss.tools.flow.jpdl4.parallelForEachGateway"
+ label="foreach"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.ParallelGatewayFigure"></figure>
+ </node>
+ </element>
+ <element
class="org.jboss.tools.flow.jpdl4.model.JoinParallelGateway"
figure="icons/16/gateway_parallel.png"
id="org.jboss.tools.flow.jpdl4.parallelJoinGateway"
@@ -691,6 +701,20 @@
tab="org.jboss.tools.jpdl4.general">
<input type="org.jboss.tools.flow.jpdl4.model.PrimitiveObject"/>
</propertySection>
+ <propertySection
+ afterSection="org.jboss.tools.jpdl4.name"
+ class="org.jboss.tools.flow.jpdl4.properties.ForEachVarSection"
+ id="org.jboss.tools.jpdl4.foreachGateway.var"
+ tab="org.jboss.tools.jpdl4.general">
+ <input type="org.jboss.tools.flow.jpdl4.model.ForeachParallelGateway"/>
+ </propertySection>
+ <propertySection
+ afterSection="org.jboss.tools.jpdl4.var"
+ class="org.jboss.tools.flow.jpdl4.properties.ForEachInSection"
+ id="org.jboss.tools.jpdl4.foreachGateway.in"
+ tab="org.jboss.tools.jpdl4.general">
+ <input type="org.jboss.tools.flow.jpdl4.model.ForeachParallelGateway"/>
+ </propertySection>
</propertySections>
</extension>
<extension
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2010-06-25 09:51:32 UTC (rev 23025)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2010-06-25 10:24:56 UTC (rev 23026)
@@ -238,6 +238,15 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
+ "foreach",
+ "Create a new ForEach activity",
+ "org.jboss.tools.flow.jpdl4.parallelForEachGateway",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelForEachGateway"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/gateway_parallel.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/gateway_parallel.png"))
+ );
+ entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
"join",
"Create a new Join",
"org.jboss.tools.flow.jpdl4.parallelJoinGateway",
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewayDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewayDeserializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewayDeserializer.java 2010-06-25 10:24:56 UTC (rev 23026)
@@ -0,0 +1,13 @@
+package org.jboss.tools.flow.jpdl4.io;
+
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.ForeachParallelGateway;
+import org.w3c.dom.Element;
+
+public class ForEachParallelGatewayDeserializer extends NodeDeserializer {
+ public void deserializeAttributes(Wrapper wrapper, Element element) {
+ super.deserializeAttributes(wrapper, element);
+ wrapper.setPropertyValue(ForeachParallelGateway.VAR, element.getAttribute("var"));
+ wrapper.setPropertyValue(ForeachParallelGateway.IN, element.getAttribute("in"));
+ }
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewayDeserializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewaySerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewaySerializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewaySerializer.java 2010-06-25 10:24:56 UTC (rev 23026)
@@ -0,0 +1,26 @@
+package org.jboss.tools.flow.jpdl4.io;
+
+import java.util.List;
+
+import org.jboss.tools.flow.jpdl4.model.ForeachParallelGateway;
+
+
+public class ForEachParallelGatewaySerializer extends ProcessNodeSerializer {
+
+ protected List<String> getAttributesToSave() {
+ List<String> result = super.getAttributesToSave();
+ result.add("var");
+ result.add("in");
+ return result;
+ }
+
+ protected String getPropertyName(String attributeName) {
+ if ("var".equals(attributeName)) {
+ return ForeachParallelGateway.VAR;
+ } else if ("in".equals(attributeName)) {
+ return ForeachParallelGateway.IN;
+ }
+ return super.getPropertyName(attributeName);
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ForEachParallelGatewaySerializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2010-06-25 09:51:32 UTC (rev 23025)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2010-06-25 10:24:56 UTC (rev 23026)
@@ -15,6 +15,7 @@
import org.jboss.tools.flow.jpdl4.model.EventListenerContainer;
import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway;
import org.jboss.tools.flow.jpdl4.model.Field;
+import org.jboss.tools.flow.jpdl4.model.ForeachParallelGateway;
import org.jboss.tools.flow.jpdl4.model.ForkParallelGateway;
import org.jboss.tools.flow.jpdl4.model.HumanTask;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
@@ -93,6 +94,7 @@
else if ("long".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.primitive";
else if ("short".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.primitive";
else if ("true".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.primitive";
+ else if ("foreach".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.parallelForEachGateway";
// no corresponding element
else return null;
}
@@ -164,6 +166,8 @@
return new RuleTaskDeserializer();
} else if (element instanceof QueryTask) {
return new QueryTaskDeserializer();
+ } else if (element instanceof ForeachParallelGateway) {
+ return new ForEachParallelGatewayDeserializer();
} else {
return new NodeDeserializer();
}
@@ -249,6 +253,8 @@
return new ArgumentSerializer();
} else if (element instanceof Field) {
return new FieldSerializer();
+ }else if (element instanceof ForeachParallelGateway) {
+ return new ForEachParallelGatewaySerializer();
}
return null;
}
@@ -286,6 +292,7 @@
else if ("org.jboss.tools.flow.jpdl4.outputParameter".equals(elementId)) return "parameter-out";
else if ("org.jboss.tools.flow.jpdl4.argument".equals(elementId)) return "arg";
else if ("org.jboss.tools.flow.jpdl4.field".equals(elementId)) return "field";
+ else if ("org.jboss.tools.flow.jpdl4.parallelForEachGateway".equals(elementId)) return "foreach";
else return null;
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForeachParallelGateway.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForeachParallelGateway.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForeachParallelGateway.java 2010-06-25 10:24:56 UTC (rev 23026)
@@ -0,0 +1,71 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
+import org.eclipse.ui.views.properties.IPropertySource;
+
+public class ForeachParallelGateway extends ParallelGateway {
+
+ public static final String VAR = "org.jboss.tools.flow.jpdl4.model.forEachParallelGateway.var";
+ public static final String IN = "org.jboss.tools.flow.jpdl4.model.forEachParallelGateway.in";
+
+ private String variableName;
+ private String inCollection;
+
+ public ForeachParallelGateway() {
+ setMetaData("propertySource", new PropertySource());
+ }
+
+
+ public void setVariableName(String variableName) {
+ this.variableName = variableName;
+ }
+ public String getVariableName() {
+ return variableName;
+ }
+ public void setInCollection(String inCollection) {
+ this.inCollection = inCollection;
+ }
+ public String getInCollection() {
+ return inCollection;
+ }
+ private class PropertySource implements IPropertySource {
+
+ public Object getEditableValue() {
+ return null;
+ }
+
+ public IPropertyDescriptor[] getPropertyDescriptors() {
+ return new IPropertyDescriptor[0];
+ }
+
+ public Object getPropertyValue(Object id) {
+ if (VAR.equals(id)) {
+ return getVariableName();
+ } else if (IN.equals(id)) {
+ return getInCollection();
+ }
+ return null;
+ }
+
+ public boolean isPropertySet(Object id) {
+ if (VAR.equals(id)) {
+ return getVariableName() != null;
+ } else if (IN.equals(id)) {
+ return getInCollection() != null;
+ }
+ return false;
+ }
+
+ public void resetPropertyValue(Object id) {
+ }
+
+ public void setPropertyValue(Object id, Object value) {
+ if (VAR.equals(id)) {
+ setVariableName((String)value);
+ } else if (IN.equals(id)) {
+ setInCollection((String)value);
+ }
+ }
+
+ }
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForeachParallelGateway.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachInSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachInSection.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachInSection.java 2010-06-25 10:24:56 UTC (rev 23026)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.jboss.tools.flow.jpdl4.model.ForeachParallelGateway;
+
+public class ForEachInSection extends TextFieldPropertySection {
+
+ public ForEachInSection() {
+ super(ForeachParallelGateway.IN, "Collection");
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachInSection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachVarSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachVarSection.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachVarSection.java 2010-06-25 10:24:56 UTC (rev 23026)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.jboss.tools.flow.jpdl4.model.ForeachParallelGateway;
+
+public class ForEachVarSection extends TextFieldPropertySection {
+
+ public ForEachVarSection() {
+ super(ForeachParallelGateway.VAR, "Variable");
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ForEachVarSection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 11 months
JBoss Tools SVN: r23025 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editpart and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-06-25 05:51:32 -0400 (Fri, 25 Jun 2010)
New Revision: 23025
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/CustomTaskTreeRootEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/CustomTaskClassSection.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JavaTaskTreeRootEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddFieldHandler.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/NodeDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ProcessNodeSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Field.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java
Log:
GPD-380
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2010-06-25 09:51:32 UTC (rev 23025)
@@ -558,6 +558,13 @@
</propertySection>
<propertySection
afterSection="org.jboss.tools.jpdl4.name"
+ class="org.jboss.tools.flow.jpdl4.properties.CustomTaskClassSection"
+ id="org.jboss.tools.jpdl4.customTask.class"
+ tab="org.jboss.tools.jpdl4.general">
+ <input type="org.jboss.tools.flow.jpdl4.model.CustomTask"/>
+ </propertySection>
+ <propertySection
+ afterSection="org.jboss.tools.jpdl4.name"
class="org.jboss.tools.flow.jpdl4.properties.ScriptTaskExpressionSection"
id="org.jboss.tools.jpdl4.scriptTask.expr"
tab="org.jboss.tools.jpdl4.general">
@@ -915,6 +922,9 @@
value="org.jboss.tools.flow.jpdl4.editpart.JavaTaskTreeRootEditPart">
</instanceof>
<instanceof
+ value="org.jboss.tools.flow.jpdl4.editpart.CustomTaskTreeRootEditPart">
+ </instanceof>
+ <instanceof
value="org.jboss.tools.flow.jpdl4.editpart.FieldListTreeEditPart">
</instanceof>
</or>
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/CustomTaskTreeRootEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/CustomTaskTreeRootEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/CustomTaskTreeRootEditPart.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -0,0 +1,28 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.Field;
+
+public class CustomTaskTreeRootEditPart extends TaskTreeRootEditPart {
+ public CustomTaskTreeRootEditPart(Wrapper wrapper) {
+ super(wrapper);
+ }
+
+ protected List<Object> getModelChildren() {
+ List<Object> result = new ArrayList<Object>();
+ addFields(result, (Wrapper)getModel());
+ result.addAll(super.getModelChildren());
+ return result;
+ }
+
+ private void addFields(List<Object> list, Wrapper wrapper) {
+ List<Element> fields = wrapper.getChildren(Field.FIELDS);
+ if (fields != null && !fields.isEmpty()) {
+ list.add(new FieldListTreeEditPart(fields));
+ }
+ }
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/CustomTaskTreeRootEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JavaTaskTreeRootEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JavaTaskTreeRootEditPart.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JavaTaskTreeRootEditPart.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -5,6 +5,7 @@
import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.Field;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
public class JavaTaskTreeRootEditPart extends TaskTreeRootEditPart {
@@ -22,7 +23,7 @@
}
private void addFields(List<Object> list, Wrapper wrapper) {
- List<Element> fields = wrapper.getChildren(JavaTask.FIELDS);
+ List<Element> fields = wrapper.getChildren(Field.FIELDS);
if (fields != null && !fields.isEmpty()) {
list.add(new FieldListTreeEditPart(fields));
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -8,6 +8,7 @@
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
import org.jboss.tools.flow.jpdl4.model.Argument;
+import org.jboss.tools.flow.jpdl4.model.CustomTask;
import org.jboss.tools.flow.jpdl4.model.EventListener;
import org.jboss.tools.flow.jpdl4.model.EventListenerContainer;
import org.jboss.tools.flow.jpdl4.model.Field;
@@ -27,6 +28,7 @@
Element element = ((NodeWrapper)model).getElement();
if (element instanceof SubprocessTask) return new SubprocessTaskTreeRootEditPart((Wrapper)model);
if (element instanceof JavaTask) return new JavaTaskTreeRootEditPart((Wrapper)model);
+ if (element instanceof CustomTask) return new CustomTaskTreeRootEditPart((Wrapper)model);
if (element instanceof QueryTask) return new QueryTaskTreeRootEditPart((Wrapper)model);
return new TaskTreeRootEditPart((NodeWrapper)model);
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddFieldHandler.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddFieldHandler.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddFieldHandler.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -1,6 +1,6 @@
package org.jboss.tools.flow.jpdl4.handler;
-import org.jboss.tools.flow.jpdl4.model.JavaTask;
+import org.jboss.tools.flow.jpdl4.model.Field;
public class AddFieldHandler extends AddChildHandler {
@@ -11,7 +11,7 @@
@Override
protected String getChildType() {
- return JavaTask.FIELDS;
+ return Field.FIELDS;
}
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -72,7 +72,7 @@
} else if (child.getElement() instanceof OutputParameter) {
deleteChildCommand.setType(SubprocessTask.OUTPUT_PARAMETERS);
} else if (child.getElement() instanceof Field) {
- deleteChildCommand.setType(JavaTask.FIELDS);
+ deleteChildCommand.setType(Field.FIELDS);
} else if (child.getElement() instanceof Argument) {
deleteChildCommand.setType(JavaTask.ARGS);
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskDeserializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskDeserializer.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.CustomTask;
+import org.w3c.dom.Element;
+
+class CustomTaskDeserializer extends NodeDeserializer {
+ public void deserializeAttributes(Wrapper wrapper, Element element) {
+ super.deserializeAttributes(wrapper, element);
+ wrapper.setPropertyValue(CustomTask.CLASS, element.getAttribute("class"));
+
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskDeserializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskSerializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskSerializer.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -0,0 +1,23 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import java.util.List;
+
+import org.jboss.tools.flow.jpdl4.model.CustomTask;
+
+class CustomTaskSerializer extends ProcessNodeSerializer {
+ protected List<String> getAttributesToSave() {
+ List<String> result = super.getAttributesToSave();
+ result.add("class");
+ return result;
+ }
+ protected String getPropertyName(String attributeName) {
+ if ("class".equals(attributeName)) {
+ return CustomTask.CLASS;
+ }
+ return super.getPropertyName(attributeName);
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/CustomTaskSerializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskDeserializer.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskDeserializer.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -5,7 +5,6 @@
import org.jboss.tools.flow.common.wrapper.Wrapper;
import org.jboss.tools.flow.jpdl4.model.Argument;
-import org.jboss.tools.flow.jpdl4.model.Field;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -23,9 +22,7 @@
if (result == null) return result;
if (result.getElement() instanceof Argument) {
parent.addChild(JavaTask.ARGS, result);
- } else if (result.getElement() instanceof Field) {
- parent.addChild(JavaTask.FIELDS, result);
- }
+ }
return result;
}
}
\ No newline at end of file
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskSerializer.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskSerializer.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -31,14 +31,7 @@
return super.getPropertyName(attributeName);
}
public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
- List<Element> fields = wrapper.getChildren(JavaTask.FIELDS);
- if (fields != null) {
- for (Element field : fields) {
- if (field instanceof Wrapper) {
- JpdlSerializer.serialize((Wrapper)field, buffer, level+1);
- }
- }
- }
+
List<Element> arguments = wrapper.getChildren(JavaTask.ARGS);
if (arguments != null) {
for (Element argument : arguments) {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/NodeDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/NodeDeserializer.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/NodeDeserializer.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -12,6 +12,7 @@
import org.jboss.tools.flow.common.wrapper.Wrapper;
import org.jboss.tools.flow.jpdl4.Logger;
import org.jboss.tools.flow.jpdl4.model.EventListenerContainer;
+import org.jboss.tools.flow.jpdl4.model.Field;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -64,7 +65,10 @@
flows.add((ConnectionWrapper)result);
} else if (result.getElement() instanceof EventListenerContainer) {
parent.addChild("eventListener", result);
+ } else if (result.getElement() instanceof Field) {
+ parent.addChild(Field.FIELDS, result);
}
+
}
}
return result;
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ProcessNodeSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ProcessNodeSerializer.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ProcessNodeSerializer.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -11,6 +11,7 @@
import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.Field;
import org.jboss.tools.flow.jpdl4.model.ProcessNode;
class ProcessNodeSerializer extends AbstractElementSerializer {
@@ -59,6 +60,14 @@
}
}
}
+ List<Element> fields = wrapper.getChildren(Field.FIELDS);
+ if (fields != null) {
+ for (Element field : fields) {
+ if (field instanceof Wrapper) {
+ JpdlSerializer.serialize((Wrapper)field, buffer, level+1);
+ }
+ }
+ }
List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections();
for (ConnectionWrapper connectionWrapper : children) {
JpdlSerializer.serialize(connectionWrapper, buffer, level+1);
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -154,6 +154,8 @@
return new TerminateEndEventDeserializer();
} else if (element instanceof JavaTask) {
return new JavaTaskDeserializer();
+ } else if (element instanceof CustomTask) {
+ return new CustomTaskDeserializer();
} else if (element instanceof ScriptTask) {
return new ScriptTaskDeserializer();
} else if (element instanceof JmsTask) {
@@ -205,6 +207,8 @@
return new ProcessNodeSerializer();
} else if (element instanceof JavaTask) {
return new JavaTaskSerializer();
+ } else if (element instanceof CustomTask) {
+ return new CustomTaskSerializer();
} else if (element instanceof ScriptTask) {
return new ScriptTaskSerializer();
} else if (element instanceof JmsTask) {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -1,10 +1,79 @@
package org.jboss.tools.flow.jpdl4.model;
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
+import org.eclipse.ui.views.properties.IPropertySource;
+
+
public class CustomTask extends Task {
+ public static final String CLASS = "org.jboss.tools.flow.jpdl4.model.customTask.class";
+
+ private String className;
+
+ private List<Field> fields = new ArrayList<Field>();
+
+ public CustomTask() {
+ setMetaData("propertySource", new PropertySource());
+ }
+
protected boolean isPropagationExclusive() {
return true;
}
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
+ }
+
+ public void setFields(List<Field> fields) {
+ this.fields = fields;
+ }
+
+ public List<Field> getFields() {
+ return fields;
+ }
+ private class PropertySource implements IPropertySource {
+
+ public Object getEditableValue() {
+ return null;
+ }
+
+ public IPropertyDescriptor[] getPropertyDescriptors() {
+ return new IPropertyDescriptor[0];
+ }
+
+ public Object getPropertyValue(Object id) {
+ if (CLASS.equals(id)) {
+ return getClassName();
+ } else if (Field.FIELDS.equals(id)) {
+ return fields;
+ }
+ return null;
+ }
+
+ public boolean isPropertySet(Object id) {
+ if (CLASS.equals(id)) {
+ return getClassName() != null;
+ } else if (Field.FIELDS.equals(id)) {
+ return true;
+ }
+ return false;
+ }
+
+ public void resetPropertyValue(Object id) {
+ }
+
+ public void setPropertyValue(Object id, Object value) {
+ if (CLASS.equals(id)) {
+ setClassName((String)value);
+ }
+ }
+
+ }
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Field.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Field.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Field.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -8,6 +8,7 @@
public static final String NAME = "org.jboss.tools.flow.jpdl4.model.field.name";
public static final String VALUE = "org.jboss.tools.flow.jpdl4.model.field.value";
+ public static final String FIELDS = "org.jboss.tools.flow.jpdl4.model.fields";
private String value = "<string value=\"aValue\"/>";
private String name;
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java 2010-06-25 09:44:43 UTC (rev 23024)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -13,7 +13,6 @@
public static final String METHOD = "org.jboss.tools.flow.jpdl4.model.javaTask.method";
public static final String VAR = "org.jboss.tools.flow.jpdl4.model.javaTask.var";
public static final String EXPR = "org.jboss.tools.flow.jpdl4.model.javaTask.expression";
- public static final String FIELDS = "org.jboss.tools.flow.jpdl4.model.javaTask.fields";
public static final String ARGS = "org.jboss.tools.flow.jpdl4.model.javaTask.args";
private String className;
@@ -82,7 +81,7 @@
return getVariableName();
} else if (EXPR.equals(id)) {
return getExpression();
- } else if (FIELDS.equals(id)) {
+ } else if (Field.FIELDS.equals(id)) {
return fields;
} else if (ARGS.equals(id)) {
return arguments;
@@ -99,7 +98,7 @@
return getVariableName() != null;
} else if (EXPR.equals(id)) {
return getExpression() != null;
- } else if (FIELDS.equals(id)) {
+ } else if (Field.FIELDS.equals(id)) {
return true;
} else if (ARGS.equals(id)) {
return true;
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/CustomTaskClassSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/CustomTaskClassSection.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/CustomTaskClassSection.java 2010-06-25 09:51:32 UTC (rev 23025)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.jboss.tools.flow.jpdl4.model.CustomTask;
+
+public class CustomTaskClassSection extends TextFieldPropertySection {
+
+ public CustomTaskClassSection() {
+ super(CustomTask.CLASS, "Class");
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/CustomTaskClassSection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 11 months
JBoss Tools SVN: r23024 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-06-25 05:44:43 -0400 (Fri, 25 Jun 2010)
New Revision: 23024
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
https://jira.jboss.org/browse/JBIDE-6439
- VpeDND refactoring
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-06-25 08:52:32 UTC (rev 23023)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-06-25 09:44:43 UTC (rev 23024)
@@ -35,8 +35,6 @@
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.VpeSourceDropInfo;
import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo;
-import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
-import org.jboss.tools.vpe.editor.VpeVisualInnerDragInfo;
import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.jboss.tools.vpe.editor.mozilla.MozillaEditor;
@@ -66,6 +64,7 @@
import org.mozilla.interfaces.nsITransferable;
import org.mozilla.xpcom.Mozilla;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -100,12 +99,6 @@
private VpeController vpeController;
- /* TODO: yradtsevich: sourceInnerDragInfo is a state variable
- * that not always reflects actual state of the object
- * (e.g. during external Drag&Drop and text Drag&Drop).
- * It has to be removed from the class and corresponding
- * methods has to be refactored. */
- private VpeSourceInnerDragInfo sourceInnerDragInfo = null;
private DraggablePattern draggablePattern;
private DropableArea dropableArea;
@@ -115,8 +108,7 @@
}
public void dragStart(nsIDOMEvent domEvent) {
- nsIDOMElement selectedElement = vpeController.getXulRunnerEditor()
- .getLastSelectedElement();
+ nsIDOMElement selectedElement = getSelectedElement();
// start drag sessionvpe-element
if (isTextSelected(getVisualSelection()) || isDraggable(selectedElement)) {
Point pageCoords = getPageCoords(domEvent);
@@ -126,9 +118,13 @@
domEvent.preventDefault();
}
}
+
+ private nsIDOMElement getSelectedElement() {
+ return vpeController.getXulRunnerEditor().getLastSelectedElement();
+ }
/**
- * Calls when drag over event ocure
+ * Called when drag over event occurs
* @param event
*/
public void dragOver(nsIDOMEvent event) {
@@ -140,7 +136,7 @@
final DropResolver dropResolver;
if (isInnerDragSession()) {
if (isTextSelected(getVisualSelection())) {
- dropResolver = getDropResolverForNode(vpeController.getDomMapping().getNearSourceNode(getVisualSelection().getFocusNode()));
+ dropResolver = getDropResolverForNode(getSourceNode(getVisualSelection().getFocusNode()));
} else {
dropResolver = getDropResolverForInternalDrop();
}
@@ -214,8 +210,7 @@
draggablePattern.showDragIcon(new DraggableTextSelection(
textContainer, range.getStartOffset(), range.getEndOffset()));
} else {
- nsIDOMElement selectedElement = vpeController.getXulRunnerEditor()
- .getLastSelectedElement();
+ nsIDOMElement selectedElement = getSelectedElement();
if (isDraggable(selectedElement)) {
draggablePattern.showDragIcon(new DraggableElement(selectedElement));
@@ -283,7 +278,11 @@
}
private DropResolver getDropResolverForInternalDrop() {
- return getDropResolverForNode(sourceInnerDragInfo.getNode());
+ if (InnerDragBuffer.object instanceof Node) {
+ return getDropResolverForNode((Node) InnerDragBuffer.object);
+ } else {
+ return getSimpleDropResolver(false);
+ }
}
private DropResolver getSimpleDropResolver(final boolean canDrop) {
@@ -323,8 +322,7 @@
return;
}
- Node originalSourceNode = vpeController.getDomMapping()
- .getNearSourceNode(originalVisualNode);
+ Node originalSourceNode = getSourceNode(originalVisualNode);
if (originalSourceNode != null
&& originalSourceNode.getNodeType() == Node.TEXT_NODE) {
@@ -397,12 +395,13 @@
* Starts drag session
* @param dragetElement
*/
- private void startDragSession(nsIDOMNode node) {
+ private void startDragSession(nsIDOMElement element) {
+ rememberDragNode((Element) getSourceNode(element));
nsISupportsArray transArray = (nsISupportsArray) getComponentManager()
.createInstanceByContractID(XPCOM.NS_SUPPORTSARRAY_CONTRACTID, null,
nsISupportsArray.NS_ISUPPORTSARRAY_IID);
transArray.appendElement(createTransferable());
- getDragService().invokeDragSession(node, transArray, null,
+ getDragService().invokeDragSession(element, transArray, null,
nsIDragService.DRAGDROP_ACTION_MOVE
| nsIDragService.DRAGDROP_ACTION_COPY
| nsIDragService.DRAGDROP_ACTION_LINK);
@@ -467,52 +466,36 @@
return getDragService().getCurrentSession().getSourceDocument() != null;
}
+ private void rememberDragNode(Node node) {
+ InnerDragBuffer.object = node;
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ InnerDragBuffer.object = null;
+ }
+ });
+ }
+
private boolean isDraggable(nsIDOMElement element) {
vpeController.onHideTooltip();
if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) {
System.out.print("<<<<<< canInnerDrag"); //$NON-NLS-1$
}
- if (sourceInnerDragInfo != null) {
- sourceInnerDragInfo = null;
- }
+
boolean canDrag = false;
- VpeVisualInnerDragInfo dragInfo = getInnerDragInfo(element);
- if (dragInfo != null) {
- nsIDOMNode dragNode = dragInfo.getNode();
+
+ if (element != null) {
if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) {
- System.out
- .print(" dragNode: " + dragNode.getNodeName() + "(" + dragNode + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ System.out.print(" dragNode: " + element.getNodeName() + "(" + element + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
- switch (dragNode.getNodeType()) {
- case nsIDOMNode.ELEMENT_NODE: {
- canDrag = vpeController.getVisualBuilder().canInnerDrag(queryInterface(dragNode, nsIDOMElement.class));
- break;
- }
- case nsIDOMNode.TEXT_NODE: {
- vpeController.getVisualBuilder();
- canDrag = VpeVisualDomBuilder.isTextEditable(dragNode);
- break;
- }
- }
+
+ canDrag = vpeController.getVisualBuilder().canInnerDrag(element);
if (canDrag) {
- sourceInnerDragInfo = vpeController.getVisualBuilder()
- .getSourceInnerDragInfo(dragInfo);
- if (sourceInnerDragInfo.getNode() != null) {
- InnerDragBuffer.object = sourceInnerDragInfo.getNode();
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- InnerDragBuffer.object = null;
- }
- });
- } else {
- sourceInnerDragInfo = null;
+ Node sourceNode = getSourceNode(element);
+ if (sourceNode == null) {
canDrag = false;
}
}
- if (!canDrag) {
- dragInfo.release();
- }
}
if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) {
System.out.println(" canDrag: " + canDrag); //$NON-NLS-1$
@@ -520,6 +503,10 @@
return canDrag;
}
+ private Node getSourceNode(nsIDOMNode visualNode) {
+ return vpeController.getDomMapping().getNearSourceNode(visualNode);
+ }
+
private void innerDrop(nsIDOMMouseEvent event) {
vpeController.onHideTooltip();
@@ -527,8 +514,6 @@
System.out.print("<<<<<< innerDrop"); //$NON-NLS-1$
}
- /* TODO: yradtsevich: the code needs to be refactored.
- * See TODO comment for sourceInnerDragInfo */
if (isTextSelected(getVisualSelection())) {
// it is inner Drag&Drop of text
StyledText textWidget = vpeController.getSourceEditor()
@@ -539,7 +524,8 @@
textWidget.replaceTextRange(selectionRange.x, selectionRange.y, ""); //$NON-NLS-1$
dropAny(DndUtil.kUnicodeMime, text);
- } else if (sourceInnerDragInfo != null) {
+ } else if (InnerDragBuffer.object != null
+ && InnerDragBuffer.object instanceof Node) {
VpeSourceDropInfo sourceDropInfo = getDropInfo();
if (sourceDropInfo.getContainer() != null) {
if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) {
@@ -554,16 +540,14 @@
if (sourceDropInfo.canDrop()) {
VpeDnDHelper dropper = new VpeDnDHelper();
dropper.setDndData(false, true);
- Node node = sourceInnerDragInfo.getNode();
+ Node node = (Node) InnerDragBuffer.object;
dropper.drop(vpeController.getPageContext(),
- sourceInnerDragInfo, sourceDropInfo);
+ new VpeSourceInnerDragInfo(node, 0, 0), sourceDropInfo);
// select dropped node, JBIDE-6239
setSelectedNode(node);
- if (sourceInnerDragInfo != null) {
- sourceInnerDragInfo = null;
- }
+ InnerDragBuffer.object = null;
}
}
}
@@ -696,14 +680,6 @@
}
return dragService;
}
-
- private VpeVisualInnerDragInfo getInnerDragInfo(nsIDOMElement element) {
- if (element == null) {
- return null;
- } else {
- return new VpeVisualInnerDragInfo(element);
- }
- }
private VpeSourceDropInfo getDropInfo() {
Node dropContainer = null;
@@ -713,8 +689,7 @@
&& dropableArea.getHighlightedDropTarget() != null) {
canDrop = true;
DropTarget dropTarget = dropableArea.getHighlightedDropTarget();
- Node targetNode = vpeController.getDomMapping()
- .getNearSourceNode(dropableArea.getNode());
+ Node targetNode = getSourceNode(dropableArea.getNode());
if (dropTarget == DropTarget.BEFORE || dropTarget == DropTarget.AFTER) {
dropContainer = targetNode.getParentNode();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-06-25 08:52:32 UTC (rev 23023)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-06-25 09:44:43 UTC (rev 23024)
@@ -1844,50 +1844,6 @@
return originalNode;
}
- public VpeSourceInnerDragInfo getSourceInnerDragInfo(
- VpeVisualInnerDragInfo visualDragInfo) {
- nsIDOMNode visualNode = visualDragInfo.getNode();
- int offset = visualDragInfo.getOffset();
- int length = visualDragInfo.getLength();
-
- VpeNodeMapping nodeMapping = domMapping.getNearNodeMapping(visualNode);
- Node sourceNode = nodeMapping.getSourceNode();
-
- if (sourceNode != null) {
- switch (sourceNode.getNodeType()) {
- case Node.TEXT_NODE:
- int end = TextUtil.sourceInnerPosition(visualNode
- .getNodeValue(), offset + length);
- offset = TextUtil.sourceInnerPosition(
- visualNode.getNodeValue(), offset);
- length = end - offset;
- break;
- case Node.ELEMENT_NODE:
- if (visualNode.getNodeType() == Node.TEXT_NODE) {
- // it's attribute
- sourceNode = null;
- if (isTextEditable(visualNode)) {
- String[] atributeNames = ((VpeElementMapping) nodeMapping)
- .getTemplate().getOutputAttributeNames();
- if (atributeNames != null && atributeNames.length > 0) {
- Element sourceElement = (Element) nodeMapping
- .getSourceNode();
- sourceNode = sourceElement
- .getAttributeNode(atributeNames[0]);
- end = TextUtil.sourceInnerPosition(visualNode
- .getNodeValue(), offset + length);
- offset = TextUtil.sourceInnerPosition(visualNode
- .getNodeValue(), offset);
- length = end - offset;
- }
- }
- }
- break;
- }
- }
- return new VpeSourceInnerDragInfo(sourceNode, offset, length);
- }
-
public nsIDOMText getOutputTextNode(Attr attr) {
Element sourceElement = ((Attr) attr).getOwnerElement();
VpeElementMapping elementMapping = domMapping
13 years, 11 months
JBoss Tools SVN: r23023 - trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-25 04:52:32 -0400 (Fri, 25 Jun 2010)
New Revision: 23023
Modified:
trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6536
Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2010-06-25 07:27:57 UTC (rev 23022)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2010-06-25 08:52:32 UTC (rev 23023)
@@ -66,9 +66,11 @@
}
protected XModelObject getComponents22Object() {
- if(project == null) return null;
+ assertNotNull(getTestProject());
IFile f = project.getFile(new Path("components22.xml"));
- return f == null ? null : EclipseResourceUtil.createObjectForResource(f);
+ assertNotNull(f);
+ assertTrue(f.exists());
+ return EclipseResourceUtil.createObjectForResource(f);
}
13 years, 11 months
JBoss Tools SVN: r23022 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-06-25 03:27:57 -0400 (Fri, 25 Jun 2010)
New Revision: 23022
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF
trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml
Log:
Added new tests to run.
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF 2010-06-25 00:03:01 UTC (rev 23021)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF 2010-06-25 07:27:57 UTC (rev 23022)
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.hibernate.jpt.core.test
Bundle-Version: 3.3.0.qualifier
-Require-Bundle: org.junit;bundle-version="3.8.2",
+Require-Bundle: org.junit;bundle-version="4.0.0",
org.eclipse.wst.common.project.facet.ui;bundle-version="1.3.0",
org.eclipse.jpt.core;bundle-version="2.0.0",
org.eclipse.wst.common.frameworks,
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml 2010-06-25 00:03:01 UTC (rev 23021)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml 2010-06-25 07:27:57 UTC (rev 23022)
@@ -10,5 +10,5 @@
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.hibernate.jpt.core.test</artifactId>
<version>3.3.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
+ <packaging>eclipse-test-plugin</packaging>
</project>
13 years, 11 months