Commit bf8efe9e authored by Alexander Diewald's avatar Alexander Diewald

Merge remote-tracking branch 'origin/master' into 3993

parents 3d9506f0 8bba4e87
......@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tooling Base UI
Bundle-SymbolicName: org.fortiss.tooling.base.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: org.fortiss.tooling.base.ui.ToolingBaseUIActivator
Require-Bundle: org.fortiss.tooling.base;bundle-version="2.16.0";visibility:=reexport,
org.fortiss.tooling.kernel.ui;bundle-version="2.16.0";visibility:=reexport,
Require-Bundle: org.fortiss.tooling.base;bundle-version="2.17.0";visibility:=reexport,
org.fortiss.tooling.kernel.ui;bundle-version="2.17.0";visibility:=reexport,
org.eclipse.swt
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
......
......@@ -6,7 +6,7 @@ LayoutedEllipticContentVisualBase.java 6f3daf386d5120793b90ce4569dd9bea33dd2a0f
LayoutedLineLinkVisual.java 5fc26086e2f63afee403379ba8f09f5113d4c025 GREEN
LayoutedRectangularContentVisualBase.java 61698ffd771ee2ad798025df8195d1bc09c2c765 GREEN
NamedLayoutedCircularAnchorageContentVisual.java 5ba0b5d133998eac47425696ef0a02b575418c2d GREEN
NamedLayoutedCircularAnchorageDiagramVisual.java 94eccb7bb03c5518ae875e9972f062ddd0e1f62d GREEN
NamedLayoutedCircularAnchorageDiagramVisual.java eb1e736d7715b86dbc3ca0551bb754157f71cc5f GREEN
NamedLayoutedCurveLinkVisual.java 7945b2f550d5e4804f44891294ee60cc8ffcbf1e GREEN
NamedLayoutedEllipticContentVisual.java f96a956c2f71b675eee56cfc613684397545da68 GREEN
NamedLayoutedLineLinkVisual.java 4fc48616000516dc90ba22b7069ffdabadc9c377 GREEN
......
......@@ -65,6 +65,15 @@ public class NamedLayoutedCircularAnchorageDiagramVisual<T extends ILayoutedMode
}
}
/** {@inheritDoc} */
@Override
public void removeAllVisuals(DiagramLayers layers) {
super.removeAllVisuals(layers);
if(nameText.getParent() != null) {
layers.getVisualFeedbackLayer().remove(nameText);
}
}
/** Returns whether the name label should be enabled. */
public boolean enableName() {
return !freeConnectorHasVisibleConnections(getModelElement());
......
......@@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.tooling.base;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.fortiss.tooling.kernel;visibility:=reexport;bundle-version="2.16.0"
org.fortiss.tooling.kernel;visibility:=reexport;bundle-version="2.17.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.fortiss.tooling.base,
org.fortiss.tooling.base.annotation,
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tooling Commons UI
Bundle-SymbolicName: org.fortiss.tooling.common.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.fortiss.tooling.common;visibility:=reexport,
org.eclipse.core.resources;visibility:=reexport,
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tooling Commons
Bundle-SymbolicName: org.fortiss.tooling.common;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
com.ibm.icu;visibility:=reexport,
org.junit;visibility:=reexport
......
......@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tooling Graphics GL UI
Bundle-SymbolicName: org.fortiss.tooling.graphicsGL.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: org.fortiss.tooling.graphicsGL.ui.ToolingGraphicsGLUIActivator
Require-Bundle: org.fortiss.tooling.graphicsGL;bundle-version="2.16.0";visibility:=reexport,
org.fortiss.tooling.base.ui;bundle-version="2.16.0";visibility:=reexport
Require-Bundle: org.fortiss.tooling.graphicsGL;bundle-version="2.17.0";visibility:=reexport,
org.fortiss.tooling.base.ui;bundle-version="2.17.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: fortiss GmbH
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.tooling.graphicsGL;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......@@ -23,5 +23,5 @@ Export-Package: org.fortiss.tooling.graphicsGL,
org.fortiss.tooling.graphicsGL.model.scene.util,
org.fortiss.tooling.graphicsGL.model.util,
org.fortiss.tooling.graphicsGL.util
Require-Bundle: org.fortiss.tooling.kernel;bundle-version="2.16.0";visibility:=reexport
Require-Bundle: org.fortiss.tooling.kernel;bundle-version="2.17.0";visibility:=reexport
Automatic-Module-Name: org.fortiss.tooling.graphicsGL
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tooling Kernel UI
Bundle-SymbolicName: org.fortiss.tooling.kernel.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator
Require-Bundle: org.fortiss.tooling.common.ui;visibility:=reexport,
org.fortiss.tooling.kernel;visibility:=reexport,
......
......@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.tooling.kernel;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.fortiss.tooling.kernel.ToolingKernelActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.fortiss.tooling.common;visibility:=reexport;bundle-version="2.16.0",
Require-Bundle: org.fortiss.tooling.common;visibility:=reexport;bundle-version="2.17.0",
org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport;bundle-version="2.7.0",
org.eclipse.emf.transaction;visibility:=reexport;bundle-version="1.4.0",
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Spider Chart
Bundle-SymbolicName: org.fortiss.tooling.spiderchart.ui
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Vendor: fortiss GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Developer: Amit Kumar Mondal (admin@amitinside.com)
......@@ -12,6 +12,6 @@ Export-Package: org.fortiss.tooling.spiderchart.model,
org.fortiss.tooling.spiderchart.util,
org.fortiss.tooling.spiderchart.widget
Require-Bundle: org.eclipse.swt,
org.fortiss.tooling.base.ui;bundle-version="2.16.0";visibility:=reexport
org.fortiss.tooling.base.ui;bundle-version="2.17.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.fortiss.tooling.spiderchart.ui
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment