diff options
| author | aradermache | 2013-04-05 20:28:20 +0000 |
|---|---|---|
| committer | aradermache | 2013-04-05 20:28:20 +0000 |
| commit | fbde945a2f8f66e0fa1379c446a0f1169f5fbb30 (patch) | |
| tree | 9df795ad81edf3065245576da2d1b7d90d306b6c | |
| parent | 2ca9ef5a37e83d1ea0562298d4187ce944fd6ad5 (diff) | |
| download | org.eclipse.papyrus-fbde945a2f8f66e0fa1379c446a0f1169f5fbb30.tar.gz org.eclipse.papyrus-fbde945a2f8f66e0fa1379c446a0f1169f5fbb30.tar.xz org.eclipse.papyrus-fbde945a2f8f66e0fa1379c446a0f1169f5fbb30.zip | |
Bug 405004 - [All Diagrams] Markers that change duplicate visual decorations
4 files changed, 9 insertions, 9 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java index cfb74691a1f..eded5d2db9a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java @@ -217,11 +217,14 @@ public class DecorationService extends Observable implements IDecorationService public synchronized IPapyrusDecoration addDecoration(String id, String type, EObject element, ImageDescriptor decorationImageForGE, ImageDescriptor decorationImageForME, PreferedPosition position, String message, int priority) {
Decoration decoration = decorations.get(id);
+ DecorationChangeKind decorationChangeKind;
if(decoration == null) {
+ decorationChangeKind = DecorationChangeKind.DecorationAdded;
decoration = new Decoration(id, type, decorationImageForGE, decorationImageForME, message, element, priority);
decorations.put(id, decoration);
- }
- else {
+ } else {
+ // decoration already exists => is modified
+ decorationChangeKind = DecorationChangeKind.DecorationModified;
decoration.setDecorationImageForGE(decorationImageForGE);
decoration.setDecorationImageForME(decorationImageForME);
decoration.setMessage(message);
@@ -231,7 +234,7 @@ public class DecorationService extends Observable implements IDecorationService // notifyListeners(this);
setChanged();
- notifyObservers(new DecorationChange(DecorationChangeKind.DecorationAdded, decoration));
+ notifyObservers(new DecorationChange(decorationChangeKind, decoration));
return decoration;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.core.resources.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.core.resources.prefs index 4824b802631..99f26c0203a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.core.resources.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1
-encoding/<project>=UTF-8
+eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java index aa97b72fa89..f33997b98f1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java @@ -18,14 +18,10 @@ import java.util.List; import org.eclipse.draw2d.AbstractLayout;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.render.figures.ScalableImageFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.ScalableCompartmentFigure;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/ValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/ValidationDecoratorProvider.java index b1c28cde699..661e2a14b4e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/ValidationDecoratorProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/ValidationDecoratorProvider.java @@ -188,6 +188,7 @@ public abstract class ValidationDecoratorProvider extends AbstractProvider imple public void refresh(DecorationChange change) { if(change.getChangeKind() == DecorationChangeKind.DecorationRemoved || + change.getChangeKind() == DecorationChangeKind.DecorationModified || change.getChangeKind() == DecorationChangeKind.RefreshAll) { // always recreate all decorations, in case of a deletion (would require recalculation of positions) or // if all decorations should be refreshed |