Merge branch master to bugs/436547-shapes

Conflicts:
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java


Change-Id: Ia14dec8d9562282bf5981773dc0afe52548a7972
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>

2 files changed, 107 insertions, 105 deletions

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index 870288bda96..1cf9bdcda2e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -1,53 +1,54 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css,

- org.eclipse.papyrus.infra.gmfdiag.css.converters,

- org.eclipse.papyrus.infra.gmfdiag.css.dom,

- org.eclipse.papyrus.infra.gmfdiag.css.engine,

- org.eclipse.papyrus.infra.gmfdiag.css.engine.enginecopy,

- org.eclipse.papyrus.infra.gmfdiag.css.handler,

- org.eclipse.papyrus.infra.gmfdiag.css.helper,

- org.eclipse.papyrus.infra.gmfdiag.css.listener,

- org.eclipse.papyrus.infra.gmfdiag.css.lists,

- org.eclipse.papyrus.infra.gmfdiag.css.notation,

- org.eclipse.papyrus.infra.gmfdiag.css.preferences,

- org.eclipse.papyrus.infra.gmfdiag.css.provider,

- org.eclipse.papyrus.infra.gmfdiag.css.resource,

- org.eclipse.papyrus.infra.gmfdiag.css.service,

- org.eclipse.papyrus.infra.gmfdiag.css.style.impl,

- org.eclipse.papyrus.infra.gmfdiag.css.theme

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.e4.ui.css.core;bundle-version="0.10.0",

- org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.w3c.css.sac;bundle-version="1.3.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

- org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",

- org.w3c.dom.svg;bundle-version="1.1.0",

- org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

- org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.1.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css;singleton:=

- true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css,
+ org.eclipse.papyrus.infra.gmfdiag.css.converters,
+ org.eclipse.papyrus.infra.gmfdiag.css.dom,
+ org.eclipse.papyrus.infra.gmfdiag.css.engine,
+ org.eclipse.papyrus.infra.gmfdiag.css.engine.enginecopy,
+ org.eclipse.papyrus.infra.gmfdiag.css.handler,
+ org.eclipse.papyrus.infra.gmfdiag.css.helper,
+ org.eclipse.papyrus.infra.gmfdiag.css.listener,
+ org.eclipse.papyrus.infra.gmfdiag.css.lists,
+ org.eclipse.papyrus.infra.gmfdiag.css.notation,
+ org.eclipse.papyrus.infra.gmfdiag.css.preferences,
+ org.eclipse.papyrus.infra.gmfdiag.css.provider,
+ org.eclipse.papyrus.infra.gmfdiag.css.resource,
+ org.eclipse.papyrus.infra.gmfdiag.css.service,
+ org.eclipse.papyrus.infra.gmfdiag.css.style.impl,
+ org.eclipse.papyrus.infra.gmfdiag.css.theme
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.e4.ui.css.core;bundle-version="0.10.0",
+ org.eclipse.emf.ecore;bundle-version="2.8.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.w3c.css.sac;bundle-version="1.3.1",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",
+ org.w3c.dom.svg;bundle-version="1.1.0",
+ org.eclipse.emf.edit.ui,
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",
+ org.apache.batik.dom.svg
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css;singleton:=
+ true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
index 0440760a294..563abb356da 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
@@ -1,52 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2012 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *****************************************************************************/

-

-/**

-

-This stylesheets declares the default style options for Papyrus. It mostly contains hacks to avoid

-unwished behaviors, related to the base implementation (GMF, Papyrus...)

-

-*/

-

-Compartment[kind=symbol]{

-	visible:false;

-}

-

-* {

- 	lineColor:black; /* Avoid the gray line-colors from default GMF connectors */

- 	fontName:"Segoe UI"; /* Default font used in Papyrus. It is different from the GMF default */

- 	fontColor:black;

- 	transparency:0; /* Default transparency in GMF Notation is -1. -1 is recognized as "Unchanged" by the GMF NodeFigure. e.g. changing from 50 to -1 ("reset") does nothing */

- 	showTitle:false;

-}

-

-/* For most Activity diagram nodes (e.g. initial, final, fork, decision, ...), 

- * the element icon is displayed next to the actual object. 

- * By default, we prevent this. 

- * 

- * For standard nodes (OpaqueAction, ...), they are not implemented at all, 

- * so a global selector will not have side effects (yet). 

- */

-ActivityDiagram Activity *,InteractionOverviewDiagram Activity * {

-	elementIcon:false; 

-}

-

-/*

- * The Actor element icon is not useful either

- */

-UseCaseDiagram Actor {

-	elementIcon:false;

-}

-

-TimingDiagram * {

-	gradient:none;

-}

+/*****************************************************************************
+ * Copyright (c) 2012 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *****************************************************************************/
+
+/**
+
+This stylesheets declares the default style options for Papyrus. It mostly contains hacks to avoid
+unwished behaviors, related to the base implementation (GMF, Papyrus...)
+
+*/
+
+Compartment[kind=symbol]{
+	visible:false;
+}
+
+* {
+ 	lineColor:black; /* Avoid the gray line-colors from default GMF connectors */
+ 	fontName:"Segoe UI"; /* Default font used in Papyrus. It is different from the GMF default */
+ 	fontColor:black;
+ 	transparency:0; /* Default transparency in GMF Notation is -1. -1 is recognized as "Unchanged" by the GMF NodeFigure. e.g. changing from 50 to -1 ("reset") does nothing */
+ 	showTitle:false;
+}
+
+/* For most Activity diagram nodes (e.g. initial, final, fork, decision, ...), 
+ * the element icon is displayed next to the actual object. 
+ * By default, we prevent this. 
+ * 
+ * For standard nodes (OpaqueAction, ...), they are not implemented at all, 
+ * so a global selector will not have side effects (yet). 
+ */
+ActivityDiagram Activity *,InteractionOverviewDiagram Activity * {
+	elementIcon:false; 
+}
+
+/*
+ * The Actor element icon is not useful either
+ */
+UseCaseDiagram Actor {
+	elementIcon:false;
+}
+
+TimingDiagram * {
+	gradient:none;
+}
+