JBoss Tools SVN: r14391 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2009-03-31 14:02:40 -0400 (Tue, 31 Mar 2009)
New Revision: 14391
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/Document.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Document.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Document.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Document.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java
Log:
JBIDE-3842
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -173,7 +173,7 @@
collector.collect(icu);
}
collector.resolveRelations();
- if (collector.getNonAbstractCUNumber() > 0) {
+ if (collector.getNonInterfaceCUNumber() > 0) {
processor.setAnnotationStylePreference(collector.getAnnotationStylePreference());
processor.modify(javaProject, collector.getMapCUs_Info(), true);
}
@@ -219,7 +219,7 @@
collector.initCollector(javaProject);
collector.collect(cu);
collector.resolveRelations();
- if (collector.getNonAbstractCUNumber() > 0) {
+ if (collector.getNonInterfaceCUNumber() > 0) {
processor.modify(javaProject, collector.getMapCUs_Info(), true);
}
else {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -713,6 +713,21 @@
return nonAbstractCUNumber;
}
+ public int getNonInterfaceCUNumber() {
+ Iterator<Map.Entry<String, EntityInfo>> it = null;
+ int nonInterfaceCUNumber = 0;
+ // generate RefFieldInfoMap (for simple process)
+ it = mapCUs_Info.entrySet().iterator();
+ while (it.hasNext()) {
+ Map.Entry<String, EntityInfo> entry = it.next();
+ EntityInfo entryInfo = entry.getValue();
+ if (!entryInfo.isInterfaceFlag()) {
+ nonInterfaceCUNumber++;
+ }
+ }
+ return nonInterfaceCUNumber;
+ }
+
public AnnotStyle getAnnotationStylePreference() {
return annotationStylePreference;
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -167,6 +167,14 @@
updateAnnotationRelInfo(node, mappedBy, fullyQualifiedName,
RefType.MANY2MANY, JPAConst.ANNOTATION_MANY2MANY, JPAConst.IMPORT_MANY2MANY);
}
+ else if (JPAConst.isAnnotationMappedSuperclass(fullyQualifiedName)) {
+ entityInfo.setAddEntityFlag(false);
+ entityInfo.setAddMappedSuperclassFlag(false);
+ entityInfo.removeRequiredImport(JPAConst.IMPORT_ENTITY);
+ entityInfo.addRequiredImport(JPAConst.IMPORT_MAPPEDSUPERCLASS);
+ }
+ else if (JPAConst.isAnnotationVersion(fullyQualifiedName)) {
+ }
return true;
}
@@ -239,7 +247,15 @@
}
public boolean visit(TypeDeclaration node) {
- entityInfo.setAbstractFlag(entityInfo.isAbstractFlag() || node.isInterface());
+ boolean isAbstruct = entityInfo.isAbstractFlag() ||
+ Modifier.isAbstract(node.getModifiers()) || node.isInterface();
+ entityInfo.setAbstractFlag(isAbstruct);
+ if (isAbstruct) {
+ entityInfo.setAddEntityFlag(false);
+ entityInfo.setAddMappedSuperclassFlag(true);
+ entityInfo.removeRequiredImport(JPAConst.IMPORT_ENTITY);
+ entityInfo.addRequiredImport(JPAConst.IMPORT_MAPPEDSUPERCLASS);
+ }
entityInfo.setInterfaceFlag(node.isInterface());
Type superType = node.getSuperclassType();
if (superType != null) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -52,6 +52,10 @@
*/
protected boolean addEntityFlag = true;
/*
+ * if true - "@MappedSuperclass" annotation should be added
+ */
+ protected boolean addMappedSuperclassFlag = false;
+ /*
* existing imports set
*/
protected Set<String> setExistingImports = new TreeSet<String>();
@@ -288,6 +292,14 @@
this.addEntityFlag = addEntityFlag;
}
+ public boolean isAddMappedSuperclassFlag() {
+ return addMappedSuperclassFlag;
+ }
+
+ public void setAddMappedSuperclassFlag(boolean addMappedSuperclassFlag) {
+ this.addMappedSuperclassFlag = addMappedSuperclassFlag;
+ }
+
public boolean isAddSerializableInterfaceFlag() {
return addSerializableInterfaceFlag;
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -231,7 +231,7 @@
try {
while (it.hasNext()) {
Map.Entry<String, EntityInfo> entry = it.next();
- if (entry.getValue().isAbstractFlag()) {
+ if (entry.getValue().isInterfaceFlag()) {
continue;
}
collectModification(bufferManager, entry.getKey(), entry.getValue(), entities);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -98,7 +98,7 @@
}
public boolean addImport(CompilationUnit node, String importDeclaration) {
- String[] importDeclarations = importDeclaration.split("\\."); //$NON-NLS-1$
+ String[] importDeclarations = importDeclaration.split("\\."); //$NON-NLS-1$
if (importDeclarations.length <= 1) {
return false;
}
@@ -138,6 +138,12 @@
}
public boolean visit(TypeDeclaration node) {
+ if (entityInfo.isAddMappedSuperclassFlag()) {
+ MarkerAnnotation matd = rewriter.getAST().newMarkerAnnotation();
+ matd.setTypeName(rewriter.getAST().newSimpleName(JPAConst.ANNOTATION_MAPPEDSUPERCLASS));
+ ListRewrite lrw = rewriter.getListRewrite(node, TypeDeclaration.MODIFIERS2_PROPERTY);
+ lrw.insertFirst(matd, null);
+ }
if (entityInfo.isAddEntityFlag()) {
MarkerAnnotation matd = rewriter.getAST().newMarkerAnnotation();
matd.setTypeName(rewriter.getAST().newSimpleName(JPAConst.ANNOTATION_ENTITY));
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/Document.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/Document.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/Document.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -13,7 +13,7 @@
import java.util.Set;
@javax.persistence.Entity
-public class Document {
+public class Document extends DocumentBase {
@javax.persistence.Id
protected Long documentId;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -10,7 +10,9 @@
******************************************************************************/
package test.annotated.fields;
+import javax.persistence.MappedSuperclass;
+
public abstract class DocumentBase {
- protected Long globalDocumentIdentificator;
+ protected String globalDocumentIdentificator;
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Document.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Document.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Document.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -13,7 +13,7 @@
import java.util.Set;
@javax.persistence.Entity
-public class Document {
+public class Document extends DocumentBase {
private Long documentId;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -10,7 +10,8 @@
******************************************************************************/
package test.annotated.getters;
+@MappedSuperclass
public abstract class DocumentBase {
- protected Long globalDocumentIdentificator;
+ protected String globalDocumentIdentificator;
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Document.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Document.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Document.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -16,7 +16,7 @@
import javax.persistence.ManyToOne;
@javax.persistence.Entity
-public class Document {
+public class Document extends DocumentBase {
@GeneratedValue @javax.persistence.Id
protected Long documentId;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -15,5 +15,5 @@
@MappedSuperclass
public abstract class DocumentBase {
- protected Long globalDocumentIdentificator;
+ protected String globalDocumentIdentificator;
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Document.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Document.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Document.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -16,7 +16,7 @@
import javax.persistence.ManyToOne;
@javax.persistence.Entity
-public class Document {
+public class Document extends DocumentBase {
private Long documentId;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -15,5 +15,5 @@
@MappedSuperclass
public abstract class DocumentBase {
- protected Long globalDocumentIdentificator;
+ protected String globalDocumentIdentificator;
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -107,6 +107,10 @@
inSequence(sequence);
will(returnValue(2));
+ allowing(allEntitiesInfoCollector).getNonInterfaceCUNumber();
+ inSequence(sequence);
+ will(returnValue(2));
+
allowing(allEntitiesInfoCollector).getAnnotationStylePreference();
inSequence(sequence);
will(returnValue(AnnotStyle.GETTERS));
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-03-31 17:21:28 UTC (rev 14390)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-03-31 18:02:40 UTC (rev 14391)
@@ -139,7 +139,7 @@
collector.resolveRelations();
processor.modify(javaProject, collector.getMapCUs_Info(), false);
//
- //checkItem("DocumentBase"); //$NON-NLS-1$
+ checkItem("DocumentBase"); //$NON-NLS-1$
checkItem("Document"); //$NON-NLS-1$
checkItem("Foto"); //$NON-NLS-1$
checkItem("Passport"); //$NON-NLS-1$
15 years, 8 months
JBoss Tools SVN: r14390 - in trunk/jbpm/docs/converter_ref/en: modules and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2009-03-31 13:21:28 -0400 (Tue, 31 Mar 2009)
New Revision: 14390
Modified:
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_1.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_2.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_3.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_4.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_5.png
trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml
trunk/jbpm/docs/converter_ref/en/modules/overview.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-686 BPMN Convert User Guide update
Modified: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_1.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_2.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_3.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_4.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_5.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml 2009-03-31 17:16:51 UTC (rev 14389)
+++ trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml 2009-03-31 17:21:28 UTC (rev 14390)
@@ -1,22 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<chapter id="bpmn2jpdl" >
- <title>Translate a BPMN file to a JPDL file</title>
- <para>In this chapter we provide you with the necessary steps to translate a BPMN file to a JPDL file.</para>
+ <title>Translate a Bpmn file to a JPDL file</title>
+ <para>In this chapter we provide you with the necessary steps to translate a Bpmn file to a JPDL file.</para>
<section id="createproject">
<title>Creating a project</title>
- <para>Before creating a bpmn file, you should have a Project created.</para>
+ <para>Before creating a Bpmn file, you should have a Project created.</para>
<para>Create a project by
- <emphasis><property>New > Project... > Project</property></emphasis>
- . Enter the following information:
- </para>
- <itemizedlist>
- <listitem>
- <para>Project Name: test</para>
- </listitem>
- </itemizedlist>
+ <emphasis><property>New > Project... > General > Project</property></emphasis>. Enter the following information:
+ </para>
+ <para>Project Name: test</para>
+
<figure>
- <title>A Project</title>
+ <title>Creating a Project</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/bpmnconvert_bpmn2jpdl_1.png"></imagedata>
@@ -25,20 +21,15 @@
</figure>
<para>Click on the <property>Finish</property> button.</para>
</section>
-
<section id="createbpmnfile">
- <title>Creating a bpmn file by STP BPMN editor</title>
- <para>Create a bpmn diagram file by
+ <title>Creating a Bpmn File by STP BPMN Editor</title>
+ <para>Create a BPMN diagram file by
<emphasis><property>New > Others... > Bpmn Diagram</property></emphasis>
. Enter the following information:
</para>
- <itemizedlist>
- <listitem>
- <para>File Name: test</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Create BPMN Diagram</title>
+ <para>File Name: test</para>
+ <figure>
+ <title>Creating BPMN Diagram</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/bpmnconvert_bpmn2jpdl_2.png"></imagedata>
@@ -47,12 +38,11 @@
</figure>
<para>Click on the <property>Finish</property> button.</para>
<para>Open the test.bpmn_diagram file by double-click it.</para>
- <para>Draw the bpmn diagram using STP BPMN editor. If you do not know how to use STP BPMN editor, please go to web site: www.eclipse.org/stp to get the information about STP BPMN editor.</para>
+ <para>Draw the Bpmn diagram using STP BPMN editor. If you do not know how to use STP BPMN editor, please visit <ulink url="http://www.eclipse.org/bpmn/">BPMN project page for details</ulink>.</para>
</section>
-
- <section id="bpmntojpdl">
- <title>Exporting a bpmn file to some jpdl files</title>
- <para>A BPMN file may include more than one pool. Every pool can be mapped to a corresponding JPDL file.</para>
+ <section id="bpmntojpdl">
+ <title>Exporting a Bpmn File to Jpdl files</title>
+ <para>A Bpmn file may include more than one pool. Every pool can be mapped to a corresponding Jpdl file.</para>
<itemizedlist>
<listitem>
<para>Select 'test.bpmn' file and right-click it. Open the export wizard by
@@ -73,7 +63,7 @@
<para>Select the BPMN file that you want to translate.
</para>
<figure>
- <title>Choose a BPMN file</title>
+ <title>Choosing a BPMN File</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/bpmnconvert_bpmn2jpdl_4.png"></imagedata>
@@ -86,7 +76,7 @@
<para>Select the Pools of BPMN that you want to translate.
</para>
<figure>
- <title>Choose BPMN Pools</title>
+ <title>Choosing BPMN Pools</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/bpmnconvert_bpmn2jpdl_5.png"></imagedata>
@@ -96,7 +86,7 @@
<para>Click on the <property>Next</property> button.</para>
</listitem>
<listitem>
- <para>In this page, You may get error messages or warning messages that occurred during the conversion. If no any messages, this page will be skipped.
+ <para>In this page, you may get error or warning messages that occurred during the conversion. If there are no messages, this page is skipped.
</para>
<figure>
<title>Show Messages</title>
Modified: trunk/jbpm/docs/converter_ref/en/modules/overview.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/modules/overview.xml 2009-03-31 17:16:51 UTC (rev 14389)
+++ trunk/jbpm/docs/converter_ref/en/modules/overview.xml 2009-03-31 17:21:28 UTC (rev 14390)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<chapter id="overview">
<title>BPMN Convert Overview</title>
-
- <para>JBoss BPMN Convert module is a tool used to translate a BPMN file to something else.</para>
- <para>The BPMN file may be written by hands or with the help of some editors. In this guide, we use STP BPMN editor to draw a BPMN file.</para>
- <para>As a part of JBoss tools, this module implements BPMN -> JPDL translation. You can get a basic JPDL file from a BPMN file by using this module.</para>
-
-</chapter>
\ No newline at end of file
+ <para>This chapter gives you a short overview of JBoss BPMN Convert module</para>
+ <para>JBoss BPMN Convert module is a tool used for a BPMN file translation</para>
+ <para>As a part of JBoss tools, JBoss BPMN Convert module implements BPMN -> JPDL translation. You can get a basic JPDL file from a BPMN file by using this module.</para>
+ <para>The BPMN file may be written by hands or with the help of some editors. In this guide, we use STP BPMN editor to draw a BPMN file.</para>
+ <para>You can download the editor which is included into BPMN Modeler from Eclipse download or update site. On the <ulink url="http://www.eclipse.org/bpmn">Eclipse BPMN project page</ulink> you can find the necessary links and other related information</para>
+ </chapter>
\ No newline at end of file
15 years, 8 months
JBoss Tools SVN: r14389 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/wizard and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2009-03-31 13:16:51 -0400 (Tue, 31 Mar 2009)
New Revision: 14389
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-03-31 14:44:41 UTC (rev 14388)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-03-31 17:16:51 UTC (rev 14389)
@@ -539,7 +539,7 @@
</extension>
<!-- Refactorng -->
- <!--extension
+ <extension
point="org.eclipse.ui.menus">
<menuContribution
locationURI="popup:#CompilationUnitEditorContext?after=org.eclipse.jdt.ui.refactoring.menu">
@@ -571,7 +571,7 @@
<handler
commandId="org.jboss.tools.seam.ui.refactoring.component"
class="org.jboss.tools.seam.ui.refactoring.SeamComponentRenameHandler"/>
- </extension-->
+ </extension>
<extension
point="org.jboss.tools.common.model.ui.attributeContentProposalProviders">
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java 2009-03-31 14:44:41 UTC (rev 14388)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java 2009-03-31 17:16:51 UTC (rev 14389)
@@ -10,9 +10,21 @@
******************************************************************************/
package org.jboss.tools.seam.ui.wizard;
+import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.ltk.core.refactoring.Refactoring;
+import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor;
import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
+import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
import org.jboss.tools.seam.core.ISeamComponent;
+import org.jboss.tools.seam.internal.core.refactoring.RenameComponentProcessor;
+import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
+import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory;
/**
* @author Alexey Kazakov
@@ -20,6 +32,7 @@
public class RenameComponentWizard extends RefactoringWizard {
private ISeamComponent component;
+ private String componentName;
public RenameComponentWizard(Refactoring refactoring, ISeamComponent component) {
super(refactoring, WIZARD_BASED_USER_INTERFACE);
@@ -32,6 +45,51 @@
@Override
protected void addUserInputPages() {
setDefaultPageTitle(getRefactoring().getName());
-// addPage( new RenamePropertyInputPage( info ) );
+ RenameComponentProcessor processor= (RenameComponentProcessor) getRefactoring().getAdapter(RenameComponentProcessor.class);
+ addPage(new RenameComponentWizardPage(processor));
}
+
+ class RenameComponentWizardPage extends UserInputWizardPage{
+ private RenameComponentProcessor processor;
+
+ public RenameComponentWizardPage(RenameComponentProcessor processor){
+ super("");
+ this.processor = processor;
+ }
+
+ public void createControl(Composite parent) {
+ Composite container = new Composite(parent, SWT.NULL);
+ container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ GridLayout layout = new GridLayout();
+ container.setLayout(layout);
+ layout.numColumns = 2;
+
+ String defaultName = component.getName();
+ IFieldEditor editor = IFieldEditorFactory.INSTANCE.createTextEditor(componentName, "Seam component name:", defaultName);
+ editor.doFillIntoGrid(container);
+
+ setControl(container);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ltk.ui.refactoring.UserInputWizardPage#performFinish()
+ */
+ protected boolean performFinish() {
+ initializeRefactoring();
+ return super.performFinish();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ltk.ui.refactoring.UserInputWizardPage#getNextPage()
+ */
+ public IWizardPage getNextPage() {
+ initializeRefactoring();
+ return super.getNextPage();
+ }
+
+ private void initializeRefactoring() {
+ processor.setComponent(component);
+ }
+
+ }
}
\ No newline at end of file
15 years, 8 months
JBoss Tools SVN: r14388 - trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-03-31 10:44:41 -0400 (Tue, 31 Mar 2009)
New Revision: 14388
Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java
Log:
JBIDE-3926
Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java 2009-03-31 12:03:49 UTC (rev 14387)
+++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java 2009-03-31 14:44:41 UTC (rev 14388)
@@ -67,6 +67,8 @@
if (c == null) {
c = nc[j].copy();
object.addChild(c);
+ //done to provide 'default-enabled'
+ mergeRules(c, c);
} else {
mergeRules(c, nc[j]);
}
@@ -89,6 +91,8 @@
}
}
}
+
+ static int i = 0;
protected void mergeRules(XModelObject object, XModelObject update) throws XModelException {
org.jboss.tools.common.meta.XAttribute[] as = object.getModelEntity().getAttributes();
15 years, 8 months
JBoss Tools SVN: r14387 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2009-03-31 08:03:49 -0400 (Tue, 31 Mar 2009)
New Revision: 14387
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
Log:
JBIDE-3900 Make Open On feature for <el-resolver></el-resolver> in faces-config.xml
Issue is fixed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2009-03-31 11:28:26 UTC (rev 14386)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2009-03-31 12:03:49 UTC (rev 14387)
@@ -180,6 +180,7 @@
<axis path="/faces-config/application/state-manager/" />
<axis path="/faces-config/application/property-resolver/" />
<axis path="/faces-config/application/variable-resolver/" />
+ <axis path="/faces-config/application/el-resolver/" />
<axis path="/faces-config/factory/application-factory/" />
<axis path="/faces-config/factory/faces-context-factory/" />
<axis path="/faces-config/factory/lifecycle-factory/" />
@@ -208,6 +209,7 @@
<axis path="/faces-config/application/state-manager/" />
<axis path="/faces-config/application/property-resolver/" />
<axis path="/faces-config/application/variable-resolver/" />
+ <axis path="/faces-config/application/el-resolver/" />
<axis path="/faces-config/factory/application-factory/" />
<axis path="/faces-config/factory/faces-context-factory/" />
<axis path="/faces-config/factory/lifecycle-factory/" />
@@ -236,6 +238,7 @@
<axis path="/faces-config/application/state-manager/" />
<axis path="/faces-config/application/property-resolver/" />
<axis path="/faces-config/application/variable-resolver/" />
+ <axis path="/faces-config/application/el-resolver/" />
<axis path="/faces-config/factory/application-factory/" />
<axis path="/faces-config/factory/faces-context-factory/" />
<axis path="/faces-config/factory/lifecycle-factory/" />
@@ -264,6 +267,7 @@
<axis path="/faces-config/application/state-manager/" />
<axis path="/faces-config/application/property-resolver/" />
<axis path="/faces-config/application/variable-resolver/" />
+ <axis path="/faces-config/application/el-resolver/" />
<axis path="/faces-config/factory/application-factory/" />
<axis path="/faces-config/factory/faces-context-factory/" />
<axis path="/faces-config/factory/lifecycle-factory/" />
15 years, 8 months
JBoss Tools SVN: r14386 - in trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext: util and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2009-03-31 07:28:26 -0400 (Tue, 31 Mar 2009)
New Revision: 14386
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/util/StructuredModelWrapper.java
Log:
JBIDE-3889 Resource Bundle Open-Ons aren't working for <message-bundle> tag of faces-config.xml opened from a jar.
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2009-03-31 01:40:58 UTC (rev 14385)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2009-03-31 11:28:26 UTC (rev 14386)
@@ -64,7 +64,17 @@
smw.dispose();
}
}
-
+
+ protected String getBaseLocation() {
+ StructuredModelWrapper smw = new StructuredModelWrapper();
+ try {
+ smw.init(getDocument());
+ return smw.getBaseLocation();
+ } finally {
+ smw.dispose();
+ }
+ }
+
protected XModel getXModel() {
StructuredModelWrapper smw = new StructuredModelWrapper();
try {
@@ -105,6 +115,13 @@
return null;
}
+ public static String getBaseLocation(IStructuredModel structuredModel) {
+ if (structuredModel == null) {
+ return null;
+ }
+ return structuredModel.getBaseLocation();
+ }
+
public static IFile getFile(IStructuredModel structuredModel) {
if (structuredModel == null) {
return null;
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/util/StructuredModelWrapper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/util/StructuredModelWrapper.java 2009-03-31 01:40:58 UTC (rev 14385)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/util/StructuredModelWrapper.java 2009-03-31 11:28:26 UTC (rev 14386)
@@ -42,6 +42,10 @@
return AbstractHyperlink.getFile(model);
}
+ public String getBaseLocation() {
+ return AbstractHyperlink.getBaseLocation(model);
+ }
+
public void dispose() {
if(model != null) {
model.releaseFromRead();
15 years, 8 months
JBoss Tools SVN: r14385 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/command and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-03-30 21:40:58 -0400 (Mon, 30 Mar 2009)
New Revision: 14385
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/ChangePropertyCommand.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AssignmentSection.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/JpdlDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AdvancedSection.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/NameSection.java
Log:
support for assigment type, assignment expression and expression language in properties view of human tasks
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-03-31 01:39:48 UTC (rev 14384)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-03-31 01:40:58 UTC (rev 14385)
@@ -244,6 +244,10 @@
id="org.jboss.tools.jpdl4.general"
label="General"/>
<propertyTab
+ category="general"
+ id="org.jboss.tools.jpdl4.assignment"
+ label="Assignment"/>
+ <propertyTab
afterTab="org.jboss.tools.jpdl4.general"
category="details"
id="org.jboss.tools.jpdl4.details"
@@ -277,6 +281,12 @@
<input type="org.jboss.tools.flow.jpdl4.model.ProcessNode"/>
<input type="org.jboss.tools.flow.jpdl4.model.Process"/>
</propertySection>
+ <propertySection
+ class="org.jboss.tools.flow.jpdl4.properties.AssignmentSection"
+ id="org.jboss.tools.jpdl4.assignment"
+ tab="org.jboss.tools.jpdl4.assignment">
+ <input type="org.jboss.tools.flow.jpdl4.model.HumanTask"/>
+ </propertySection>
</propertySections>
</extension>
<extension
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/ChangePropertyCommand.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/ChangePropertyCommand.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/ChangePropertyCommand.java 2009-03-31 01:40:58 UTC (rev 14385)
@@ -0,0 +1,44 @@
+package org.jboss.tools.flow.jpdl4.command;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.ui.views.properties.IPropertySource;
+
+public class ChangePropertyCommand extends Command {
+
+ private IPropertySource target;
+ private Object newValue;
+ private Object oldValue;
+ private Object propertyId;
+
+
+ public void execute() {
+ if (oldValue == null) {
+ oldValue = target.getPropertyValue(propertyId);
+ }
+ target.setPropertyValue(propertyId, newValue);
+ }
+
+ public boolean canExecute() {
+ return target != null;
+ }
+
+ public void setPropertyId(Object propertyId) {
+ this.propertyId = propertyId;
+ }
+
+ public void setNewValue(Object newValue) {
+ this.newValue = newValue;
+ }
+
+ public void setOldValue(Object oldValue) {
+ this.oldValue = oldValue;
+ }
+
+ public void setTarget(IPropertySource target) {
+ this.target = target;
+ }
+
+ public void undo() {
+ target.setPropertyValue(propertyId, oldValue);
+ }
+}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-03-31 01:39:48 UTC (rev 14384)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-03-31 01:40:58 UTC (rev 14385)
@@ -233,7 +233,7 @@
private void addGraphics(ConnectionWrapper wrapper, Element element) {
String graphics = element.getAttribute("g");
- if (graphics != null) {
+ if (graphics != null && !"".equals(graphics)) {
int pos = graphics.lastIndexOf(':');
String labelInfo, bendpointInfo = null;
if (pos != -1) {
@@ -242,10 +242,10 @@
} else {
labelInfo = graphics;
}
- if (labelInfo != null) {
+ if (labelInfo != null && !"".equals(labelInfo)) {
addLabelInfo(wrapper, labelInfo);
}
- if (bendpointInfo != null) {
+ if (bendpointInfo != null && !"".equals(bendpointInfo)) {
addBendpointInfo(wrapper, bendpointInfo);
}
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java 2009-03-31 01:39:48 UTC (rev 14384)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java 2009-03-31 01:40:58 UTC (rev 14385)
@@ -12,6 +12,7 @@
protected void createEditPolicies() {
super.createEditPolicies();
+ removeEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE);
installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new ProcessNodeGraphicalNodeEditPolicy());
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java 2009-03-31 01:39:48 UTC (rev 14384)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java 2009-03-31 01:40:58 UTC (rev 14385)
@@ -1,10 +1,124 @@
package org.jboss.tools.flow.jpdl4.model;
+import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
+import org.eclipse.ui.views.properties.IPropertySource;
+import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.eclipse.ui.views.properties.TextPropertyDescriptor;
+
public class HumanTask extends Task {
- protected boolean isPropagationExclusive() {
- return true;
+ private static String ASSIGNMENT_LABEL = "Assignment";
+
+ public static final String ASSIGNMENT_TYPE = "org.jboss.tools.flow.jpdl4.model.task.assignment.type";
+ public static final String ASSIGNMENT_EXPRESSION = "org.jboss.tools.flow.jpdl4.model.task.assignment.expression";
+ public static final String ASSIGNMENT_EXPRESSION_LANGUAGE = "org.jboss.tools.flow.jpdl4.model.task.assignment.expression.language";
+
+ public static final String ASSIGNEE = "assignee";
+ public static final String CANDIDATE_GROUPS = "candidate-groups";
+ public static final String CANDIDATE_USERS = "candidate-users";
+ public static final String SWIMLANE = "swimlane";
+ public static final String NONE = "none";
+
+ public static final String[] ASSIGNMENT_TYPES = {
+ ASSIGNEE, CANDIDATE_GROUPS, CANDIDATE_USERS, SWIMLANE, NONE
+ };
+
+ private String assignmentType = NONE;
+ private String assignmentExpression = "";
+ private String assignmentExpressionLanguage = "";
+
+ public HumanTask() {
+ setMetaData("propertySource", new PropertySource());
}
+
+ private class PropertySource implements IPropertySource {
+
+ private IPropertyDescriptor[] propertyDescriptors;
+
+ private void initializePropertyDescriptors() {
+ PropertyDescriptor assignmentTypeDescriptor =
+ new ComboBoxPropertyDescriptor(ASSIGNMENT_TYPE, "Type", ASSIGNMENT_TYPES);
+ assignmentTypeDescriptor.setCategory(ASSIGNMENT_LABEL);
+ PropertyDescriptor assignmentExpressionDescriptor =
+ new TextPropertyDescriptor(ASSIGNMENT_EXPRESSION, "Expression");
+ assignmentExpressionDescriptor.setCategory(ASSIGNMENT_LABEL);
+ PropertyDescriptor assignmentExpressionLanguageDescriptor =
+ new TextPropertyDescriptor(ASSIGNMENT_EXPRESSION_LANGUAGE, "Language");
+ assignmentExpressionLanguageDescriptor.setCategory(ASSIGNMENT_LABEL);
+ propertyDescriptors = new IPropertyDescriptor[] {
+ assignmentTypeDescriptor,
+ assignmentExpressionDescriptor,
+ assignmentExpressionLanguageDescriptor
+ };
+ }
+
+ public Object getEditableValue() {
+ return null;
+ }
+
+ public IPropertyDescriptor[] getPropertyDescriptors() {
+ if (propertyDescriptors == null) {
+ initializePropertyDescriptors();
+ }
+ return propertyDescriptors;
+ }
+
+ private int getAssignmentTypesIndex(String assignmentType) {
+ int result = 0;
+ for (String type : ASSIGNMENT_TYPES) {
+ if (type.equals(assignmentType)) {
+ break;
+ }
+ result++;
+ }
+ return result;
+ }
+
+ public Object getPropertyValue(Object id) {
+ if (ASSIGNMENT_TYPE.equals(id)) {
+ return getAssignmentTypesIndex(assignmentType);
+ } else if (ASSIGNMENT_EXPRESSION.equals(id)) {
+ return assignmentExpression;
+ } else if (ASSIGNMENT_EXPRESSION_LANGUAGE.equals(id)) {
+ return assignmentExpressionLanguage;
+ }
+ return null;
+ }
+
+ public boolean isPropertySet(Object id) {
+ if (ASSIGNMENT_TYPE.equals(id)) {
+ return true;
+ } else if (ASSIGNMENT_EXPRESSION.equals(id)) {
+ return !"".equals(assignmentExpression);
+ } else if (ASSIGNMENT_EXPRESSION_LANGUAGE.equals(id)) {
+ return !"".equals(assignmentExpressionLanguage);
+ }
+ return false;
+ }
+
+ public void resetPropertyValue(Object id) {
+ if (ASSIGNMENT_TYPE.equals(id)) {
+ assignmentType = NONE;
+ } else if (ASSIGNMENT_EXPRESSION.equals(id)) {
+ assignmentExpression = "";
+ } else if (ASSIGNMENT_EXPRESSION_LANGUAGE.equals(id)) {
+ assignmentExpressionLanguage = "";
+ }
+ }
+
+ public void setPropertyValue(Object id, Object value) {
+ if (ASSIGNMENT_TYPE.equals(id)) {
+ assignmentType = ASSIGNMENT_TYPES[(Integer)value];
+ } else if (ASSIGNMENT_EXPRESSION.equals(id)) {
+ assignmentExpression = (String)value;
+ } else if (ASSIGNMENT_EXPRESSION_LANGUAGE.equals(id)) {
+ assignmentExpressionLanguage = (String)value;
+ }
+ }
+
+ }
+
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java 2009-03-31 01:39:48 UTC (rev 14384)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java 2009-03-31 01:40:58 UTC (rev 14385)
@@ -54,7 +54,11 @@
private class PropertySource implements IPropertySource, IPropertyId {
private IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[] {
- new TextPropertyDescriptor(NAME, "Name") {}
+ new TextPropertyDescriptor(NAME, "Name") {
+ public String getCategory() {
+ return "General";
+ }
+ }
};
public Object getEditableValue() {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AdvancedSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AdvancedSection.java 2009-03-31 01:39:48 UTC (rev 14384)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AdvancedSection.java 2009-03-31 01:40:58 UTC (rev 14385)
@@ -7,7 +7,7 @@
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
public class AdvancedSection extends AdvancedPropertySection {
-
+
public void createControls(Composite parent,
final TabbedPropertySheetPage atabbedPropertySheetPage) {
super.createControls(parent, atabbedPropertySheetPage);
@@ -16,5 +16,5 @@
page.setRootEntry(new UndoablePropertySheetEntry(commandStack));
}
}
-
+
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AssignmentSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AssignmentSection.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AssignmentSection.java 2009-03-31 01:40:58 UTC (rev 14385)
@@ -0,0 +1,195 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gef.commands.CommandStack;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.views.properties.IPropertySource;
+import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+import org.jboss.tools.flow.jpdl4.command.ChangePropertyCommand;
+import org.jboss.tools.flow.jpdl4.model.HumanTask;
+
+public class AssignmentSection extends AbstractPropertySection {
+
+ private CCombo typeCombo;
+ private CLabel typeLabel;
+ private Text expressionText;
+ private CLabel expressionLabel;
+ private Text languageText;
+ private CLabel languageLabel;
+
+// private Composite parent;
+
+ private IPropertySource input;
+
+ private CommandStack commandStack;
+
+// private CommandStackListener commandStackListener = new CommandStackListener() {
+// public void commandStackChanged(EventObject event) {
+// if (!parent.isDisposed()) {
+// refresh();
+// }
+// }
+// };
+
+ public void createControls(Composite parent,
+ TabbedPropertySheetPage aTabbedPropertySheetPage) {
+ super.createControls(parent, aTabbedPropertySheetPage);
+// this.parent = parent;
+ if (aTabbedPropertySheetPage instanceof JpdlPropertySheetPage) {
+ commandStack = ((JpdlPropertySheetPage)aTabbedPropertySheetPage).getCommandStack();
+// commandStack.addCommandStackListener(commandStackListener);
+ }
+ Composite composite = getWidgetFactory().createFlatFormComposite(parent);
+ createTypeLabel(composite);
+ createTypeCombo(composite);
+ createExpressionLabel(composite);
+ createExpressionText(composite);
+ createLanguageLabel(composite);
+ createLanguageText(composite);
+ }
+
+
+ private void createTypeLabel(Composite parent) {
+ typeLabel = getWidgetFactory().createCLabel(parent, "Type");
+ FormData data = new FormData();
+ data.left = new FormAttachment(0, 0);
+ data.top = new FormAttachment(0, 0);
+ typeLabel.setLayoutData(data);
+ }
+
+ private void createTypeCombo(Composite parent) {
+ typeCombo = getWidgetFactory().createCCombo(parent);
+ typeCombo.setItems(HumanTask.ASSIGNMENT_TYPES);
+ FormData data = new FormData();
+ data.top = new FormAttachment(0, 5);
+ data.left = new FormAttachment(0, 85);
+ typeCombo.setLayoutData(data);
+ }
+
+ private void createExpressionLabel(Composite parent) {
+ expressionLabel = getWidgetFactory().createCLabel(parent, "Expression");
+ FormData data = new FormData();
+ data.left = new FormAttachment(0, 0);
+ data.top = new FormAttachment(typeCombo, 4);
+ expressionLabel.setLayoutData(data);
+ }
+
+ private void createExpressionText(Composite parent) {
+ expressionText = getWidgetFactory().createText(parent, "");
+ FormData data = new FormData();
+ data.top = new FormAttachment(typeCombo, 2);
+ data.right = new FormAttachment(100, 0);
+ data.left = new FormAttachment(0, 80);
+ expressionText.setLayoutData(data);
+ }
+
+ private void createLanguageLabel(Composite parent) {
+ languageLabel = getWidgetFactory().createCLabel(parent, "Language");
+ FormData data = new FormData();
+ data.left = new FormAttachment(0, 0);
+ data.top = new FormAttachment(expressionText, 2);
+ languageLabel.setLayoutData(data);
+ }
+
+ private void createLanguageText(Composite parent) {
+ languageText = getWidgetFactory().createText(parent, "");
+ FormData data = new FormData();
+ data.top = new FormAttachment(expressionText, 0);
+ data.left = new FormAttachment(0, 80);
+ data.right = new FormAttachment(100, 0);
+ languageText.setLayoutData(data);
+ }
+
+ public void setInput(IWorkbenchPart part, ISelection selection) {
+ super.setInput(part, selection);
+ if (selection instanceof IStructuredSelection) {
+ Object object = ((IStructuredSelection)selection).getFirstElement();
+ if (object instanceof IAdaptable) {
+ object = ((IAdaptable)object).getAdapter(IPropertySource.class);
+ if (object instanceof IPropertySource) {
+ input = (IPropertySource)object;
+ return;
+ }
+ }
+ }
+ input = null;
+ }
+
+ private SelectionListener typeComboSelectionListener = new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ changeProperty(HumanTask.ASSIGNMENT_TYPE, typeCombo.getSelectionIndex());
+ }
+ };
+
+ private ModifyListener expressionTextModifyListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ changeProperty(HumanTask.ASSIGNMENT_EXPRESSION, expressionText.getText());
+ }
+ };
+
+ private ModifyListener languageTextModifyListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ changeProperty(HumanTask.ASSIGNMENT_EXPRESSION_LANGUAGE, languageText.getText());
+ }
+ };
+
+ protected void changeProperty(Object propertyId, Object newValue) {
+ if (commandStack == null || input == null) return;
+ Object oldValue = input.getPropertyValue(propertyId);
+ if (oldValue == newValue) return;
+ ChangePropertyCommand changePropertyCommand = new ChangePropertyCommand();
+ changePropertyCommand.setPropertyId(propertyId);
+ changePropertyCommand.setTarget(input);
+ changePropertyCommand.setNewValue(newValue);
+ commandStack.execute(changePropertyCommand);
+ }
+
+ protected void unhookListeners() {
+ typeCombo.removeSelectionListener(typeComboSelectionListener);
+ expressionText.removeModifyListener(expressionTextModifyListener);
+ languageText.removeModifyListener(languageTextModifyListener);
+ }
+
+ protected void hookListeners() {
+ typeCombo.addSelectionListener(typeComboSelectionListener);
+ expressionText.addModifyListener(expressionTextModifyListener);
+ languageText.addModifyListener(languageTextModifyListener);
+ }
+
+ protected void updateValues() {
+ if (input == null) {
+ typeCombo.setText(HumanTask.NONE);
+ expressionText.setText("");
+ languageText.setText("");
+ } else {
+ typeCombo.setText(HumanTask.ASSIGNMENT_TYPES[(Integer)input.getPropertyValue(HumanTask.ASSIGNMENT_TYPE)]);
+ expressionText.setText((String)input.getPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION));
+ languageText.setText((String)input.getPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION_LANGUAGE));
+ }
+ }
+
+ public void aboutToBeShown() {
+ refresh();
+ }
+
+ public void refresh() {
+ unhookListeners();
+ updateValues();
+ hookListeners();
+ }
+
+}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/NameSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/NameSection.java 2009-03-31 01:39:48 UTC (rev 14384)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/NameSection.java 2009-03-31 01:40:58 UTC (rev 14385)
@@ -49,7 +49,9 @@
};
public void dispose() {
- commandStack.removeCommandStackListener(commandStackListener);
+ if (commandStack != null) {
+ commandStack.removeCommandStackListener(commandStackListener);
+ }
super.dispose();
}
15 years, 8 months
JBoss Tools SVN: r14384 - trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-03-30 21:39:48 -0400 (Mon, 30 Mar 2009)
New Revision: 14384
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultContainerWrapperPropertySource.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultFlowWrapperPropertySource.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultNodeWrapperPropertySource.java
Log:
support a 'general' properties category
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultContainerWrapperPropertySource.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultContainerWrapperPropertySource.java 2009-03-31 01:39:26 UTC (rev 14383)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultContainerWrapperPropertySource.java 2009-03-31 01:39:48 UTC (rev 14384)
@@ -21,7 +21,11 @@
public IPropertyDescriptor[] getPropertyDescriptors() {
if (propertyDescriptors == null) {
propertyDescriptors = new IPropertyDescriptor[] {
- new TextPropertyDescriptor(NAME, "Name") {}
+ new TextPropertyDescriptor(NAME, "Name") {
+ public String getCategory() {
+ return "General";
+ }
+ }
};
propertyDescriptors = merge(propertyDescriptors, super.getPropertyDescriptors());
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultFlowWrapperPropertySource.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultFlowWrapperPropertySource.java 2009-03-31 01:39:26 UTC (rev 14383)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultFlowWrapperPropertySource.java 2009-03-31 01:39:48 UTC (rev 14384)
@@ -17,7 +17,11 @@
public IPropertyDescriptor[] getPropertyDescriptors() {
if (propertyDescriptors == null) {
propertyDescriptors = new IPropertyDescriptor[] {
- new TextPropertyDescriptor(NAME, "Name") {}
+ new TextPropertyDescriptor(NAME, "Name") {
+ public String getCategory() {
+ return "General";
+ }
+ }
};
propertyDescriptors = merge(propertyDescriptors, super.getPropertyDescriptors());
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultNodeWrapperPropertySource.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultNodeWrapperPropertySource.java 2009-03-31 01:39:26 UTC (rev 14383)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultNodeWrapperPropertySource.java 2009-03-31 01:39:48 UTC (rev 14384)
@@ -21,7 +21,11 @@
public IPropertyDescriptor[] getPropertyDescriptors() {
if (propertyDescriptors == null) {
propertyDescriptors = new IPropertyDescriptor[] {
- new TextPropertyDescriptor(NAME, "Name") {}
+ new TextPropertyDescriptor(NAME, "Name") {
+ public String getCategory() {
+ return "General";
+ }
+ }
};
propertyDescriptors = merge(propertyDescriptors, super.getPropertyDescriptors());
}
15 years, 8 months
JBoss Tools SVN: r14383 - trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-03-30 21:39:26 -0400 (Mon, 30 Mar 2009)
New Revision: 14383
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/WrapperPropertySource.java
Log:
removed bug of the merge method
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/WrapperPropertySource.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/WrapperPropertySource.java 2009-03-30 22:19:28 UTC (rev 14382)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/WrapperPropertySource.java 2009-03-31 01:39:26 UTC (rev 14383)
@@ -1,8 +1,5 @@
package org.jboss.tools.flow.common.properties;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.jboss.tools.flow.common.wrapper.Wrapper;
@@ -68,9 +65,14 @@
}
protected IPropertyDescriptor[] merge(IPropertyDescriptor[] first, IPropertyDescriptor[] second) {
- List<IPropertyDescriptor> result = Arrays.asList(first);
- result.addAll(Arrays.asList(second));
- return (IPropertyDescriptor[])result.toArray();
+ IPropertyDescriptor[] result = new IPropertyDescriptor[first.length + second.length];
+ for (int i = 0; i < first.length; i++) {
+ result[i] = first[i];
+ }
+ for (int i = first.length; i < result.length; i++) {
+ result[i] = second[i - first.length];
+ }
+ return result;
}
}
15 years, 8 months
JBoss Tools SVN: r14382 - trunk/smooks/docs/reference/en/modules.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2009-03-30 18:19:28 -0400 (Mon, 30 Mar 2009)
New Revision: 14382
Modified:
trunk/smooks/docs/reference/en/modules/introduction.xml
trunk/smooks/docs/reference/en/modules/quick_start.xml
trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml
trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml
trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-629
transition sentences are added
English is checked
Modified: trunk/smooks/docs/reference/en/modules/introduction.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/introduction.xml 2009-03-30 17:59:59 UTC (rev 14381)
+++ trunk/smooks/docs/reference/en/modules/introduction.xml 2009-03-30 22:19:28 UTC (rev 14382)
@@ -9,6 +9,7 @@
</keywordset>
</chapterinfo>
<title>Introduction</title>
+ <para>This chapter give you a short introduction to Smooks, Smooks tools and its installation</para>
<section>
<title>What is Smooks?</title>
@@ -58,12 +59,12 @@
url="http://www.smooks.org">Smooks official site</ulink>.</para>
</section>
<section>
- <title>What is Smooks dev tools?</title>
+ <title>What is Smooks Tools?</title>
- <para>Smooks dev tools is a set of graphical tools for editing Smooks configuration file
- base on Eclipse.</para>
+ <para>Smooks tools is a set of graphical tools for editing Smooks configuration file
+ based on Eclipse.</para>
<figure>
- <title>Smooks form editor</title>
+ <title>Smooks Form editor</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/introduction/introduction2.png" scale="90"/>
@@ -74,13 +75,16 @@
<section>
<title>How to install Smooks dev tools?</title>
- <para> The Smooks dev tools was included by the <property>JBoss Tools</property> since 3.0.0
+ <para> The Smooks tools was included by the <property>JBoss Tools</property> since 3.0.0
Beta1 version. You can download the <property>JBoss Tools</property> from <ulink
- url="http://www.jboss.org/tools/download/index.html">here</ulink>.</para>
- <para> Smooks dev tools (<property>JBoss Tools</property>) run with the latest Eclipse and
+ url="http://www.jboss.org/tools/download/index.html">JBoss download site</ulink>.</para>
+ <para> Smooks tools (<property>JBoss Tools</property>) run with the latest Eclipse and
other required plug-ins (GEF, EMF, etc.).</para>
- <para> You should download the latest IDE for Java EE developers from this <ulink
- url="http://www.eclipse.org/downloads/">site</ulink>. It contains many plug-ins (
- GEF, EMF, etc. ) required by Smooks dev tools. </para>
+ <para> You should download the latest IDE for Java EE developers from <ulink
+ url="http://www.eclipse.org/downloads/"> Eclipse site</ulink>. It contains many plug-ins (
+ GEF, EMF, etc. ) required by Smooks dev tools. </para>
+
+ <para>Now let's progress to more advanced topics.</para>
</section>
+
</chapter>
Modified: trunk/smooks/docs/reference/en/modules/quick_start.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/quick_start.xml 2009-03-30 17:59:59 UTC (rev 14381)
+++ trunk/smooks/docs/reference/en/modules/quick_start.xml 2009-03-30 22:19:28 UTC (rev 14382)
@@ -12,7 +12,7 @@
<title>Quick Start</title>
<para> This "Quick Start" will show how to use the <property>Smooks tools</property> to create/edit the Smooks
configuration file for Java2Java data transformation.</para>
- <para> This chapter should give you a brief understanding of the <property>Smooks dev tools</property>.</para>
+ <para> This chapter gives you a brief understanding of the <property>Smooks tools</property>.</para>
<section>
<title>Download Smooks Java-to-Java Example</title>
<para> Visit <ulink
@@ -21,14 +21,14 @@
<tip>
<title>Tip:</title>
- <para> The example project is base on Maven, you suggest you to create a new eclipse
- Java project and copy the example code and .jar files from the example project paste
+ <para> The example project is based on Maven, we suggest you to create a new eclipse
+ Java project, copy the example code and .jar files from the example project and paste
them into the eclipse Java project. </para>
</tip>
</section>
<section>
<title>Smooks Configuration File Wizard</title>
- <para>Select the Smooks Java-to-Java example project what you created and right-click,
+ <para>Select the Smooks Java-to-Java example project that you created and right-click,
select the menu <emphasis><property>New > Other</property>,</emphasis> then find
<emphasis><property>Smooks > Smooks Configuration File</property>.</emphasis>
Click the <emphasis>
@@ -141,7 +141,7 @@
</entry>
<entry>
<para>If there are any errors when you are editing the file, the
- Problems area will display them</para>
+ Problems area displays them</para>
</entry>
</row>
@@ -150,7 +150,7 @@
<para>Source data tree</para>
</entry>
<entry>
- <para>The tree will display the structure of transformed source
+ <para>The tree displays a structure of the transformed source
data</para>
</entry>
</row>
@@ -160,7 +160,7 @@
<para>Target data tree</para>
</entry>
<entry>
- <para>The tree will display the structure of transformed target
+ <para>The tree displays a structure of the transformed target
data</para>
</entry>
</row>
@@ -180,7 +180,7 @@
</entry>
<entry>
<para>Click the link, and <link linkend="graphicaleditor_datalink"
- >Data Selection wizard</link> will be opened helping you to
+ >Data Selection wizard</link> is opened helping you to
choose the source/target data</para>
</entry>
</row>
@@ -209,11 +209,11 @@
</listitem>
</itemizedlist>
- <para>After clicking the link the <property>Data Type Selection wizard</property> will be
+ <para>After clicking the link the <property>Data Type Selection wizard</property> is
opened, and there are two data types on the list: Java and XML.</para>
<note>
<title>Note</title>
- <para> There will be more and more data types on the list as the development went on.
+ <para> There will become more and more data types on the list as the development goes on.
</para>
</note>
@@ -242,7 +242,7 @@
<para>When you select all the necessary java classes, click <emphasis>
<property>Finish</property>
- </emphasis> and the structure of the java class will be displayed on the source/target
+ </emphasis> and the structure of the java class is displayed on the source/target
data tree.</para>
<figure>
<title>Displaying the Structure of the Transformed Data</title>
@@ -323,13 +323,13 @@
</figure>
<para> Please, click <emphasis>
<property>Yes</property>
- </emphasis> to connect the root node. If you don't do that, this dialog will be
+ </emphasis> to connect the root node. If you don't do that, this dialog is
opened again when you connect other nodes.</para>
<note>
<title>Note:</title>
- <para>Please, remember that: The root nodes of the source data and target data *MUST* be
+ <para>Please, remember that the root nodes of the source data and target data *MUST* be
connected.</para>
- <para>This rule is not only for Java-to-Java, but the same is also relevant for
+ <para>This rule is not only for Java-to-Java, but also is relevant for
XML-to-Java </para>
</note>
<para> Now let's do the same operation with the <emphasis>
@@ -349,7 +349,7 @@
<property>"price"</property>
</emphasis> and drag it onto the <emphasis>
<property>"unitPrice"</property>
- </emphasis> of the other side tree viewer. The Problems area will show an
+ </emphasis> of the other side tree viewer. The Problems area shows an
error:</para>
<figure>
<title>Connection Error 1</title>
@@ -417,7 +417,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Now, you should save the file and the <property>Smooks tools</property> will generate the correct
+ <para>Now, you should save the file and the <property>Smooks tools</property> generate the correct
configuration file content.</para>
<para>OK, let run the test class: <property>example.Main</property>. (Please, make sure that the Smooks engine
loads the correct configuration file).</para>
Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml 2009-03-30 17:59:59 UTC (rev 14381)
+++ trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml 2009-03-30 22:19:28 UTC (rev 14382)
@@ -9,6 +9,7 @@
</keywordset>
</chapterinfo>
<title>Smooks Configuration Editor Page</title>
+ <para>In this section you will explore the details of Smooks Configuration Editor usage</para>
<para><property>Smooks Configuration Editor</property> is one tab of the <property>Smooks Editor</property>. </para>
<figure>
<title>Graphical Editor</title>
@@ -21,8 +22,8 @@
<para> You can add/edit/remove the <link linkend="configurationpage_datedecoder">Date
Decoder</link> on the Configuration page of the <property>Smooks Editor</property>. </para>
- <para> The configuration also edit the <link linkend="configurationpage_parsetype">Smooks parse
- type</link> and manage the <link linkend="configurationpage_importfile">Import
+ <para> The configuration editor also edits the <link linkend="configurationpage_parsetype">Smooks parse
+ type</link> and manages the <link linkend="configurationpage_importfile">Import
Files</link>.</para>
<section id="configurationpage_parsetype">
@@ -58,9 +59,9 @@
<tip>
<title>Tip:</title>
- <para> If the import file doesn't exist, the image of the import file will change to
+ <para> If the import file doesn&t exist, the image of the import file is changed to
"Error Image". If you double-click the import file in the Import File list, the file
- will be open with a new default editor. </para>
+ is opened with a new default editor. </para>
</tip>
</section>
@@ -127,7 +128,8 @@
<para> When you defined a new <emphasis>
<property>Date Decoder</property></emphasis>, then you can use the <link
linkend="graphicalpage_propertiesview">JavaBean Properties</link> GUI to set
- it to be the "Java type".</para>
+ it to be the "Java type".</para>
+ <para>Now when we've learnt Smooks Configuration Editor Page, let's have a look at one more Smooks Editor Page - Smooks Source Editor Page and investigate its functionality</para>
<!--
<para> The XML fragment generated by Smooks tools for the "Date
Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml 2009-03-30 17:59:59 UTC (rev 14381)
+++ trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml 2009-03-30 22:19:28 UTC (rev 14382)
@@ -9,7 +9,7 @@
</keywordset>
</chapterinfo>
<title>Smooks Graphical Editor Page</title>
-
+ <para>This chapter is packed with useful information about Smooks Graphical Editor Page usage</para>
<para>Smooks Graphical Editor page is one tab of the <property>Smooks Editor</property>.</para>
<figure>
<title>Graphical Editor</title>
@@ -23,7 +23,7 @@
<para> This <property>Graphical editor</property> allows you to perform drug/drop operations
with the nodes of transform data to map the source data to target data. </para>
<para> When you save the changes in the <property>Graphical editor</property> the correct Smooks
- Configuration file content will be generated. </para>
+ Configuration file content is generated. </para>
<para>To adjust the properties of the connection lines in the editor, you should use the <link
linkend="graphicalpage_propertiesview">Properties view</link> (activate it by following
@@ -96,7 +96,7 @@
</figure>
<para> When you finish the data selection (file path selection), click
- <emphasis><property>Finish</property>,</emphasis> the data view will display the
+ <emphasis><property>Finish</property>,</emphasis> the data view displays the
selected data structure.</para>
</section>
<section>
@@ -138,7 +138,7 @@
"Java", the XML Properties section GUI isn't
displayed.</para>
<para>It means that if the source/target data type of the selected connection line is
- different, the <property>Properties view</property> shows different GUI.</para>
+ different, the <property>Properties view</property> shows a different GUI.</para>
</tip>
<figure>
<title>JavaBean Properties Section</title>
@@ -166,5 +166,7 @@
</imageobject>
</mediaobject>
</figure>
+
+ <para>To discover about other Editor pages, read the next chapters</para>
</section>
</chapter>
Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml 2009-03-30 17:59:59 UTC (rev 14381)
+++ trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml 2009-03-30 22:19:28 UTC (rev 14382)
@@ -9,6 +9,7 @@
</keywordset>
</chapterinfo>
<title>Smooks Source Editor Page</title>
+ <para>This section provides information about Smooks Source Editor Page</para>
<section>
<title>XML Source Editor</title>
<para>You can use this editor to edit the Smooks Configuration file directly. </para>
@@ -25,7 +26,7 @@
<title>Error Messages GUI</title>
<para>If the <property>Smooks tools</property> can't understand the configuration
file or the configuration file is illegal (XML structure isn't right for Smooks
- Configuration file, etc.), the error will be underlined.</para>
+ Configuration file, etc.), the error is underlined.</para>
<figure>
<title>Graphical Editor</title>
<mediaobject>
@@ -41,6 +42,7 @@
<para> You can't edit the configuration file with other editors until file becomes
valid. </para>
</note-->
-
+ <para>We hope, our guide will help you to get started with JBoss Smooks Tools. Besides, for additional information you are welcome on <ulink
+ url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=217">JBoss forum</ulink>.</para>
</section>
</chapter>
15 years, 8 months