Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-12-14 10:45:23 +0000
committercletavernie2011-12-14 10:45:23 +0000
commit8b21fd432484a95c84588aa0408e40bfa5dd0171 (patch)
tree0b259837dbd6fbd12c846d6e5fa67dd3632db82d /plugins/sysml/diagram
parent8273a0b4d3d393e4eeb79d6e40a3d8ede60bbf72 (diff)
downloadorg.eclipse.papyrus-8b21fd432484a95c84588aa0408e40bfa5dd0171.tar.gz
org.eclipse.papyrus-8b21fd432484a95c84588aa0408e40bfa5dd0171.tar.xz
org.eclipse.papyrus-8b21fd432484a95c84588aa0408e40bfa5dd0171.zip
365919: [Architecture - SVN - Build] Rewrite the Build
https://bugs.eclipse.org/bugs/show_bug.cgi?id=365919
Diffstat (limited to 'plugins/sysml/diagram')
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java18
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java2
3 files changed, 12 insertions, 10 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java
index e0b0492d2f5..e4fd1f178f6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java
@@ -1,14 +1,14 @@
/*****************************************************************************
* Copyright (c) 2009-2011 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- *
+ *
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
* CEA LIST - Adaptation for SysML purpose.
*
@@ -16,8 +16,8 @@
package org.eclipse.papyrus.sysml.diagram.common.figure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusWrappingLabel;
import org.eclipse.papyrus.uml.diagram.common.figure.NamedElementEdgeFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusWrappingLabel;
import org.eclipse.uml2.uml.Association;
/**
@@ -48,6 +48,7 @@ public class AssociationFigure extends NamedElementEdgeFigure {
/**
* Creates the contents.
*/
+ @Override
protected void createContents() {
super.createContents();
@@ -75,16 +76,17 @@ public class AssociationFigure extends NamedElementEdgeFigure {
/**
* Gets the applied stereotype association label.
- *
+ *
* @return the applied stereotype association label
*/
+ @Override
public WrappingLabel getAppliedStereotypeLabel() {
return appliedStereotypeLabel;
}
/**
* Gets the multiplicity source label.
- *
+ *
* @return the multiplicity source label
*/
public WrappingLabel getSourceMultiplicityLabel() {
@@ -93,7 +95,7 @@ public class AssociationFigure extends NamedElementEdgeFigure {
/**
* Gets the multiplicity target label.
- *
+ *
* @return the multiplicity target label
*/
public WrappingLabel getTargetMultiplicityLabel() {
@@ -102,7 +104,7 @@ public class AssociationFigure extends NamedElementEdgeFigure {
/**
* Gets the role source label.
- *
+ *
* @return the role source label
*/
public WrappingLabel getSourceRoleLabel() {
@@ -111,7 +113,7 @@ public class AssociationFigure extends NamedElementEdgeFigure {
/**
* Gets the role target label.
- *
+ *
* @return the role target label
*/
public WrappingLabel getTargetRoleLabel() {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java
index c223320124f..40e1206703e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java
@@ -14,7 +14,7 @@
package org.eclipse.papyrus.uml.diagram.common.figure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusWrappingLabel;
import org.eclipse.uml2.uml.Connector;
/**
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java
index 3384e7bda9a..e66121a4923 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.common.figure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusWrappingLabel;
/**
* <pre>

Back to the top