catch up with development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.xtext.statemachine.ui/META-INF/MANIFEST.MF b/org.eclipse.osbp.xtext.statemachine.ui/META-INF/MANIFEST.MF
index 9e91dd0..ce342c0 100644
--- a/org.eclipse.osbp.xtext.statemachine.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.xtext.statemachine.ui/META-INF/MANIFEST.MF
@@ -20,11 +20,11 @@
org.eclipse.compare,
org.eclipse.xtext.xbase.ui;bundle-version="[2.11.0,2.12.0)",
org.eclipse.jdt.debug.ui,
- org.eclipse.osbp.fork.mihalis.opal.imageSelector.osgi;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.xtext.basic.ui;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.xtext.oxtype;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.xtext.oxtype.ui;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.xtend.lib;resolution:=optional
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.mihalis.opal;bundle-version="1.0.3"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.osbp.xtext.statemachine.ui.quickfix,
diff --git a/org.eclipse.osbp.xtext.statemachine.ui/src/org/eclipse/osbp/xtext/statemachine/ui/contentassist/StatemachineDSLProposalProvider.xtend b/org.eclipse.osbp.xtext.statemachine.ui/src/org/eclipse/osbp/xtext/statemachine/ui/contentassist/StatemachineDSLProposalProvider.xtend
index 3808f8a..5b54f68 100644
--- a/org.eclipse.osbp.xtext.statemachine.ui/src/org/eclipse/osbp/xtext/statemachine/ui/contentassist/StatemachineDSLProposalProvider.xtend
+++ b/org.eclipse.osbp.xtext.statemachine.ui/src/org/eclipse/osbp/xtext/statemachine/ui/contentassist/StatemachineDSLProposalProvider.xtend
@@ -17,7 +17,6 @@
import javax.inject.Inject
import org.eclipse.emf.ecore.EObject
-import org.eclipse.osbp.fork.mihalis.opal.widgets.ImageSelectorDialog
import org.eclipse.osbp.xtext.basic.ui.contentassist.BasicDSLProposalProviderHelper
import org.eclipse.swt.graphics.Point
import org.eclipse.swt.layout.FillLayout
@@ -30,6 +29,7 @@
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor
import org.eclipse.xtext.ui.editor.contentassist.ReplacementTextApplier
+import org.mihalis.opal.imageSelector.ImageSelectorDialog
class ImageFileNameTextApplier extends ReplacementTextApplier {
var ContentAssistContext context
diff --git a/org.eclipse.osbp.xtext.statemachine.ui/xtend-gen/org/eclipse/osbp/xtext/statemachine/ui/contentassist/ImageFileNameTextApplier.java b/org.eclipse.osbp.xtext.statemachine.ui/xtend-gen/org/eclipse/osbp/xtext/statemachine/ui/contentassist/ImageFileNameTextApplier.java
index 8a032fe..5f4f54a 100644
--- a/org.eclipse.osbp.xtext.statemachine.ui/xtend-gen/org/eclipse/osbp/xtext/statemachine/ui/contentassist/ImageFileNameTextApplier.java
+++ b/org.eclipse.osbp.xtext.statemachine.ui/xtend-gen/org/eclipse/osbp/xtext/statemachine/ui/contentassist/ImageFileNameTextApplier.java
@@ -13,7 +13,6 @@
*/
package org.eclipse.osbp.xtext.statemachine.ui.contentassist;
-import org.eclipse.osbp.fork.mihalis.opal.widgets.ImageSelectorDialog;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Display;
@@ -21,6 +20,7 @@
import org.eclipse.xtext.ui.editor.contentassist.ConfigurableCompletionProposal;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.ReplacementTextApplier;
+import org.mihalis.opal.imageSelector.ImageSelectorDialog;
@SuppressWarnings("all")
public class ImageFileNameTextApplier extends ReplacementTextApplier {
diff --git a/org.eclipse.osbp.xtext.statemachine/src/org/eclipse/osbp/xtext/statemachine/jvmmodel/StatemachineDSLJvmModelInferrer.xtend b/org.eclipse.osbp.xtext.statemachine/src/org/eclipse/osbp/xtext/statemachine/jvmmodel/StatemachineDSLJvmModelInferrer.xtend
index 719075f..6ddce0c 100644
--- a/org.eclipse.osbp.xtext.statemachine/src/org/eclipse/osbp/xtext/statemachine/jvmmodel/StatemachineDSLJvmModelInferrer.xtend
+++ b/org.eclipse.osbp.xtext.statemachine/src/org/eclipse/osbp/xtext/statemachine/jvmmodel/StatemachineDSLJvmModelInferrer.xtend
@@ -986,16 +986,17 @@
body = [
append(
'''
- pcs.firePropertyChange("«dto.name.toFirstLower»", this.«dto.name», this.«dto.name» = («dto.attributeType.attributeType.name»)«dto.name»);
«IF dto.hasEvent»
- if(statemachine != null && !(this.«dto.name» == null && «dto.name» == null) && !(this.«dto.name».equals((«dto.attributeType.attributeType.name»)«dto.name»))) {
+ if(statemachine!=null && !(this.«dto.name»==null && «dto.name»==null) && !(this.«dto.name»!=null && this.«dto.name».equals((«dto.attributeType.attributeType.name»)«dto.name»))) {
statemachine.processEvent(statemachine, new MessageEvent(MessageEvent.EventType.TRIGGER, "«dto.event.name»"));
}«ENDIF»
«IF dto.isAttached && dto.display !== null»
«FOR match:dto.display.output.attributeType.attributeType.allFeatures.stream.filter[it instanceof LDtoReference && (it as LDtoReference).type.equals(dto.attributeType.attributeType)].collect(Collectors.toList)»
set«dto.display.output.name.toFirstUpper»«match.name.toFirstUpper»(«dto.name»);«ENDFOR»
«FOR match:dto.display.output.attributeType.attributeType.allFeatures.stream.filter[it instanceof LDtoInheritedReference && (it as LDtoInheritedReference).type.equals(dto.attributeType.attributeType)].collect(Collectors.toList)»
- set«dto.display.output.name.toFirstUpper»«match.name.toFirstUpper»(«dto.name»);«ENDFOR»«ENDIF»''')
+ set«dto.display.output.name.toFirstUpper»«match.name.toFirstUpper»(«dto.name»);«ENDFOR»«ENDIF»
+ pcs.firePropertyChange("«dto.name.toFirstLower»", this.«dto.name», this.«dto.name» = («dto.attributeType.attributeType.name»)«dto.name»);
+ ''')
]
]
// associatedDtos do not need to interact with jpa
diff --git a/org.eclipse.osbp.xtext.statemachine/xtend-gen/org/eclipse/osbp/xtext/statemachine/jvmmodel/StatemachineDSLJvmModelInferrer.java b/org.eclipse.osbp.xtext.statemachine/xtend-gen/org/eclipse/osbp/xtext/statemachine/jvmmodel/StatemachineDSLJvmModelInferrer.java
index 8969d42..cd870be 100644
--- a/org.eclipse.osbp.xtext.statemachine/xtend-gen/org/eclipse/osbp/xtext/statemachine/jvmmodel/StatemachineDSLJvmModelInferrer.java
+++ b/org.eclipse.osbp.xtext.statemachine/xtend-gen/org/eclipse/osbp/xtext/statemachine/jvmmodel/StatemachineDSLJvmModelInferrer.java
@@ -1909,47 +1909,33 @@
it.setVisibility(JvmVisibility.PUBLIC);
final Procedure1<ITreeAppendable> _function_3 = (ITreeAppendable it_1) -> {
StringConcatenation _builder_3 = new StringConcatenation();
- _builder_3.append("pcs.firePropertyChange(\"");
- String _firstLower = StringExtensions.toFirstLower(dto.getName());
- _builder_3.append(_firstLower);
- _builder_3.append("\", this.");
- String _name = dto.getName();
- _builder_3.append(_name);
- _builder_3.append(", this.");
- String _name_1 = dto.getName();
- _builder_3.append(_name_1);
- _builder_3.append(" = (");
- String _name_2 = dto.getAttributeType().getAttributeType().getName();
- _builder_3.append(_name_2);
- _builder_3.append(")");
- String _name_3 = dto.getName();
- _builder_3.append(_name_3);
- _builder_3.append(");");
- _builder_3.newLineIfNotEmpty();
{
boolean _isHasEvent = dto.isHasEvent();
if (_isHasEvent) {
- _builder_3.append("if(statemachine != null && !(this.");
- String _name_4 = dto.getName();
+ _builder_3.append("if(statemachine!=null && !(this.");
+ String _name = dto.getName();
+ _builder_3.append(_name);
+ _builder_3.append("==null && ");
+ String _name_1 = dto.getName();
+ _builder_3.append(_name_1);
+ _builder_3.append("==null) && !(this.");
+ String _name_2 = dto.getName();
+ _builder_3.append(_name_2);
+ _builder_3.append("!=null && this.");
+ String _name_3 = dto.getName();
+ _builder_3.append(_name_3);
+ _builder_3.append(".equals((");
+ String _name_4 = dto.getAttributeType().getAttributeType().getName();
_builder_3.append(_name_4);
- _builder_3.append(" == null && ");
+ _builder_3.append(")");
String _name_5 = dto.getName();
_builder_3.append(_name_5);
- _builder_3.append(" == null) && !(this.");
- String _name_6 = dto.getName();
- _builder_3.append(_name_6);
- _builder_3.append(".equals((");
- String _name_7 = dto.getAttributeType().getAttributeType().getName();
- _builder_3.append(_name_7);
- _builder_3.append(")");
- String _name_8 = dto.getName();
- _builder_3.append(_name_8);
_builder_3.append("))) {");
_builder_3.newLineIfNotEmpty();
_builder_3.append("\t");
_builder_3.append("statemachine.processEvent(statemachine, new MessageEvent(MessageEvent.EventType.TRIGGER, \"");
- String _name_9 = dto.getEvent().getName();
- _builder_3.append(_name_9, "\t");
+ String _name_6 = dto.getEvent().getName();
+ _builder_3.append(_name_6, "\t");
_builder_3.append("\"));");
_builder_3.newLineIfNotEmpty();
_builder_3.append("}");
@@ -1970,8 +1956,8 @@
String _firstUpper_5 = StringExtensions.toFirstUpper(match.getName());
_builder_3.append(_firstUpper_5);
_builder_3.append("(");
- String _name_10 = dto.getName();
- _builder_3.append(_name_10);
+ String _name_7 = dto.getName();
+ _builder_3.append(_name_7);
_builder_3.append(");");
}
}
@@ -1988,13 +1974,31 @@
String _firstUpper_7 = StringExtensions.toFirstUpper(match_1.getName());
_builder_3.append(_firstUpper_7);
_builder_3.append("(");
- String _name_11 = dto.getName();
- _builder_3.append(_name_11);
+ String _name_8 = dto.getName();
+ _builder_3.append(_name_8);
_builder_3.append(");");
}
}
}
}
+ _builder_3.newLineIfNotEmpty();
+ _builder_3.append("pcs.firePropertyChange(\"");
+ String _firstLower = StringExtensions.toFirstLower(dto.getName());
+ _builder_3.append(_firstLower);
+ _builder_3.append("\", this.");
+ String _name_9 = dto.getName();
+ _builder_3.append(_name_9);
+ _builder_3.append(", this.");
+ String _name_10 = dto.getName();
+ _builder_3.append(_name_10);
+ _builder_3.append(" = (");
+ String _name_11 = dto.getAttributeType().getAttributeType().getName();
+ _builder_3.append(_name_11);
+ _builder_3.append(")");
+ String _name_12 = dto.getName();
+ _builder_3.append(_name_12);
+ _builder_3.append(");");
+ _builder_3.newLineIfNotEmpty();
it_1.append(_builder_3);
};
this._jvmTypesBuilder.setBody(it, _function_3);
