Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-01-28 14:55:17 +0000
committerCamille Letavernier2014-01-28 14:55:36 +0000
commitb9e741da9eaebb34f48cbcf802e963bd91437741 (patch)
tree3c398b160915b91da81f533d2c8f2ea7a211e38d
parent289f49701a98347a9ed1df54a944a33230504117 (diff)
parent1d6e3377c3654ae798b46c4f60f1d94777f16e7b (diff)
downloadorg.eclipse.papyrus-b9e741da9eaebb34f48cbcf802e963bd91437741.tar.gz
org.eclipse.papyrus-b9e741da9eaebb34f48cbcf802e963bd91437741.tar.xz
org.eclipse.papyrus-b9e741da9eaebb34f48cbcf802e963bd91437741.zip
Synchronize with master
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java32
2 files changed, 7 insertions, 27 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
index ddbfbce032a..4fd07f68e65 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
@@ -241,7 +241,7 @@ public class CheckedOperationHistory implements IOperationHistory {
}
public IStatus redoOperation(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return redoOperation(operation, monitor, info);
+ return history.redoOperation(operation, monitor, info);
}
public void operationChanged(IUndoableOperation operation) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java
index 593a7c3a50b..bac3ad180df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java
@@ -60,9 +60,15 @@ public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFig
@Override
protected void outlineShape(Graphics graphics, Rectangle bounds) {
PointList pl = setupPoints(bounds);
+ int oldLW = graphics.getLineWidth();
+ if (graphics.getLineWidth() < 1) {
+ // fix for bug 425182 - [Use Case Diagram] Actor invisible in use case diagram
+ graphics.setLineWidth(1);
+ }
graphics.drawPolygon(pl);
int add = graphics.getLineWidth() / 2;
graphics.drawOval(new Rectangle(ovalX, ovalY, ovalD + add, ovalD + add));
+ graphics.setLineWidth(oldLW);
}
/**
@@ -163,98 +169,76 @@ public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFig
@Override
public void setStereotypePropertiesInBrace(String stereotypeProperties) {
- // TODO Auto-generated method stub
}
@Override
public void setStereotypePropertiesInCompartment(String stereotypeProperties) {
- // TODO Auto-generated method stub
}
@Override
public Label getStereotypesLabel() {
- // TODO Auto-generated method stub
return null;
}
@Override
public void setStereotypeDisplay(String stereotypes, Image image) {
- // TODO Auto-generated method stub
}
@Override
public void setQualifiedName(String qualifiedName) {
- // TODO Auto-generated method stub
}
@Override
public Label getQualifiedNameLabel() {
- // TODO Auto-generated method stub
return null;
}
@Override
public Label getTaggedLabel() {
- // TODO Auto-generated method stub
return null;
}
@Override
public void setDepth(int depth) {
- // TODO Auto-generated method stub
}
@Override
public WrappingLabel getNameLabel() {
- // TODO Auto-generated method stub
return null;
}
@Override
public void setNameLabelIcon(boolean displayNameLabelIcon) {
- // TODO Auto-generated method stub
}
@Override
public Color getBorderColor() {
- // TODO Auto-generated method stub
return null;
}
@Override
public boolean isShadow() {
- // TODO Auto-generated method stub
return false;
}
@Override
public void setBorderColor(Color borderColor) {
- // TODO Auto-generated method stub
-
}
@Override
public void setShadow(boolean shadow) {
- // TODO Auto-generated method stub
-
}
@Override
public void setTransparency(int transparency) {
- // TODO Auto-generated method stub
-
}
@Override
public void setGradientData(int gradientColor1, int gradientColor2, int gradientStyle) {
- // TODO Auto-generated method stub
-
}
@Override
public void setIsUsingGradient(boolean b) {
- // TODO Auto-generated method stub
-
}
@Override
@@ -269,21 +253,17 @@ public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFig
@Override
public void removeStereotypeLabel() {
-
}
@Override
public void restoreStereotypeLabel() {
-
}
@Override
public void restoreTaggedLabel() {
-
}
@Override
public void removeTaggedLabel() {
-
}
}

Back to the top