Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authormgolubev2015-05-06 22:21:50 +0000
committerRemi Schnekenburger2015-05-26 09:58:30 +0000
commitba7fe9b9057f8d1d0e7b1bd39ead0e0db58f8f7a (patch)
treef4fa5bf5482fc8b735a0b36e1f6f2ed9ddf76704 /plugins
parent1f75afbb40be3843979a7124545256a6806be17e (diff)
downloadorg.eclipse.papyrus-ba7fe9b9057f8d1d0e7b1bd39ead0e0db58f8f7a.tar.gz
org.eclipse.papyrus-ba7fe9b9057f8d1d0e7b1bd39ead0e0db58f8f7a.tar.xz
org.eclipse.papyrus-ba7fe9b9057f8d1d0e7b1bd39ead0e0db58f8f7a.zip
Bug 458438 [Activity Diagram] Hyperlink dialogue not accessable for Actions in a
Partition Also bug 453718 and bug 441370 Change-Id: If1f5aadd826d2538f961fbc2eb549317490f74b8 Signed-off-by: mgolubev <golubev@montages.com> Reviewed-on: https://git.eclipse.org/r/47385 Reviewed-by: Remi Schnekenburger <remi.schnekenburger@cea.fr> Tested-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend17
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ShapeCompartmentWithoutScrollbarsEditPart.java35
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionActivityPartitionContentCompartmentEditPart.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java19
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeStructuredActivityNodeContentCompartmentEditPart.java19
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeStructuredActivityNodeContentCompartmentEditPart.java19
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java19
11 files changed, 77 insertions, 136 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
index a8f6d37b299..8ec2edaf53e 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
@@ -17,6 +17,7 @@ import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.gmf.codegen.gmfgen.GenCompartment
import xpt.diagram.editparts.Common
+import org.eclipse.papyrus.papyrusgmfgenextension.ExtendedGenView
//DOCUMENTATION: PapyrusGenCode
//Overload only the creation of editPolicies in order to add the paste edit policy
@@ -48,5 +49,21 @@ import xpt.diagram.editparts.Common
return super.getTargetEditPart(request);
}
'''
+
+ override createFigure(GenCompartment it) {
+ if (hasExternalSuperClass(it,'org.eclipse.papyrus.uml.diagram.activity.edit.part.ShapeCompartmentWithoutScrollbarsEditPart')) {
+ '''
+ @Override
+ public org.eclipse.draw2d.IFigure createFigure() {
+ return super.createFigure();
+ }
+ '''
+ } else {
+ super.createFigure(it);
+ }
+ }
+ def boolean hasExternalSuperClass(GenCompartment it, String className) {
+ return it.eResource.allContents.filter(typeof(ExtendedGenView)).filter [v | (v.genView.contains(it) && v.superOwnedEditPart.equals(className))].size > 0;
+ }
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java
index f48af29b966..8ea1e027ed9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java
@@ -14,9 +14,6 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.edit.part.ActivityGroup;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeStructuredActivityNodeContentCompartmentEditPart;
@@ -33,23 +30,6 @@ public class CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart exte
}
/**
- * remove the top border,hide scrollbar
- */
- @Override
- public IFigure createFigure() {
- ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
- result.setTitleVisibility(false);
- // remove the top border
- result.setBorder(null);
- // Hide scrollBar
- result.getScrollPane().setEnabled(false);
- result.getScrollPane().setHorizontalScrollBar(null);
- result.getScrollPane().setVerticalScrollBar(null);
- result.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
- return result;
- }
-
- /**
* Unselectable Compartment
*/
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java
index d8ee7539da0..1ecf657c8d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java
@@ -14,9 +14,6 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.edit.part.ActivityGroup;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.activity.edit.parts.SequenceNodeStructuredActivityNodeContentCompartmentEditPart;
@@ -33,23 +30,6 @@ public class CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart
}
/**
- * remove the top border,hide scrollbar
- */
- @Override
- public IFigure createFigure() {
- ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
- result.setTitleVisibility(false);
- // remove the top border
- result.setBorder(null);
- // Hide scrollBar
- result.getScrollPane().setEnabled(false);
- result.getScrollPane().setHorizontalScrollBar(null);
- result.getScrollPane().setVerticalScrollBar(null);
- result.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
- return result;
- }
-
- /**
* Unselectable EditPart
*/
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java
index 8ae422547cf..fcd99bb86b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java
@@ -14,9 +14,6 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.edit.part.ActivityGroup;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.activity.edit.parts.StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart;
@@ -33,23 +30,6 @@ public class CustomStructuredActivityNodeStructuredActivityNodeContentCompartmen
}
/**
- * Remove polluting scroll bar
- */
- @Override
- public IFigure createFigure() {
- ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
- result.setTitleVisibility(false);
- // remove the top border
- result.setBorder(null);
- // Hide scrollBar
- result.getScrollPane().setEnabled(false);
- result.getScrollPane().setHorizontalScrollBar(null);
- result.getScrollPane().setVerticalScrollBar(null);
- result.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
- return result;
- }
-
- /**
* Make this compartment unselectable
*/
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ShapeCompartmentWithoutScrollbarsEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ShapeCompartmentWithoutScrollbarsEditPart.java
new file mode 100644
index 00000000000..2600edfafae
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ShapeCompartmentWithoutScrollbarsEditPart.java
@@ -0,0 +1,35 @@
+package org.eclipse.papyrus.uml.diagram.activity.edit.part;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.ScrollPane;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class ShapeCompartmentWithoutScrollbarsEditPart extends ShapeCompartmentEditPart {
+
+ public ShapeCompartmentWithoutScrollbarsEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * remove the bottom border, remove scrollbars
+ */
+ @Override
+ public IFigure createFigure() {
+ return setupNoScrolls((ShapeCompartmentFigure) super.createFigure());
+ }
+
+ private IFigure setupNoScrolls(ShapeCompartmentFigure figure) {
+ figure.setTitleVisibility(false);
+ // remove the top border
+ figure.setBorder(null);
+ // remove scrollbars
+ figure.getScrollPane().setHorizontalScrollBar(null);
+ figure.getScrollPane().setVerticalScrollBar(null);
+ figure.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
+ // result.getScrollPane().getViewport().setContentsTracksHeight(true);
+ return figure;
+ }
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
index 839c70960d8..a72a05a5306 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
@@ -20925,5 +20925,10 @@
genExternalNodeLabel="/0/@diagram/@childNodes.81/@labels.0 /0/@diagram/@childNodes.3/@labels.1 /0/@diagram/@childNodes.4/@labels.1 /0/@diagram/@childNodes.5/@labels.1 /0/@diagram/@childNodes.7/@labels.2 /0/@diagram/@childNodes.8/@labels.2 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@childNodes.10/@labels.1 /0/@diagram/@childNodes.12/@labels.2 /0/@diagram/@childNodes.13/@labels.2 /0/@diagram/@childNodes.14/@labels.1 /0/@diagram/@childNodes.15/@labels.1 /0/@diagram/@childNodes.17/@labels.2 /0/@diagram/@childNodes.18/@labels.2 /0/@diagram/@childNodes.19/@labels.1 /0/@diagram/@childNodes.20/@labels.1 /0/@diagram/@childNodes.21/@labels.2 /0/@diagram/@childNodes.22/@labels.2 /0/@diagram/@childNodes.23/@labels.1 /0/@diagram/@childNodes.32/@labels.2 /0/@diagram/@childNodes.33/@labels.1 /0/@diagram/@childNodes.34/@labels.1 /0/@diagram/@childNodes.35/@labels.2 /0/@diagram/@childNodes.38/@labels.2 /0/@diagram/@childNodes.39/@labels.2 /0/@diagram/@childNodes.40/@labels.1 /0/@diagram/@childNodes.41/@labels.2 /0/@diagram/@childNodes.42/@labels.2 /0/@diagram/@childNodes.43/@labels.1 /0/@diagram/@childNodes.45/@labels.2 /0/@diagram/@childNodes.46/@labels.2 /0/@diagram/@childNodes.47/@labels.1 /0/@diagram/@childNodes.48/@labels.2 /0/@diagram/@childNodes.49/@labels.2 /0/@diagram/@childNodes.50/@labels.1 /0/@diagram/@childNodes.52/@labels.2 /0/@diagram/@childNodes.53/@labels.1 /0/@diagram/@childNodes.55/@labels.1 /0/@diagram/@childNodes.77/@labels.1 /0/@diagram/@childNodes.80/@labels.1 /0/@diagram/@childNodes.83/@labels.1 /0/@diagram/@childNodes.101/@labels.1 /0/@diagram/@childNodes.53/@labels.0 /0/@diagram/@childNodes.7/@labels.0 /0/@diagram/@childNodes.7/@labels.1 /0/@diagram/@childNodes.8/@labels.0 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@childNodes.9/@labels.0 /0/@diagram/@childNodes.10/@labels.0 /0/@diagram/@childNodes.12/@labels.0 /0/@diagram/@childNodes.12/@labels.1 /0/@diagram/@childNodes.13/@labels.0 /0/@diagram/@childNodes.13/@labels.1 /0/@diagram/@childNodes.14/@labels.0 /0/@diagram/@childNodes.15/@labels.0 /0/@diagram/@childNodes.17/@labels.0 /0/@diagram/@childNodes.17/@labels.1 /0/@diagram/@childNodes.18/@labels.0 /0/@diagram/@childNodes.18/@labels.1 /0/@diagram/@childNodes.19/@labels.0 /0/@diagram/@childNodes.20/@labels.0 /0/@diagram/@childNodes.21/@labels.0 /0/@diagram/@childNodes.21/@labels.1 /0/@diagram/@childNodes.22/@labels.0 /0/@diagram/@childNodes.22/@labels.1 /0/@diagram/@childNodes.23/@labels.0 /0/@diagram/@childNodes.32/@labels.1 /0/@diagram/@childNodes.35/@labels.1 /0/@diagram/@childNodes.36/@labels.1 /0/@diagram/@childNodes.38/@labels.0 /0/@diagram/@childNodes.38/@labels.1 /0/@diagram/@childNodes.39/@labels.0 /0/@diagram/@childNodes.39/@labels.1 /0/@diagram/@childNodes.40/@labels.0 /0/@diagram/@childNodes.41/@labels.0 /0/@diagram/@childNodes.41/@labels.1 /0/@diagram/@childNodes.42/@labels.0 /0/@diagram/@childNodes.42/@labels.1 /0/@diagram/@childNodes.43/@labels.0 /0/@diagram/@childNodes.45/@labels.0 /0/@diagram/@childNodes.45/@labels.1 /0/@diagram/@childNodes.46/@labels.0 /0/@diagram/@childNodes.46/@labels.1 /0/@diagram/@childNodes.47/@labels.0 /0/@diagram/@childNodes.48/@labels.0 /0/@diagram/@childNodes.48/@labels.1 /0/@diagram/@childNodes.49/@labels.0 /0/@diagram/@childNodes.49/@labels.1 /0/@diagram/@childNodes.50/@labels.0 /0/@diagram/@childNodes.52/@labels.1 /0/@diagram/@childNodes.55/@labels.0 /0/@diagram/@childNodes.77/@labels.0 /0/@diagram/@childNodes.80/@labels.0 /0/@diagram/@childNodes.83/@labels.0 /0/@diagram/@childNodes.84/@labels.0 /0/@diagram/@childNodes.84/@labels.1 /0/@diagram/@childNodes.101/@labels.0 /0/@diagram/@childNodes.113/@labels.1 /0/@diagram/@childNodes.116/@labels.0 /0/@diagram/@childNodes.116/@labels.1 /0/@diagram/@childNodes.117/@labels.0 /0/@diagram/@childNodes.117/@labels.1 /0/@diagram/@childNodes.118/@labels.0 /0/@diagram/@childNodes.118/@labels.1 /0/@diagram/@childNodes.118/@labels.2 /0/@diagram/@childNodes.119/@labels.0 /0/@diagram/@childNodes.119/@labels.1 /0/@diagram/@childNodes.119/@labels.2 /0/@diagram/@childNodes.120/@labels.0 /0/@diagram/@childNodes.120/@labels.1 /0/@diagram/@childNodes.121/@labels.0 /0/@diagram/@childNodes.121/@labels.1 /0/@diagram/@childNodes.121/@labels.2 /0/@diagram/@childNodes.122/@labels.0 /0/@diagram/@childNodes.122/@labels.1 /0/@diagram/@childNodes.122/@labels.2 /0/@diagram/@childNodes.124/@labels.1 /0/@diagram/@childNodes.125/@labels.1 /0/@diagram/@childNodes.126/@labels.1 /0/@diagram/@childNodes.127/@labels.2 /0/@diagram/@childNodes.128/@labels.2 /0/@diagram/@childNodes.129/@labels.2 /0/@diagram/@childNodes.130/@labels.2 /0/@diagram/@childNodes.124/@labels.0 /0/@diagram/@childNodes.125/@labels.0 /0/@diagram/@childNodes.126/@labels.0 /0/@diagram/@childNodes.127/@labels.0 /0/@diagram/@childNodes.127/@labels.1 /0/@diagram/@childNodes.128/@labels.0 /0/@diagram/@childNodes.128/@labels.1 /0/@diagram/@childNodes.129/@labels.0 /0/@diagram/@childNodes.129/@labels.1 /0/@diagram/@childNodes.130/@labels.0 /0/@diagram/@childNodes.130/@labels.1 /0/@diagram/@childNodes.132/@labels.1 /0/@diagram/@childNodes.133/@labels.1 /0/@diagram/@childNodes.134/@labels.2 /0/@diagram/@childNodes.135/@labels.2 /0/@diagram/@childNodes.132/@labels.0 /0/@diagram/@childNodes.133/@labels.0 /0/@diagram/@childNodes.134/@labels.0 /0/@diagram/@childNodes.134/@labels.1 /0/@diagram/@childNodes.135/@labels.0 /0/@diagram/@childNodes.135/@labels.1 /0/@diagram/@childNodes.137/@labels.1 /0/@diagram/@childNodes.138/@labels.2 /0/@diagram/@childNodes.139/@labels.2 /0/@diagram/@childNodes.141/@labels.1 /0/@diagram/@childNodes.142/@labels.1 /0/@diagram/@childNodes.143/@labels.2 /0/@diagram/@childNodes.144/@labels.2 /0/@diagram/@childNodes.146/@labels.1 /0/@diagram/@childNodes.147/@labels.2 /0/@diagram/@childNodes.148/@labels.2 /0/@diagram/@childNodes.137/@labels.0 /0/@diagram/@childNodes.138/@labels.0 /0/@diagram/@childNodes.138/@labels.1 /0/@diagram/@childNodes.139/@labels.0 /0/@diagram/@childNodes.139/@labels.1 /0/@diagram/@childNodes.141/@labels.0 /0/@diagram/@childNodes.142/@labels.0 /0/@diagram/@childNodes.143/@labels.0 /0/@diagram/@childNodes.143/@labels.1 /0/@diagram/@childNodes.144/@labels.0 /0/@diagram/@childNodes.144/@labels.1 /0/@diagram/@childNodes.146/@labels.0 /0/@diagram/@childNodes.147/@labels.0 /0/@diagram/@childNodes.147/@labels.1 /0/@diagram/@childNodes.148/@labels.0 /0/@diagram/@childNodes.148/@labels.1 /0/@diagram/@childNodes.150/@labels.1 /0/@diagram/@childNodes.151/@labels.2 /0/@diagram/@childNodes.152/@labels.2 /0/@diagram/@childNodes.150/@labels.0 /0/@diagram/@childNodes.151/@labels.0 /0/@diagram/@childNodes.151/@labels.1 /0/@diagram/@childNodes.152/@labels.0 /0/@diagram/@childNodes.152/@labels.1 /0/@diagram/@childNodes.154/@labels.0 /0/@diagram/@childNodes.154/@labels.1 /0/@diagram/@childNodes.156/@labels.1 /0/@diagram/@childNodes.157/@labels.2 /0/@diagram/@childNodes.158/@labels.2 /0/@diagram/@childNodes.160/@labels.1 /0/@diagram/@childNodes.161/@labels.1 /0/@diagram/@childNodes.162/@labels.2 /0/@diagram/@childNodes.163/@labels.2 /0/@diagram/@childNodes.156/@labels.0 /0/@diagram/@childNodes.157/@labels.0 /0/@diagram/@childNodes.157/@labels.1 /0/@diagram/@childNodes.158/@labels.0 /0/@diagram/@childNodes.158/@labels.1 /0/@diagram/@childNodes.160/@labels.0 /0/@diagram/@childNodes.161/@labels.0 /0/@diagram/@childNodes.162/@labels.0 /0/@diagram/@childNodes.162/@labels.1 /0/@diagram/@childNodes.163/@labels.0 /0/@diagram/@childNodes.163/@labels.1 /0/@diagram/@childNodes.165/@labels.1 /0/@diagram/@childNodes.166/@labels.1 /0/@diagram/@childNodes.167/@labels.2 /0/@diagram/@childNodes.168/@labels.2 /0/@diagram/@childNodes.165/@labels.0 /0/@diagram/@childNodes.166/@labels.0 /0/@diagram/@childNodes.167/@labels.0 /0/@diagram/@childNodes.167/@labels.1 /0/@diagram/@childNodes.168/@labels.0 /0/@diagram/@childNodes.168/@labels.1 /0/@diagram/@childNodes.169/@labels.1 /0/@diagram/@childNodes.170/@labels.1 /0/@diagram/@childNodes.171/@labels.2 /0/@diagram/@childNodes.172/@labels.2 /0/@diagram/@childNodes.170/@labels.0 /0/@diagram/@childNodes.171/@labels.0 /0/@diagram/@childNodes.171/@labels.1 /0/@diagram/@childNodes.172/@labels.0 /0/@diagram/@childNodes.172/@labels.1 /0/@diagram/@childNodes.97/@labels.1 /0/@diagram/@childNodes.98/@labels.2 /0/@diagram/@childNodes.99/@labels.2 /0/@diagram/@childNodes.103/@labels.1 /0/@diagram/@childNodes.104/@labels.1 /0/@diagram/@childNodes.105/@labels.2 /0/@diagram/@childNodes.106/@labels.2 /0/@diagram/@childNodes.107/@labels.2 /0/@diagram/@childNodes.108/@labels.2 /0/@diagram/@childNodes.110/@labels.2 /0/@diagram/@childNodes.111/@labels.2 /0/@diagram/@childNodes.112/@labels.2 /0/@diagram/@childNodes.97/@labels.0 /0/@diagram/@childNodes.98/@labels.0 /0/@diagram/@childNodes.98/@labels.1 /0/@diagram/@childNodes.99/@labels.0 /0/@diagram/@childNodes.99/@labels.1 /0/@diagram/@childNodes.103/@labels.0 /0/@diagram/@childNodes.104/@labels.0 /0/@diagram/@childNodes.105/@labels.0 /0/@diagram/@childNodes.105/@labels.1 /0/@diagram/@childNodes.106/@labels.0 /0/@diagram/@childNodes.106/@labels.1 /0/@diagram/@childNodes.107/@labels.0 /0/@diagram/@childNodes.107/@labels.1 /0/@diagram/@childNodes.108/@labels.0 /0/@diagram/@childNodes.108/@labels.1 /0/@diagram/@childNodes.110/@labels.0 /0/@diagram/@childNodes.110/@labels.1 /0/@diagram/@childNodes.111/@labels.0 /0/@diagram/@childNodes.111/@labels.1 /0/@diagram/@childNodes.112/@labels.0 /0/@diagram/@childNodes.112/@labels.1 /0/@diagram/@childNodes.86/@labels.1 /0/@diagram/@childNodes.87/@labels.1 /0/@diagram/@childNodes.88/@labels.1 /0/@diagram/@childNodes.89/@labels.2 /0/@diagram/@childNodes.90/@labels.2 /0/@diagram/@childNodes.91/@labels.2 /0/@diagram/@childNodes.92/@labels.2 /0/@diagram/@childNodes.93/@labels.2 /0/@diagram/@childNodes.94/@labels.2 /0/@diagram/@childNodes.95/@labels.1 /0/@diagram/@childNodes.86/@labels.0 /0/@diagram/@childNodes.87/@labels.0 /0/@diagram/@childNodes.88/@labels.0 /0/@diagram/@childNodes.89/@labels.0 /0/@diagram/@childNodes.89/@labels.1 /0/@diagram/@childNodes.90/@labels.0 /0/@diagram/@childNodes.90/@labels.1 /0/@diagram/@childNodes.91/@labels.0 /0/@diagram/@childNodes.91/@labels.1 /0/@diagram/@childNodes.92/@labels.0 /0/@diagram/@childNodes.92/@labels.1 /0/@diagram/@childNodes.93/@labels.0 /0/@diagram/@childNodes.93/@labels.1 /0/@diagram/@childNodes.94/@labels.0 /0/@diagram/@childNodes.94/@labels.1 /0/@diagram/@childNodes.95/@labels.0 /0/@diagram/@childNodes.61/@labels.1 /0/@diagram/@childNodes.62/@labels.2 /0/@diagram/@childNodes.63/@labels.2 /0/@diagram/@childNodes.64/@labels.1 /0/@diagram/@childNodes.65/@labels.1 /0/@diagram/@childNodes.66/@labels.1 /0/@diagram/@childNodes.70/@labels.2 /0/@diagram/@childNodes.71/@labels.2 /0/@diagram/@childNodes.72/@labels.1 /0/@diagram/@childNodes.61/@labels.0 /0/@diagram/@childNodes.62/@labels.0 /0/@diagram/@childNodes.62/@labels.1 /0/@diagram/@childNodes.63/@labels.0 /0/@diagram/@childNodes.63/@labels.1 /0/@diagram/@childNodes.64/@labels.0 /0/@diagram/@childNodes.65/@labels.0 /0/@diagram/@childNodes.66/@labels.0 /0/@diagram/@childNodes.70/@labels.0 /0/@diagram/@childNodes.70/@labels.1 /0/@diagram/@childNodes.71/@labels.0 /0/@diagram/@childNodes.71/@labels.1 /0/@diagram/@childNodes.72/@labels.0 /0/@diagram/@childNodes.69/@labels.1 /0/@diagram/@childNodes.69/@labels.0 /0/@diagram/@childNodes.174/@labels.1 /0/@diagram/@childNodes.175/@labels.2 /0/@diagram/@childNodes.176/@labels.2 /0/@diagram/@childNodes.177/@labels.1 /0/@diagram/@childNodes.174/@labels.0 /0/@diagram/@childNodes.175/@labels.0 /0/@diagram/@childNodes.175/@labels.1 /0/@diagram/@childNodes.176/@labels.0 /0/@diagram/@childNodes.176/@labels.1 /0/@diagram/@childNodes.177/@labels.0"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:GenerateUsingElementTypeCreationCommand"/>
+ <extensionNodes
+ xsi:type="papyrusgmfgenextension:ExtendedGenView"
+ genView="/0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8"
+ name="ShapeCompartmentWithoutScrollbarsEditPart"
+ superOwnedEditPart="org.eclipse.papyrus.uml.diagram.activity.edit.part.ShapeCompartmentWithoutScrollbarsEditPart"/>
</papyrusgmfgenextension:PapyrusExtensionRootNode>
</xmi:XMI>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionActivityPartitionContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionActivityPartitionContentCompartmentEditPart.java
index 53768f3a225..c6a99066469 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionActivityPartitionContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionActivityPartitionContentCompartmentEditPart.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.uml.diagram.activity.edit.parts;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -22,16 +21,15 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
import org.eclipse.papyrus.uml.diagram.activity.activitygroup.editpolicy.ActivityPartitionCompartmentCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.part.ShapeCompartmentWithoutScrollbarsEditPart;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy;
import org.eclipse.papyrus.uml.diagram.activity.part.Messages;
@@ -40,7 +38,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
/**
* @generated
*/
-public class ActivityPartitionActivityPartitionContentCompartmentEditPart extends ShapeCompartmentEditPart {
+public class ActivityPartitionActivityPartitionContentCompartmentEditPart extends ShapeCompartmentWithoutScrollbarsEditPart {
/**
* @generated
@@ -63,21 +61,11 @@ public class ActivityPartitionActivityPartitionContentCompartmentEditPart extend
}
/**
- * @generated NOT (remove the bottom border, remove scrollbars)
+ * @generated
*/
@Override
public IFigure createFigure() {
- ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
- result.setTitleVisibility(false);
- // remove the top border
- result.setBorder(null);
- // remove scrollbars
- result.getScrollPane().setEnabled(false);
- result.getScrollPane().setHorizontalScrollBar(null);
- result.getScrollPane().setVerticalScrollBar(null);
- result.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
- // result.getScrollPane().getViewport().setContentsTracksHeight(true);
- return result;
+ return super.createFigure();
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java
index 51902e40cb7..d7ce81e2dcb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.uml.diagram.activity.edit.parts;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -22,16 +21,15 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
import org.eclipse.papyrus.uml.diagram.activity.activitygroup.editpolicy.InterruptibleActivityRegionCompartmentCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.part.ShapeCompartmentWithoutScrollbarsEditPart;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy;
import org.eclipse.papyrus.uml.diagram.activity.part.Messages;
@@ -40,7 +38,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
/**
* @generated
*/
-public class InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart extends ShapeCompartmentEditPart {
+public class InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart extends ShapeCompartmentWithoutScrollbarsEditPart {
/**
* @generated
@@ -63,20 +61,11 @@ public class InterruptibleActivityRegionInterruptibleActivityRegionContentCompar
}
/**
- * @generated NOT (remove the top border,hide scrollbar)
+ * @generated
*/
@Override
public IFigure createFigure() {
- ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
- result.setTitleVisibility(false);
- // remove the top border
- result.setBorder(null);
- // Hide scrollBar
- result.getScrollPane().setEnabled(false);
- result.getScrollPane().setHorizontalScrollBar(null);
- result.getScrollPane().setVerticalScrollBar(null);
- result.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
- return result;
+ return super.createFigure();
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeStructuredActivityNodeContentCompartmentEditPart.java
index 8cf73f3527d..d89656953f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeStructuredActivityNodeContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeStructuredActivityNodeContentCompartmentEditPart.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.uml.diagram.activity.edit.parts;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -22,15 +21,14 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.part.ShapeCompartmentWithoutScrollbarsEditPart;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy;
import org.eclipse.papyrus.uml.diagram.activity.part.Messages;
@@ -39,7 +37,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
/**
* @generated
*/
-public class LoopNodeStructuredActivityNodeContentCompartmentEditPart extends ShapeCompartmentEditPart {
+public class LoopNodeStructuredActivityNodeContentCompartmentEditPart extends ShapeCompartmentWithoutScrollbarsEditPart {
/**
* @generated
@@ -62,20 +60,11 @@ public class LoopNodeStructuredActivityNodeContentCompartmentEditPart extends Sh
}
/**
- * @generated NOT (remove the top border,hide scrollbar)
+ * @generated
*/
@Override
public IFigure createFigure() {
- ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
- result.setTitleVisibility(false);
- // remove the top border
- result.setBorder(null);
- // Hide scrollBar
- result.getScrollPane().setEnabled(false);
- result.getScrollPane().setHorizontalScrollBar(null);
- result.getScrollPane().setVerticalScrollBar(null);
- result.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
- return result;
+ return super.createFigure();
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeStructuredActivityNodeContentCompartmentEditPart.java
index 7132964e686..a52e3d67ee6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeStructuredActivityNodeContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeStructuredActivityNodeContentCompartmentEditPart.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.uml.diagram.activity.edit.parts;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -22,15 +21,14 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.part.ShapeCompartmentWithoutScrollbarsEditPart;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy;
import org.eclipse.papyrus.uml.diagram.activity.part.Messages;
@@ -39,7 +37,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
/**
* @generated
*/
-public class SequenceNodeStructuredActivityNodeContentCompartmentEditPart extends ShapeCompartmentEditPart {
+public class SequenceNodeStructuredActivityNodeContentCompartmentEditPart extends ShapeCompartmentWithoutScrollbarsEditPart {
/**
* @generated
@@ -62,20 +60,11 @@ public class SequenceNodeStructuredActivityNodeContentCompartmentEditPart extend
}
/**
- * @generated NOT (remove the top border,hide scrollbar)
+ * @generated
*/
@Override
public IFigure createFigure() {
- ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
- result.setTitleVisibility(false);
- // remove the top border
- result.setBorder(null);
- // Hide scrollBar
- result.getScrollPane().setEnabled(false);
- result.getScrollPane().setHorizontalScrollBar(null);
- result.getScrollPane().setVerticalScrollBar(null);
- result.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
- return result;
+ return super.createFigure();
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java
index 6e4223c29fe..2cc547317f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.uml.diagram.activity.edit.parts;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -22,15 +21,14 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.part.ShapeCompartmentWithoutScrollbarsEditPart;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy;
import org.eclipse.papyrus.uml.diagram.activity.part.Messages;
@@ -39,7 +37,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
/**
* @generated
*/
-public class StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart extends ShapeCompartmentEditPart {
+public class StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart extends ShapeCompartmentWithoutScrollbarsEditPart {
/**
* @generated
@@ -62,20 +60,11 @@ public class StructuredActivityNodeStructuredActivityNodeContentCompartmentEditP
}
/**
- * @generated NOT (remove the top border,hide scrollbar)
+ * @generated
*/
@Override
public IFigure createFigure() {
- ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
- result.setTitleVisibility(false);
- // remove the top border
- result.setBorder(null);
- // Hide scrollBar
- result.getScrollPane().setEnabled(false);
- result.getScrollPane().setHorizontalScrollBar(null);
- result.getScrollPane().setVerticalScrollBar(null);
- result.getScrollPane().setScrollBarVisibility(ScrollPane.NEVER);
- return result;
+ return super.createFigure();
}
/**

Back to the top