JBoss Tools SVN: r12800 - in trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test: src and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-12-22 02:19:22 -0500 (Mon, 22 Dec 2008)
New Revision: 12800
Added:
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/JBPMConvertAllTests.java
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java
Log:
JBIDE-3449:fix the junit tests failed for bpmn -> jpdl
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/JBPMConvertAllTests.java
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/JBPMConvertAllTests.java (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/JBPMConvertAllTests.java 2008-12-22 07:19:22 UTC (rev 12800)
@@ -0,0 +1,14 @@
+package org.jboss.tools.jbpm.convert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.tools.jbpm.convert.test.BpmnConvertTest;
+
+
+public class JBPMConvertAllTests {
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTestSuite(BpmnConvertTest.class);
+ return suite;
+ }
+}
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java 2008-12-22 07:19:22 UTC (rev 12800)
@@ -0,0 +1,199 @@
+package org.jboss.tools.jbpm.convert.test;
+
+import junit.framework.TestCase;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+import org.dom4j.Document;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.jbpm.convert.b2j.translate.*;
+import org.jboss.tools.jbpm.convert.bpmnto.util.BPMNToUtil;
+
+public class BpmnConvertTest extends TestCase {
+
+ public void testConvert() throws IOException {
+ String absolutePath = "";
+ if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) {
+ absolutePath = Platform.getBundle(
+ "org.jboss.tools.jbpm.convert.test").getLocation()
+ .substring(16);
+ } else {
+ absolutePath = Platform.getBundle(
+ "org.jboss.tools.jbpm.convert.test").getLocation()
+ .substring(15);
+ }
+ String bpmnfilePath = absolutePath + "testfile";
+ String expectedPath = absolutePath + "resultfile";
+ File[] bpmnFiles = listAll(bpmnfilePath);
+
+ BPMN2JPDL jpdltranformer = null;
+ GraphicalFileGenerator gpdtranformer = null;
+ String str1 = "";
+ int count = 0;
+ for (int i = 0; i < bpmnFiles.length; i++) {
+ String name = bpmnFiles[i].getName();
+ String path = bpmnFiles[i].getParentFile().getAbsolutePath();
+ Document bpmnDocument = null;
+ Document bpmnDiagramDocument = null;
+ try {
+ bpmnDocument = getDocument(path, name);
+ bpmnDiagramDocument = getDocument(path, TranslateHelper
+ .getBpmnDiagramName(name));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ String tmpLocation = getTempDir().getAbsolutePath();
+
+ jpdltranformer = new BPMN2JPDL(name, path, bpmnDocument);
+ jpdltranformer.translateToFiles(tmpLocation);
+
+ gpdtranformer = new GraphicalFileGenerator(bpmnDiagramDocument,
+ jpdltranformer.getMap(), path, name);
+ gpdtranformer.translateToFiles(tmpLocation);
+
+ try {
+ if (!compareWithExpectedResult(tmpLocation + File.separator
+ + "jpdl" + File.separator + name, expectedPath
+ + File.separator + name)) {
+ System.out.println("the testing bpmn named /" + name
+ + " tranformation is failure");
+ assertEquals(true, false);
+
+ } else {
+ count++;
+ assertEquals(true, true);
+ }
+ } catch (Exception e) {
+ System.out.println("the testing bpmn named /" + str1
+ + " has error");
+ e.printStackTrace();
+ assertEquals(true, false);
+ return;
+ }
+ }
+
+ System.out.println("the test is over!!! " + count
+ + " files have been examined.");
+ }
+
+ private boolean compareWithExpectedResult(String tmpLocation,
+ String expectedPath) throws IOException {
+ boolean isTrue = true;
+
+ File tmp = new File(tmpLocation);
+ File expectedFile = new File(expectedPath);
+
+ isTrue = compareFile(tmp, expectedFile);
+
+ if (!isTrue) {
+ return isTrue;
+ }
+ return isTrue;
+ }
+
+ private boolean compareFile(File result, File expectedFile)
+ throws IOException {
+ boolean isTrue = true;
+ if (result.isFile()) {
+ isTrue = compareInputSteam(getInputStream(expectedFile),
+ getInputStream(result));
+ }
+ if (!isTrue) {
+ return isTrue;
+ }
+ if (result.isDirectory()) {
+ for (int i = 0; i < result.listFiles().length; i++) {
+ String name = result.listFiles()[i].getName();
+ File tmp = new File(expectedFile, name);
+ isTrue = compareFile(result.listFiles()[i], tmp);
+ if (!isTrue) {
+ return isTrue;
+ }
+ }
+ }
+ return isTrue;
+ }
+
+ private boolean compareInputSteam(InputStream expected, InputStream result)
+ throws IOException {
+
+ String expectedStr = "";
+ String resultStr = "";
+
+ while (true) {
+ int i = expected.read();
+ int j = result.read();
+ expectedStr += (char) i;
+ resultStr += (char) j;
+ if (i != j) {
+ System.err.println(expectedStr);
+ System.out.println();
+ return false;
+ }
+ if (i == -1)
+ return true;
+ }
+ }
+
+ private InputStream getInputStream(File file) throws FileNotFoundException {
+ InputStream stream = null;
+ stream = new FileInputStream(file);
+ return stream;
+ }
+
+ // return the file array of the directory
+ public static File[] listAll(String filename) {
+ File file = new File(filename);
+ ArrayList<File> list = new ArrayList<File>();
+ File[] files;
+ if (!file.exists() || file.isFile()) {
+ return new File[0];
+ }
+ list(list, file);
+ list.remove(file);
+ files = new File[list.size()];
+ list.toArray(files);
+ return files;
+ }
+
+ // add the file to the file array
+ private static void list(ArrayList<File> list, File file) {
+ if (file.getName().endsWith("bpmn")) {
+ list.add(file);
+ }
+ if (file.isFile()) {
+ return;
+ }
+
+ if (file.isDirectory()) {
+ File files[] = file.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ list(list, files[i]);
+ }
+ }
+ }
+
+ /*
+ * get the dom document from a given path and file name
+ */
+ public Document getDocument(String bpmnFileParentPath, String bpmnFileName)
+ throws Exception {
+ Document bpmnDocument = null;
+ bpmnDocument = BPMNToUtil.parse(bpmnFileParentPath, bpmnFileName);
+ return bpmnDocument;
+ }
+
+ public File getTempDir() {
+ File tempdir = new File(System.getProperty("java.io.tmpdir"));
+ File tmpdir = new File(tempdir, "tmp" + System.currentTimeMillis());
+ if (tmpdir.exists()) {
+ System.out.println("This dir is exist");
+ }
+ tmpdir.mkdirs();
+ return tmpdir;
+ }
+}
\ No newline at end of file
15 years, 3 months
JBoss Tools SVN: r12799 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-12-22 02:05:00 -0500 (Mon, 22 Dec 2008)
New Revision: 12799
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
Log:
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-22 06:52:10 UTC (rev 12798)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-22 07:05:00 UTC (rev 12799)
@@ -478,18 +478,22 @@
protected void createErrorMessageLinkGUI(FormToolkit toolkit,
Composite parent) {
- problemSection = this.createPageSectionHeader(parent, Section.TITLE_BAR
- | Section.DESCRIPTION, "Problems", "No problems");
-
+ problemSection = this
+ .createPageSectionHeader(parent, Section.TITLE_BAR
+ | Section.EXPANDED, "Problems",
+ "No problems");
designTimeAnalyzeResultRegion = toolkit.createComposite(problemSection);
- GridData gd = new GridData(GridData.FILL_BOTH);
GridLayout ngl = new GridLayout();
ngl.numColumns = 2;
ngl.marginWidth = 0;
problemSection.setLayout(new FillLayout());
- designTimeAnalyzeResultRegion.setLayoutData(gd);
designTimeAnalyzeResultRegion.setLayout(ngl);
problemSection.setClient(designTimeAnalyzeResultRegion);
+
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.exclude = true;
+ problemSection.setLayoutData(gd);
+ problemSection.setVisible(false);
}
public void refreshAllGUI() {
@@ -1521,12 +1525,13 @@
designTimeAnalyzeResultRegion, SWT.NONE);
GridLayout gl = new GridLayout();
gl.numColumns = 2;
+ gl.makeColumnsEqualWidth = false;
gl.marginHeight = 0;
gl.marginWidth = 0;
fixComposite.setLayout(gl);
Label notifyLabel = new Label(fixComposite, SWT.NONE);
Hyperlink fixLink = getManagedForm().getToolkit()
- .createHyperlink(fixComposite, "Fix it", SWT.NONE);
+ .createHyperlink(fixComposite, "(Fix it)", SWT.NONE);
final Menu menu = new Menu(getSite().getShell(), SWT.POP_UP);
List<ResolveCommand> list = result.getResolveProblem();
for (Iterator<ResolveCommand> iterator2 = list.iterator(); iterator2
@@ -1572,7 +1577,7 @@
});
notifyLabel.setMenu(menu);
- GridData nlgd = new GridData(GridData.FILL_HORIZONTAL);
+ GridData nlgd = new GridData();
notifyLabel.setLayoutData(nlgd);
nlgd = new GridData(GridData.FILL_HORIZONTAL);
fixComposite.setLayoutData(nlgd);
@@ -1587,12 +1592,19 @@
try {
// designTimeAnalyzeResultRegion.setLayoutData(gd);
if (hasProblems) {
- problemSection
- .setDescription("Click \"Fix\" link to fix those errors");
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ problemSection.setVisible(true);
+ problemSection.setLayoutData(gd);
} else {
- problemSection.setDescription("No problems");
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.exclude = true;
+ problemSection.setLayoutData(gd);
+ gd.heightHint = 0;
+ problemSection.setVisible(false);
}
designTimeAnalyzeResultRegion.getParent().getParent().layout();
+ } catch (Exception e) {
+ e.printStackTrace();
} finally {
}
}
@@ -1633,7 +1645,12 @@
c = null;
}
updateErrorMessage();
- designTimeAnalyzeResultRegion.layout(true);
+ try {
+ designTimeAnalyzeResultRegion.layout(true);
+ } catch (Exception e) {
+ // ignore
+ e.printStackTrace();
+ }
}
/**
15 years, 3 months
JBoss Tools SVN: r12798 - in trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test: META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-12-22 01:52:10 -0500 (Mon, 22 Dec 2008)
New Revision: 12798
Removed:
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml
Log:
JBIDE-3449:fix the junit tests failed for bpmn -> jpdl
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF 2008-12-22 06:40:52 UTC (rev 12797)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF 2008-12-22 06:52:10 UTC (rev 12798)
@@ -14,4 +14,4 @@
org.eclipse.emf.ecore.xmi.impl,
org.osgi.framework
Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %BundleProvider
\ No newline at end of file
+Bundle-Vendor: %BundleProvider
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml 2008-12-22 06:40:52 UTC (rev 12797)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml 2008-12-22 06:52:10 UTC (rev 12798)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process-diagram name="Policy Pricing" width="1500" height="214">
- <node width="100" height="40" name="Price Policy" x="144" y="0"> <transition name="au_gen_3"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="Review Pricing" x="555" y="141"> <transition name="au_gen_4"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="au_gen_1" x="832" y="80"/> <node width="100" height="40" name=" Price Calculated ?" x="373" y="16"> <transition name="false"> <label x="5" y="-10"/> </transition> <transition name="true"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="au_gen" x="16" y="80"> <transition name="au_gen_2"> <label x="5" y="-10"/> </transition> </node></process-diagram>
+<root-container name="Policy Pricing" width="1500" height="214">
+ <node width="100" height="40" name="Price Policy" x="144" y="0"> <edge name="to_nodename_3"> <label x="5" y="-10"/> </edge> </node> <node width="100" height="40" name="Review Pricing" x="555" y="141"> <edge name="to_nodename_4"> <label x="5" y="-10"/> </edge> </node> <node width="100" height="40" name=" Price Calculated ?" x="373" y="16"> <edge name="false"> <label x="5" y="-10"/> </edge> <edge name="true"> <label x="5" y="-10"/> </edge> </node> <node width="100" height="40" name="to_nodename" x="16" y="80"> <edge name="to_nodename_2"> <label x="5" y="-10"/> </edge> </node> <node width="100" height="40" name="to_nodename_1" x="832" y="80"/></root-container>
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml 2008-12-22 06:40:52 UTC (rev 12797)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml 2008-12-22 06:52:10 UTC (rev 12798)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="Policy Pricing">
- <node name="Price Policy"> <transition name="au_gen_3" to=" Price Calculated ?"/> </node> <start-state name="au_gen"> <transition name="au_gen_2" to="Price Policy"/> </start-state> <decision name=" Price Calculated ?"> <transition name="false" to="au_gen_1"/> <transition name="true" to="Review Pricing"/> </decision> <node name="Review Pricing"> <transition name="au_gen_4" to="au_gen_1"/> </node> <end-state name="au_gen_1"/></process-definition>
+ <node name="Price Policy"> <edge name="to_nodename_3" to=" Price Calculated ?"/> </node> <start-state name="to_nodename"> <edge name="to_nodename_2" to="Price Policy"/> </start-state> <decision name=" Price Calculated ?"> <edge name="false" to="to_nodename_1"/> <edge name="true" to="Review Pricing"/> </decision> <node name="Review Pricing"> <edge name="to_nodename_4" to="to_nodename_1"/> </node> <end-state name="to_nodename_1"/></process-definition>
15 years, 3 months
JBoss Tools SVN: r12797 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-12-22 01:40:52 -0500 (Mon, 22 Dec 2008)
New Revision: 12797
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties
Log:
JBIDE-3448:change the generate jpdl files from old version to new version during bpmn -> jpdl
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties 2008-12-22 06:21:22 UTC (rev 12796)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties 2008-12-22 06:40:52 UTC (rev 12797)
@@ -56,7 +56,7 @@
Jpdl_Process_Definition_Name=processdefinition.xml
Jpdl_32_Namespace_Url=urn:jbpm.org:jpdl-3.2
Jpdl_Process_Definition_Element_Name=process-definition
-Jpdl_Transition_Element=transition
+Jpdl_Transition_Element=edge
Jpdl_ProcessState_Element_Name=process-state
Jpdl_SubProcess_Element_Name=sub-process
Jpdl_Decision_Element_Name=decision
@@ -69,7 +69,7 @@
Gpd_Definition_Name=gpd.xml
Gpd_Layout_Element_Name=layoutConstraint
Gpd_Element_Name=element
-Gpd_Process_Diagram_Name=process-diagram
+Gpd_Process_Diagram_Name=root-container
Gpd_Label_Element_Name=label
Translate_Error_GpdFile_CanNotGenerate=Errror: Couldn't write gpd.xml:
Translate_Error_GpdFile_CanNotWrite=Errror\: Couldn't write gpd definition to a gpd.xml\:
15 years, 3 months
JBoss Tools SVN: r12796 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-12-22 01:21:22 -0500 (Mon, 22 Dec 2008)
New Revision: 12796
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java
Log:
JBIDE-3447:change the default value of jpdl node name during bpmn -> jpdl
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java 2008-12-20 19:53:55 UTC (rev 12795)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java 2008-12-22 06:21:22 UTC (rev 12796)
@@ -126,7 +126,7 @@
String name = graph.attributeValue(B2JMessages.Dom_Element_Name);
if (name == null || "".equals(name)) {
- name = "au_gen";
+ name = "to_nodename";
isOk = false;
}
Integer i = nameMap.get(name);
15 years, 3 months
JBoss Tools SVN: r12795 - in workspace/update: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-20 14:53:55 -0500 (Sat, 20 Dec 2008)
New Revision: 12795
Added:
workspace/update/artifacts.jar
workspace/update/content.jar
workspace/update/features/
workspace/update/features/org.jboss.tools.hellosara.feature_1.0.0.jar
workspace/update/plugins/
workspace/update/plugins/org.jboss.tools.hellosara_1.0.0.jar
Modified:
workspace/update/associateSites.xml
Log:
Added: workspace/update/artifacts.jar
===================================================================
(Binary files differ)
Property changes on: workspace/update/artifacts.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: workspace/update/associateSites.xml
===================================================================
--- workspace/update/associateSites.xml 2008-12-20 19:46:22 UTC (rev 12794)
+++ workspace/update/associateSites.xml 2008-12-20 19:53:55 UTC (rev 12795)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<associateSites>
- <associateSite label="AJDT"
- url="http://download.eclipse.org/tools/ajdt/34/update/" />
- <associateSite label="Mylyn"
- url="http://download.eclipse.org/tools/mylyn/update/e3.4/" />
- <associateSite label="BIRT 2.3 Update Site"
- url="http://download.eclipse.org/birt/update-site/2.3/" />
-</associateSites>
+<?xml version="1.0" encoding="UTF-8"?>
+<associateSites>
+ <associateSite label="AJDT"
+ url="http://download.eclipse.org/tools/ajdt/34/update/" />
+ <associateSite label="Mylyn"
+ url="http://download.eclipse.org/tools/mylyn/update/e3.4/" />
+ <associateSite label="BIRT 2.3 Update Site"
+ url="http://download.eclipse.org/birt/update-site/2.3/" />
+</associateSites>
\ No newline at end of file
Added: workspace/update/content.jar
===================================================================
(Binary files differ)
Property changes on: workspace/update/content.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/update/features/org.jboss.tools.hellosara.feature_1.0.0.jar
===================================================================
(Binary files differ)
Property changes on: workspace/update/features/org.jboss.tools.hellosara.feature_1.0.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/update/plugins/org.jboss.tools.hellosara_1.0.0.jar
===================================================================
(Binary files differ)
Property changes on: workspace/update/plugins/org.jboss.tools.hellosara_1.0.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 4 months
JBoss Tools SVN: r12794 - workspace/update.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-20 14:46:22 -0500 (Sat, 20 Dec 2008)
New Revision: 12794
Added:
workspace/update/.project
workspace/update/associateSites.xml
workspace/update/site.xml
Log:
Initial import.
Added: workspace/update/.project
===================================================================
--- workspace/update/.project (rev 0)
+++ workspace/update/.project 2008-12-20 19:46:22 UTC (rev 12794)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>update</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: workspace/update/associateSites.xml
===================================================================
--- workspace/update/associateSites.xml (rev 0)
+++ workspace/update/associateSites.xml 2008-12-20 19:46:22 UTC (rev 12794)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<associateSites>
+ <associateSite label="AJDT"
+ url="http://download.eclipse.org/tools/ajdt/34/update/" />
+ <associateSite label="Mylyn"
+ url="http://download.eclipse.org/tools/mylyn/update/e3.4/" />
+ <associateSite label="BIRT 2.3 Update Site"
+ url="http://download.eclipse.org/birt/update-site/2.3/" />
+</associateSites>
Added: workspace/update/site.xml
===================================================================
--- workspace/update/site.xml (rev 0)
+++ workspace/update/site.xml 2008-12-20 19:46:22 UTC (rev 12794)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site associateSitesURL="https://svn.jboss.org/repos/jbosstools/workspace/update/associateSites.xml">
+ <feature url="features/org.jboss.tools.hellosara.feature_1.0.0.jar" id="org.jboss.tools.hellosara.feature" version="1.0.0">
+ <category name="Sara"/>
+ </feature>
+ <category-def name="Sara" label="Sara"/>
+</site>
15 years, 4 months
JBoss Tools SVN: r12793 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-20 14:46:02 -0500 (Sat, 20 Dec 2008)
New Revision: 12793
Added:
workspace/update/
Log:
Initial import.
15 years, 4 months
JBoss Tools SVN: r12792 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: izhukov
Date: 2008-12-20 10:33:33 -0500 (Sat, 20 Dec 2008)
New Revision: 12792
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java
Log:
JBIDE-3424 small defect was fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2008-12-20 13:41:31 UTC (rev 12791)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2008-12-20 15:33:33 UTC (rev 12792)
@@ -242,10 +242,11 @@
}
}
- // if focus node also contain anchor point (selected only 1 element)
- if ((focusNode != null)
- && NodesManagingUtil.isNodeContainsPosition(focusNode, anchor)) {
- return NodesManagingUtil.getNodeMapping(domMapping, focusNode);
+ // if focus node also contains anchor point (selected only 1 element)
+ if (focusNode != null) {
+// if (NodesManagingUtil.isNodeContainsPosition(focusNode, anchor)) {
+ return NodesManagingUtil.getNodeMapping(domMapping, focusNode);
+// }
}
} finally {
if (model != null) {
15 years, 4 months
JBoss Tools SVN: r12791 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-12-20 08:41:31 -0500 (Sat, 20 Dec 2008)
New Revision: 12791
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3226, creating pseudo content for h:dataTable, h:panelGrid and rich:paint2D was removed.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-12-20 13:29:41 UTC (rev 12790)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-12-20 13:41:31 UTC (rev 12791)
@@ -636,7 +636,6 @@
<vpe:breaker type="ignore" />
<vpe:textFormatting use-default-formats="yes">
</vpe:textFormatting>
- <vpe:pseudoContent defaultText="yes" />
</vpe:template>
</vpe:tag>
@@ -661,7 +660,6 @@
<vpe:textFormatting use-default-formats="yes">
<vpe:format type="BlockFormat" addChildren="deny" />
</vpe:textFormatting>
- <vpe:pseudoContent defaultText="yes" />
</vpe:template>
</vpe:tag>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2008-12-20 13:29:41 UTC (rev 12790)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2008-12-20 13:41:31 UTC (rev 12791)
@@ -8,8 +8,7 @@
<TR CLASS="dr-table-header rich-table-header"
STYLE="/background-image: url\(.*resources/common/background.gif\);/">
<TD ROWSPAN="2" CLASS="dr-table-headercell rich-table-headercell">
- <IMG WIDTH="1" HEIGHT="1" SRC="/.*resources/spacer/spacer.gif/"
- STYLE="" />
+ <IMG WIDTH="1" HEIGHT="1" SRC="/.*resources/spacer/spacer.gif/"/>
</TD>
<TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell">
<SPAN> FIELDS</SPAN>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml 2008-12-20 13:29:41 UTC (rev 12790)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml 2008-12-20 13:41:31 UTC (rev 12791)
@@ -1,10 +1,10 @@
<tests>
<test id="paint2D">
- <IMG WIDTH="10" HEIGHT="10" SRC="/.*resources/paint2D/paint2D.gif/"
+ <IMG WIDTH="10" HEIGHT="10"
CLASS="rich-paint2D" BGCOLOR="transparent"/>
</test>
<test id="paint2DWithData">
- <IMG WIDTH="300" HEIGHT="120" SRC="/.*resources/paint2D/paint2D.gif/"
+ <IMG WIDTH="300" HEIGHT="120"
STYLE="color: red;" CLASS="rich-paint2D customStyleClass" BGCOLOR="transparent"/>
</test>
<test id="paint2DWithDataAndChildren">
@@ -13,7 +13,7 @@
<SPAN>Mama mila ramu</SPAN>
<INPUT TYPE="button" VALUE="Button"/>
</SPAN>
- <IMG WIDTH="300" HEIGHT="120" SRC="/.*resources/paint2D/paint2D.gif/"
+ <IMG WIDTH="300" HEIGHT="120"
STYLE="color: red;" CLASS="rich-paint2D customStyleClass" BGCOLOR="transparent"/>
</SPAN>
</test>
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 2008-12-20 13:29:41 UTC (rev 12790)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-12-20 13:41:31 UTC (rev 12791)
@@ -604,22 +604,6 @@
protected void addChildren(VpeTemplate containerTemplate,
Node sourceContainer, nsIDOMNode visualContainer) {
- /*
- * Fixes http://jira.jboss.com/jira/browse/JBIDE-1944 author: Denis
- * Maliarevich This method is called when template has no
- * childrenInfoList. In this case h:dataTable and h:panelGrid should
- * display pseudo text
- */
- if (containerTemplate instanceof VpeHtmlTemplate) {
- int type = ((VpeHtmlTemplate) containerTemplate).getType();
- if ((VpeHtmlTemplate.TYPE_DATATABLE == type)
- || (VpeHtmlTemplate.TYPE_PANELGRID == type)) {
- setPseudoContent(containerTemplate, sourceContainer,
- visualContainer);
- return;
- }
- }
-
NodeList sourceNodes = sourceContainer.getChildNodes();
int len = sourceNodes.getLength();
int childrenCount = 0;
15 years, 4 months