Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-02-14 13:11:03 -0500
committerCamille Letavernier2014-02-14 13:11:03 -0500
commit768c45185589e6d3c09e8109da63f5303e26d3aa (patch)
tree06817748fe4367ee8ffc95b56e40380513fb4c39
parentd8e62a7c5cfd0156abba7ebe104d66be9dff43d4 (diff)
downloadorg.eclipse.papyrus-768c45185589e6d3c09e8109da63f5303e26d3aa.tar.gz
org.eclipse.papyrus-768c45185589e6d3c09e8109da63f5303e26d3aa.tar.xz
org.eclipse.papyrus-768c45185589e6d3c09e8109da63f5303e26d3aa.zip
[Releng] Remove the erroneous Java 1.6 dependency for diagrams
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndEditPolicy.java5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationUseLabelEditPolicy.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ParameterLabelEditPolicy.java5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java18
10 files changed, 16 insertions, 29 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java
index b0577a8d5f9..36d166efc2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java
@@ -76,10 +76,9 @@ public class InstanceSpecificationNameLabelEditPolicy extends AbstractMaskManage
/**
* @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy#getMasks()
- *
+ *
* @return
*/
- @Override
public Map<String, String> getMasks() {
return masks;
}
@@ -127,7 +126,7 @@ public class InstanceSpecificationNameLabelEditPolicy extends AbstractMaskManage
/**
* @see org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy#refreshDisplay()
- *
+ *
*/
@Override
public void refreshDisplay() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndEditPolicy.java
index dc4481a2ae2..9c1fb1dc5eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndEditPolicy.java
@@ -74,7 +74,6 @@ public class DisplayAssociationEndEditPolicy extends AbstractMaskManagedEditPoli
/**
* {@inheritDoc}
*/
- @Override
public Map<String, String> getMasks() {
return propertyLabelHelper.getMasks();
}
@@ -134,7 +133,7 @@ public class DisplayAssociationEndEditPolicy extends AbstractMaskManagedEditPoli
/**
* notifies that the the property has changed.
- *
+ *
* @param property
* the property that has changed
* @param notification
@@ -213,7 +212,7 @@ public class DisplayAssociationEndEditPolicy extends AbstractMaskManagedEditPoli
/**
* notifies that the type of the property has changed.
- *
+ *
* @param type
* the type of the property that has changed
* @param notification
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java
index 1b2bf07eb1d..752aad2a9a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java
@@ -72,7 +72,6 @@ public class OperationLabelEditPolicy extends AbstractMaskManagedEditPolicy {
/**
* {@inheritDoc}
*/
- @Override
public Map<String, String> getMasks() {
return OperationLabelHelper.getInstance().getMasks();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java
index 3d16b696366..e8e80334282 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java
@@ -71,7 +71,6 @@ public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy {
/**
* {@inheritDoc}
*/
- @Override
public Map<String, String> getMasks() {
return PropertyLabelHelper.getInstance().getMasks();
}
@@ -124,7 +123,7 @@ public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy {
/**
* notifies that the the property has changed.
- *
+ *
* @param property
* the property that has changed
* @param notification
@@ -203,7 +202,7 @@ public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy {
/**
* notifies that the type of the property has changed.
- *
+ *
* @param type
* the type of the property that has changed
* @param notification
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationUseLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationUseLabelEditPolicy.java
index b3513969670..a9cb8dabb6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationUseLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationUseLabelEditPolicy.java
@@ -83,7 +83,6 @@ public class CollaborationUseLabelEditPolicy extends AbstractMaskManagedEditPoli
/**
* {@inheritDoc}
*/
- @Override
public Map<String, String> getMasks() {
return CollaborationUseLabelHelper.getInstance().getMasks();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ParameterLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ParameterLabelEditPolicy.java
index b6e342c4eeb..29dde0797e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ParameterLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ParameterLabelEditPolicy.java
@@ -61,7 +61,6 @@ public class ParameterLabelEditPolicy extends AbstractMaskManagedEditPolicy {
/**
* {@inheritDoc}
*/
- @Override
public Map<String, String> getMasks() {
return ParameterLabelHelper.getInstance().getMasks();
}
@@ -110,7 +109,7 @@ public class ParameterLabelEditPolicy extends AbstractMaskManagedEditPolicy {
/**
* notifies that the the parameter has changed.
- *
+ *
* @param parameter
* the parameter that has changed
* @param notification
@@ -193,7 +192,7 @@ public class ParameterLabelEditPolicy extends AbstractMaskManagedEditPolicy {
/**
* notifies that the type of the parameter has changed.
- *
+ *
* @param type
* the type of the parameter that has changed
* @param notification
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java
index 705575656b2..818c69a7a42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java
@@ -116,7 +116,6 @@ public class LifelineLabelEditPolicy extends AbstractMaskManagedEditPolicy {
/**
* {@inheritDoc}
*/
- @Override
public Map<String, String> getMasks() {
return LifelineLabelHelper.getInstance().getMasks();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java
index 745c7251962..0c16e08182c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java
@@ -50,7 +50,6 @@ public class MessageLabelEditPolicy extends AbstractMaskManagedEditPolicy {
return MessageLabelHelper.getInstance().getDefaultValue();
}
- @Override
public Map<String, String> getMasks() {
return MessageLabelHelper.getInstance().getMasks();
}
@@ -213,7 +212,6 @@ public class MessageLabelEditPolicy extends AbstractMaskManagedEditPolicy {
class DefaultValueListener implements NotificationListener {
- @Override
public void notifyChanged(Notification notification) {
refreshDisplay();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java
index 72b6f82121c..8e1c21fb78a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java
@@ -78,12 +78,10 @@ public class MessageCustomParser extends MessageFormatParser implements ISemanti
return result;
}
- @Override
public boolean areSemanticElementsAffected(EObject listener, Object notification) {
return true;
}
- @Override
public List<Element> getSemanticElementsBeingParsed(EObject element) {
List<Element> semanticElementsBeingParsed = new ArrayList<Element>();
if(element instanceof Message) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java
index d161016dff0..d39b536e098 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java
@@ -64,7 +64,7 @@ import org.eclipse.uml2.uml.UMLPackage;
/**
* Display type name as tooltip of each node element
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=402964
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TooltipUtil {
@@ -161,7 +161,7 @@ public class TooltipUtil {
/**
* Constructor.
- *
+ *
*/
public TooltipEditPolicy(TooltipUpdater updater) {
this.updater = updater;
@@ -216,9 +216,9 @@ public class TooltipUtil {
/**
* Constructor.
- *
+ *
* @param updater
- *
+ *
*/
public TooltipFigure(TooltipUpdater updater) {
this.updater = updater;
@@ -239,7 +239,7 @@ public class TooltipUtil {
/**
* @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
- *
+ *
* @param wHint
* @param hHint
* @return
@@ -298,7 +298,7 @@ public class TooltipUtil {
/**
* Constructor.
- *
+ *
*/
public EditPartTooltipUpdater(GraphicalEditPart editPart) {
Assert.isNotNull(editPart);
@@ -307,10 +307,9 @@ public class TooltipUtil {
/**
* @see org.eclipse.papyrus.uml.diagram.sequence.util.TooltipUtil.TooltipUpdater#getTooltipName()
- *
+ *
* @return
*/
- @Override
public String getTooltipName() {
if(editPart instanceof CombinedFragment2EditPart) {
return "Co Region";
@@ -362,10 +361,9 @@ public class TooltipUtil {
/**
* @see org.eclipse.papyrus.uml.diagram.sequence.util.TooltipUtil.TooltipUpdater#getTooltipDescription()
- *
+ *
* @return
*/
- @Override
public String getTooltipDescription() {
//CoRegion
// if(editPart instanceof CombinedFragment2EditPart) {

Back to the top