Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java6
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/plugin.xml2
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/plugin.xml1
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/schema/org.eclipse.etrice.ui.common.base.refactoring.rename.exsd (renamed from plugins/org.eclipse.etrice.ui.common/schema/org.eclipse.etrice.ui.common.refactoring.rename.exsd)0
-rw-r--r--plugins/org.eclipse.etrice.ui.common/plugin.xml1
-rw-r--r--plugins/org.eclipse.etrice.ui.structure/plugin.xml2
6 files changed, 5 insertions, 7 deletions
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
index 64e01dc8b..177741f30 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
@@ -537,8 +537,7 @@ public class TransitionSupport {
ModelComponent mc = FSMSupportUtil.getInstance().getModelComponent(getDiagram());
boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), t);
Color lineColor = inherited? manageColor(INHERITED_COLOR):manageColor(LINE_COLOR);
- String code = FSMSupportUtil.getInstance().getFSMHelpers().getAllActionCode(t, mc);
- boolean hasActionCode = code!=null && !code.isEmpty();
+ boolean hasActionCode = FSMSupportUtil.getInstance().getFSMHelpers().hasActionCode(t, mc);
Color fillColor = hasActionCode? lineColor : manageColor(FILL_COLOR);
if (!equal(cd.getGraphicsAlgorithm().getBackground(), fillColor))
return Reason.createTrueReason("Arrow head needs update");
@@ -582,8 +581,7 @@ public class TransitionSupport {
Connection conn = (Connection)context.getPictogramElement();
boolean inherited = FSMSupportUtil.getInstance().isInherited(getDiagram(), trans);
Color lineColor = inherited? manageColor(INHERITED_COLOR):manageColor(LINE_COLOR);
- String code = FSMSupportUtil.getInstance().getFSMHelpers().getAllActionCode(trans, mc);
- boolean hasActionCode = code!=null && !code.isEmpty();
+ boolean hasActionCode = FSMSupportUtil.getInstance().getFSMHelpers().hasActionCode(trans, mc);
Color fillColor = hasActionCode? lineColor : manageColor(FILL_COLOR);
updateLabel(trans, conn, fillColor);
updated = true;
diff --git a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
index 654136e44..9e79ff1bd 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
@@ -62,7 +62,7 @@
</resourceServiceProvider>
</extension>
<extension
- point="org.eclipse.etrice.ui.common.refactoring.rename">
+ point="org.eclipse.etrice.ui.common.base.refactoring.rename">
<participant
diagram_extension="behavior"
editor_id="org.eclipse.etrice.ui.behavior.editor.BehaviorEditor">
diff --git a/plugins/org.eclipse.etrice.ui.common.base/plugin.xml b/plugins/org.eclipse.etrice.ui.common.base/plugin.xml
index 25530acce..fcf53d442 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.common.base/plugin.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
+ <extension-point id="org.eclipse.etrice.ui.common.base.refactoring.rename" name="Diagram Rename Participant" schema="schema/org.eclipse.etrice.ui.common.base.refactoring.rename.exsd"/>
<extension
point="org.eclipse.ui.startup">
<startup
diff --git a/plugins/org.eclipse.etrice.ui.common/schema/org.eclipse.etrice.ui.common.refactoring.rename.exsd b/plugins/org.eclipse.etrice.ui.common.base/schema/org.eclipse.etrice.ui.common.base.refactoring.rename.exsd
index f15dd8dd4..f15dd8dd4 100644
--- a/plugins/org.eclipse.etrice.ui.common/schema/org.eclipse.etrice.ui.common.refactoring.rename.exsd
+++ b/plugins/org.eclipse.etrice.ui.common.base/schema/org.eclipse.etrice.ui.common.base.refactoring.rename.exsd
diff --git a/plugins/org.eclipse.etrice.ui.common/plugin.xml b/plugins/org.eclipse.etrice.ui.common/plugin.xml
index 06a4669e0..f602e05ad 100644
--- a/plugins/org.eclipse.etrice.ui.common/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.common/plugin.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension-point id="org.eclipse.etrice.ui.common.refactoring.rename" name="Diagram Rename Participant" schema="schema/org.eclipse.etrice.ui.common.refactoring.rename.exsd"/>
<extension
point="org.eclipse.ui.preferencePages">
<page
diff --git a/plugins/org.eclipse.etrice.ui.structure/plugin.xml b/plugins/org.eclipse.etrice.ui.structure/plugin.xml
index 0a4223767..261e788a8 100644
--- a/plugins/org.eclipse.etrice.ui.structure/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.structure/plugin.xml
@@ -62,7 +62,7 @@
</resourceServiceProvider>
</extension>
<extension
- point="org.eclipse.etrice.ui.common.refactoring.rename">
+ point="org.eclipse.etrice.ui.common.base.refactoring.rename">
<participant
diagram_extension="structure"
editor_id="org.eclipse.etrice.ui.structure.editor.StructureEditor">

Back to the top