Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-03-07 16:54:41 +0000
committerCamille Letavernier2014-03-07 16:54:41 +0000
commit38aee3e9caea1f8023102a5a0018540669c337e8 (patch)
tree1834e3a796fecca1a1a3b479cea5c7694bdd3456 /plugins/uml
parent2029d305ac0457f9de0c79eeadf5865bc90d1e89 (diff)
downloadorg.eclipse.papyrus-38aee3e9caea1f8023102a5a0018540669c337e8.tar.gz
org.eclipse.papyrus-38aee3e9caea1f8023102a5a0018540669c337e8.tar.xz
org.eclipse.papyrus-38aee3e9caea1f8023102a5a0018540669c337e8.zip
Bug 386118 - [EMF Facet] Papyrus should progressively support EMF Facet
0.2 Fix compile errors
Diffstat (limited to 'plugins/uml')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecorator.java28
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecoratorProvider.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypePropertyEditPart.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF3
5 files changed, 23 insertions, 24 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
index e0548ccae17..b4af1a27da0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
@@ -15,7 +15,7 @@
-->
<plugin>
- point="org.eclipse.ui.contexts" id="ui-context">
+ <extension point="org.eclipse.ui.contexts" id="ui-context">
<?gmfgen generated="true"?>
<context
description="%context.description"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecorator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecorator.java
index 5867a824ab3..e03c11054c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecorator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecorator.java
@@ -52,7 +52,7 @@ import org.eclipse.uml2.uml.Type;
import org.eclipse.uml2.uml.UMLPackage;
/**
- *
+ *
* The decorator to represent inherited element This decorator adds a small
* image ( the generalization icon) next to the UML Element which are inherited.
* 3 positions are defined for the decoration :
@@ -62,8 +62,8 @@ import org.eclipse.uml2.uml.UMLPackage;
* <li>else if the element is in a compartment list : {@link PositionConstants#EAST} and margin =-1</li>
* <li>else {@link PositionConstants#SOUTH_EAST} and margin = -1</li>
* </ul>
- *
- * @deprecated Replaced with the generic {@link org.eclipse.papyrus.infra.gmfdiag.common.decoration.ExternalReferenceMarker}
+ *
+ * @deprecated Replaced with the generic org.eclipse.papyrus.infra.gmfdiag.common.decoration.ExternalReferenceMarker
*/
@Deprecated
public class InheritedDecorator implements IDecorator {
@@ -86,7 +86,7 @@ public class InheritedDecorator implements IDecorator {
/**
* Creates a new <code>AbstractDecorator</code> for the decorator target
* passed in.
- *
+ *
* @param decoratorTarget
* the object to be decorated
*/
@@ -96,7 +96,7 @@ public class InheritedDecorator implements IDecorator {
/**
* Gets the object to be decorated.
- *
+ *
* @return Returns the object to be decorated
*/
protected IDecoratorTarget getDecoratorTarget() {
@@ -132,7 +132,7 @@ public class InheritedDecorator implements IDecorator {
* getDecoratorTargetClassifier Utility method to determine if the
* decoratorTarget is a supported type for this decorator and return the
* associated Classifier element.
- *
+ *
* @param decoratorTarget
* IDecoratorTarget to check and return valid Classifier target.
* @return node Node if IDecoratorTarget can be supported, null otherwise.
@@ -205,7 +205,7 @@ public class InheritedDecorator implements IDecorator {
/**
* Returns a figure corresponding to this image
- *
+ *
* @param image
* a image
* @return a figure corresponding to this image
@@ -220,7 +220,7 @@ public class InheritedDecorator implements IDecorator {
/**
* Returns the direction to set the decorator for the node
- *
+ *
* @param node
* the node
* @return the direction to set the decorator for the node direction can be
@@ -264,7 +264,7 @@ public class InheritedDecorator implements IDecorator {
/**
* Tests if the compartment is a compartment list
- *
+ *
* @param node
* the node on which we want add an Overlay
* @return <code>true</code> if the compartment is managed by an {@link XYLayoutEditPolicy}
@@ -288,7 +288,7 @@ public class InheritedDecorator implements IDecorator {
/**
* Tests if the node is an inherited element
- *
+ *
* @param node
* a node
* @return <code>true</code> if the node is an inherited element <code>false</code> if not
@@ -325,7 +325,7 @@ public class InheritedDecorator implements IDecorator {
/**
* getDescriptionStyle Accessor to retrieve the description style from a
* Node.
- *
+ *
* @param node
* Node to retrieve the description style from.
* @return DescriptionStyle style object
@@ -340,9 +340,9 @@ public class InheritedDecorator implements IDecorator {
private NotificationListener notificationListener = new NotificationListener() {
/**
- *
+ *
* @see org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener#notifyChanged(org.eclipse.emf.common.notify.Notification)
- *
+ *
* @param notification
*/
@Override
@@ -427,7 +427,7 @@ public class InheritedDecorator implements IDecorator {
/**
* Tests if the element can be inherited
- *
+ *
* @param semanticElement
* the element to test
* @return <code>true</code> if the element can be inherited
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecoratorProvider.java
index 39f51b7f6d4..d07809b2e46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/InheritedDecoratorProvider.java
@@ -22,10 +22,10 @@ import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
import org.eclipse.gmf.runtime.notation.Node;
/**
- *
+ *
* Provide the decorator for the Inheritance
- *
- * @deprecated Replaced with the generic {@link org.eclipse.papyrus.infra.gmfdiag.common.decoration.ExternalReferenceMarker}
+ *
+ * @deprecated Replaced with the generic org.eclipse.papyrus.infra.gmfdiag.common.decoration.ExternalReferenceMarker
*/
@Deprecated
public class InheritedDecoratorProvider extends AbstractProvider implements IDecoratorProvider {
@@ -34,9 +34,9 @@ public class InheritedDecoratorProvider extends AbstractProvider implements IDec
public static final String GENERALIZATION = "Generalization"; //$NON-NLS-1$
/**
- *
+ *
* @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider#createDecorators(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget)
- *
+ *
* @param decoratorTarget
*/
@Override
@@ -49,7 +49,7 @@ public class InheritedDecoratorProvider extends AbstractProvider implements IDec
/*
* (non-Javadoc)
- *
+ *
* @see
* org.eclipse.gmf.runtime.common.core.internal.service.IProvider#provides
* (org.eclipse.gmf.runtime.common.core.service.IOperation)
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypePropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypePropertyEditPart.java
index de000ecace5..2458e6bfd2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypePropertyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypePropertyEditPart.java
@@ -196,7 +196,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
*/
protected String getLabelTextHelper(IFigure figure) {
if(figure instanceof WrappingLabel) {
- return ((WrappingLabel)figure).isTextWrapOn().getText();
+ return ((WrappingLabel)figure).getText();
} else if(figure instanceof ILabelFigure) {
return ((ILabelFigure)figure).getText();
} else {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
index 48a948fc2c6..33392942fbb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
@@ -2,8 +2,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",
- org.eclipse.emf.facet.widgets.nattable.workbench;bundle-version="0.1.0"
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier

Back to the top