Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2016-02-22 10:14:07 +0000
committerFlorian Noyrit2016-02-22 10:14:07 +0000
commitbd8eb4a1d14a5aa246561fc9be9e72088e26307b (patch)
treef1e6e1f77d8648f414840ce82f66a887a23a044a
parentd1e9f55d64b16bf78c3a52088ea4fd50091de769 (diff)
downloadorg.eclipse.papyrus-bd8eb4a1d14a5aa246561fc9be9e72088e26307b.tar.gz
org.eclipse.papyrus-bd8eb4a1d14a5aa246561fc9be9e72088e26307b.tar.xz
org.eclipse.papyrus-bd8eb4a1d14a5aa246561fc9be9e72088e26307b.zip
Fix failing Connector Reorient tests in IBD caused by fix proposed on
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java16
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/about.html28
2 files changed, 36 insertions, 8 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java
index 700cd42d05b..7f9e8608e46 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java
@@ -36,7 +36,7 @@ public class ConnectorReorientCommand extends ConnectorReorientSemanticCommand {
/**
* the new end view
*/
- private EObject newEndView;
+ private View newEndView;
/**
* the opposite end view
@@ -76,7 +76,7 @@ public class ConnectorReorientCommand extends ConnectorReorientSemanticCommand {
protected void initFields() {
super.initFields();
reorientedEdgeView = RequestParameterUtils.getReconnectedEdge(getRequest());
- newEndView = ((ReorientRelationshipRequest) getRequest()).getNewRelationshipEnd();
+ newEndView = RequestParameterUtils.getReconnectedEndView(getRequest());
if (this.reorientedEdgeView != null) {
oppositeEndView = (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) ? reorientedEdgeView.getTarget() : reorientedEdgeView.getSource();
} else {
@@ -236,12 +236,12 @@ public class ConnectorReorientCommand extends ConnectorReorientSemanticCommand {
*
* @return the new {@link Connector} end graphical parent.
*/
- protected Element getEndParent(EObject end) {
- if (end == null) {
- return null;
+ protected Element getEndParent(View endView) {
+ if (endView != null) {
+ EObject parent = ViewUtil.getContainerView(endView).getElement();
+ return (parent instanceof Element) ? (Element) parent : null;
}
- EObject parent = end.eContainer();
- return (parent instanceof Element) ? (Element) parent : null;
+ return null;
}
@@ -258,7 +258,7 @@ public class ConnectorReorientCommand extends ConnectorReorientSemanticCommand {
if ((newEndParent != null) && (newEndParent instanceof Property) && !(newEndParent instanceof Port)) {
// Only add PartWithPort for assembly (not for delegation)
- if (!EcoreUtil.isAncestor(this.newEndView, this.oppositeEndView)) {
+ if (!EcoreUtil.isAncestor(ViewUtil.getContainerView(this.newEndView), this.oppositeEndView)) {
partWithPort = (Property) newEndParent;
}
}
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/about.html b/releng/rcp/org.eclipse.papyrus.rcp/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>

Back to the top