diff options
Diffstat (limited to 'plugins')
2 files changed, 28 insertions, 5 deletions
diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomDiagramBehavior.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomDiagramBehavior.java index f617288ef..4415024b2 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomDiagramBehavior.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomDiagramBehavior.java @@ -15,6 +15,7 @@ package org.eclipse.etrice.ui.common.base.editor; import org.eclipse.gef.ContextMenuProvider; +import org.eclipse.graphiti.ui.editor.DefaultMarkerBehavior; import org.eclipse.graphiti.ui.editor.DefaultPersistencyBehavior; import org.eclipse.graphiti.ui.editor.DefaultUpdateBehavior; import org.eclipse.graphiti.ui.editor.DiagramBehavior; @@ -52,4 +53,22 @@ public class CustomDiagramBehavior extends DiagramBehavior { protected DefaultPersistencyBehavior createPersistencyBehavior() { return new CustomPersistencyBehavior(this); } + + @Override + protected DefaultMarkerBehavior createMarkerBehavior() { + DefaultMarkerBehavior markerBehavior = super.createMarkerBehavior(); + + // Bug 542660 + markerBehavior.disableProblemIndicationUpdate(); + + return markerBehavior; + } + + @Override + public void enableAdapters() { + super.enableAdapters(); + + // Bug 542660 + getMarkerBehavior().disableProblemIndicationUpdate(); + } } diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java index 47af71873..4c91be7cd 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java @@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.etrice.core.common.ui.linking.GlobalNonPlatformURIEditorOpener; import org.eclipse.etrice.core.fsm.fSM.ModelComponent; import org.eclipse.etrice.core.fsm.ui.FSMUiModule; +import org.eclipse.graphiti.dt.IDiagramTypeProvider; import org.eclipse.graphiti.mm.pictograms.Diagram; import org.eclipse.graphiti.services.Graphiti; import org.eclipse.graphiti.ui.editor.DiagramBehavior; @@ -127,11 +128,14 @@ public abstract class DiagramEditorBase extends DiagramEditor implements IInputU } public ModelComponent getModelComponent() { - Diagram diagram = getDiagramTypeProvider().getDiagram(); - if(diagram != null) { - EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(diagram); - if (bo instanceof ModelComponent) - return (ModelComponent) bo; + IDiagramTypeProvider diagramTypeProvider = getDiagramTypeProvider(); + if(diagramTypeProvider != null) { + Diagram diagram = diagramTypeProvider.getDiagram(); + if(diagram != null) { + EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(diagram); + if (bo instanceof ModelComponent) + return (ModelComponent) bo; + } } return null; |