diff options
| author | Cedric Dumoulin | 2013-11-14 22:13:17 +0000 |
|---|---|---|
| committer | Cedric Dumoulin | 2014-01-27 13:55:06 +0000 |
| commit | 83e4872b9fbc850bc5934ec6b57ef803df1a2431 (patch) | |
| tree | 025f0ca255cbd27f1f0943bb42ad292ab926dbbf /extraplugins/layers | |
| parent | 632ef5fbc6acb6ac2278484e41118eae3e3fd5b1 (diff) | |
| download | org.eclipse.papyrus-83e4872b9fbc850bc5934ec6b57ef803df1a2431.tar.gz org.eclipse.papyrus-83e4872b9fbc850bc5934ec6b57ef803df1a2431.tar.xz org.eclipse.papyrus-83e4872b9fbc850bc5934ec6b57ef803df1a2431.zip | |
Move old and dev menus to a separate dev.ui project
Diffstat (limited to 'extraplugins/layers')
16 files changed, 281 insertions, 132 deletions
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.classpath b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.classpath new file mode 100644 index 00000000000..ad32c83a788 --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.project b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.project new file mode 100644 index 00000000000..6ea6b87750f --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.layers.dev.ui</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..c537b63063c --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..743ddc41bf3 --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.papyrus.layers.dev.ui;singleton:=true +Bundle-Version: 0.10.0.qualifier +Bundle-Activator: org.eclipse.papyrus.layers.dev.ui.Activator +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.ui +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy +Bundle-Vendor: %providerName diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/about.html b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/about.html new file mode 100644 index 00000000000..d35d5aed64c --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/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 ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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> diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/build.properties new file mode 100644 index 00000000000..e9863e281ea --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/plugin.properties b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/plugin.properties new file mode 100644 index 00000000000..1ba9a8575ad --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2013 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: +# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation +################################################################################## +pluginName=Layers UI for Dev (Incubation) +providerName=Eclipse Modeling Project diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/plugin.xml b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/plugin.xml new file mode 100644 index 00000000000..f90e51be5b9 --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/plugin.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.eclipse.ui.menus"> + <menuContribution + allPopups="false" + locationURI="popup:org.eclipse.papyrus.layers.stackmodel.ui.popupmenu?after=endseparator"> + <separator + name="devseparator" + visible="true"> + </separator> + <menu + label="Oldies"> + <command + commandId="org.eclipse.papyrus.layers.ui.commands.attachLayerStack" + label="Attach Layer Stack" + style="push" + tooltip="Attach a Layer Stack to the diagram"> + </command> + <command + commandId="org.eclipse.papyrus.layers.ui.commands.createtoplayeroperator" + label="Create Top Layer Operator" + style="push" + tooltip="Create a top Layer operator"> + </command> + <command + commandId="org.eclipse.papyrus.layers.ui.commands.createstackedLayerOperator" + label="Create Stacked Layer Operator" + style="push" + tooltip="Create a Stacked Layer operator"> + </command> + <command + commandId="org.eclipse.papyrus.layers.ui.commands.attachPropertyToLayer" + label="Attach a Property to a Layer" + style="push" + tooltip="Attach a Property to a Layer"> + </command> + <command + commandId="org.eclipse.papyrus.layers.ui.commands.createLayerOperator" + label="Create Layer Operators No Param" + style="push"> + </command> + </menu> + </menuContribution> + </extension> + +</plugin> diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/src/org/eclipse/papyrus/layers/dev/ui/Activator.java b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/src/org/eclipse/papyrus/layers/dev/ui/Activator.java new file mode 100644 index 00000000000..6ab3d924563 --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/src/org/eclipse/papyrus/layers/dev/ui/Activator.java @@ -0,0 +1,30 @@ +package org.eclipse.papyrus.layers.dev.ui; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class Activator implements BundleActivator { + + private static BundleContext context; + + static BundleContext getContext() { + return context; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext bundleContext) throws Exception { + Activator.context = bundleContext; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext bundleContext) throws Exception { + Activator.context = null; + } + +} diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/.classpath b/extraplugins/layers/org.eclipse.papyrus.layers.ui/.classpath index 8a8f1668cdc..ad32c83a788 100644 --- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/.classpath +++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/.project b/extraplugins/layers/org.eclipse.papyrus.layers.ui/.project index 672f47af60f..eef59ef7305 100644 --- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/.project +++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.layers.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.layers.ui</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/about.html b/extraplugins/layers/org.eclipse.papyrus.layers.ui/about.html index 82d49bf5f81..d35d5aed64c 100644 --- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/about.html +++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/about.html @@ -1,28 +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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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>
+<!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 ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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> diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties index db22a5a01db..475a74852d2 100644 --- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties +++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties @@ -1,18 +1,18 @@ -source.. = src/,\
- src-fillstyle/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- icons/
-jars.compile.order = .
-src.includes = META-INF/,\
- build.properties,\
- icons/,\
- plugin.xml,\
- src/,\
- src-fillstyle/,\
- test/,\
- .project,\
- .classpath,\
- .settings/
+source.. = src/,\ + src-fillstyle/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + icons/ +jars.compile.order = . +src.includes = META-INF/,\ + build.properties,\ + icons/,\ + plugin.xml,\ + src/,\ + src-fillstyle/,\ + test/,\ + .project,\ + .classpath,\ + .settings/ diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/icons/icon_delete.png b/extraplugins/layers/org.eclipse.papyrus.layers.ui/icons/icon_delete.png Binary files differnew file mode 100644 index 00000000000..4991d87d67d --- /dev/null +++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/icons/icon_delete.png diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.properties b/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.properties index 65401a4872d..45694f293ea 100644 --- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.properties +++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.properties @@ -1,12 +1,12 @@ -#################################################################################
-# Copyright (c) 2013 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:
-# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
-##################################################################################
-pluginName=Layers UI (Incubation)
-providerName=Eclipse Modeling Project
+################################################################################# +# Copyright (c) 2013 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: +# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation +################################################################################## +pluginName=Layers UI (Incubation) +providerName=Eclipse Modeling Project diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml b/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml index ab95130289b..eff41b68608 100644 --- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml +++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml @@ -246,42 +246,11 @@ </command> <command commandId="org.eclipse.papyrus.layers.ui.commands.delete" - label="Delete Item" + icon="IMG_TOOL_DELETE" + label="Delete" style="push" - tooltip="Delete Selected Item from the Tree Explorer"> + tooltip="Delete Selected Item from the Layer Explorer"> </command> - <menu - label="Oldies"> - <command - commandId="org.eclipse.papyrus.layers.ui.commands.attachLayerStack" - label="Attach Layer Stack" - style="push" - tooltip="Attach a Layer Stack to the diagram"> - </command> - <command - commandId="org.eclipse.papyrus.layers.ui.commands.createtoplayeroperator" - label="Create Top Layer Operator" - style="push" - tooltip="Create a top Layer operator"> - </command> - <command - commandId="org.eclipse.papyrus.layers.ui.commands.createstackedLayerOperator" - label="Create Stacked Layer Operator" - style="push" - tooltip="Create a Stacked Layer operator"> - </command> - <command - commandId="org.eclipse.papyrus.layers.ui.commands.attachPropertyToLayer" - label="Attach a Property to a Layer" - style="push" - tooltip="Attach a Property to a Layer"> - </command> - <command - commandId="org.eclipse.papyrus.layers.ui.commands.createLayerOperator" - label="Create Layer Operators No Param" - style="push"> - </command> - </menu> <command commandId="org.eclipse.papyrus.layers.ui.commands.attachitemselectedindiagramtocurrentlayer" label="Attach Selected Views to Layer" @@ -294,11 +263,15 @@ style="push" tooltip="Remove selected views from the layer selected in the LayersExplorer"> </command> + <separator + name="endseparator" + visible="false"> + </separator> </menuContribution> <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu"> <menu - label="Layers v3"> + label="Layers"> <command commandId="org.eclipse.papyrus.layers.ui.commands.attachLayerStack" label="Attach Layer Stack" @@ -319,15 +292,15 @@ </command> <command commandId="org.eclipse.papyrus.layers.ui.commands.attachitemselectedindiagramtocurrentlayer" - label="Attach Views to Layer" + label="Attach Views to Current Layer" style="push" - tooltip="Attach selected views to the layer selected in the LayersExplorer"> + tooltip="Attach selected views to the layer currently selected in the LayersExplorer"> </command> <command commandId="org.eclipse.papyrus.layers.ui.commands.removeitemselectedindiagramfromcurrentlayer" - label="Remove Views from Layer" + label="Remove Views from Current Layer" style="push" - tooltip="Remove selected views from the layer selected in the LayersExplorer"> + tooltip="Remove selected views from the layer currently selected in the LayersExplorer"> </command> </menu> </menuContribution> |
