diff options
| author | ptessier | 2014-11-24 10:29:16 +0000 |
|---|---|---|
| committer | ptessier | 2014-11-24 10:29:16 +0000 |
| commit | 3dbb884c35d2f49ff160f2838d30bf0f7ac0393f (patch) | |
| tree | 57e86ec896fdfb9e7687e3cd8759aad7d16b599c /extraplugins/revision | |
| parent | 2d512ef3e0e3fcd1bdc96a7f8cf42a22454a91c2 (diff) | |
| download | org.eclipse.papyrus-3dbb884c35d2f49ff160f2838d30bf0f7ac0393f.tar.gz org.eclipse.papyrus-3dbb884c35d2f49ff160f2838d30bf0f7ac0393f.tar.xz org.eclipse.papyrus-3dbb884c35d2f49ff160f2838d30bf0f7ac0393f.zip | |
447667: [Revision module] a module about revision model shall be
integrated to Papyrus
https://bugs.eclipse.org/bugs/show_bug.cgi?id=447667
Change-Id: I1b05042ff5921cce7c6bb5fe2be48a70d3217a92
Diffstat (limited to 'extraplugins/revision')
2 files changed, 11 insertions, 1 deletions
diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java b/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java index ea9372380c2..aaadd6784dc 100644 --- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java +++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java @@ -34,7 +34,6 @@ public class AddingFig extends Figure{ graphics.setForegroundColor(new org.eclipse.swt.graphics.Color(device, 0, 250, 0));
graphics.setBackgroundColor(new org.eclipse.swt.graphics.Color(device, 0, 250, 0));
graphics.drawRectangle(getBounds().x,getBounds().y, getBounds().width, getBounds().height);
- System.out.println("draw rectangle"+getBounds().x+" "+getBounds().y+" "+ getBounds().width+" "+ getBounds().height);
graphics.popState();
}
diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java b/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java index 6c643d26c77..1b0fa13fdfa 100644 --- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java +++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java @@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor; import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.revision.tool.core.ReviewResourceManager;
import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.swt.internal.image.GIFFileFormat;
/**
* this class is used to add figure in current diagrams for remove add or set during the revision mode
@@ -103,6 +104,10 @@ public class RevisonDiagLayer { if(fig instanceof PolylineConnectionEx){
Rectangle rect = new Rectangle(((PolylineConnectionEx)fig).getPoints().getFirstPoint(), ((PolylineConnectionEx)fig).getPoints().getLastPoint());
+ if(editPart instanceof ConnectionEditPart){
+ rect=((GraphicalEditPart)((ConnectionEditPart)editPart).getSource()).getFigure().getBounds().getCopy();
+ rect=rect.getUnion(((GraphicalEditPart)((ConnectionEditPart)editPart).getTarget()).getFigure().getBounds());
+ }
removedFig.setBounds(rect);
}
@@ -117,6 +122,12 @@ public class RevisonDiagLayer { }
if(fig instanceof PolylineConnectionEx){
Rectangle rect = new Rectangle(((PolylineConnectionEx)fig).getPoints().getFirstPoint(), ((PolylineConnectionEx)fig).getPoints().getLastPoint());
+ if(rect.x==0 &&rect.y==0){
+ if(editPart instanceof ConnectionEditPart){
+ rect=((GraphicalEditPart)((ConnectionEditPart)editPart).getSource()).getFigure().getBounds().getCopy();
+ rect=rect.getUnion(((GraphicalEditPart)((ConnectionEditPart)editPart).getTarget()).getFigure().getBounds());
+ }
+ }
addingFig.setBounds(rect);
}
else{
|