Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-11-09 10:13:29 -0500
committercletavernie2011-11-09 10:13:29 -0500
commitb64b63012b1ef2c0d5a7ffd7d6e0df7794311fab (patch)
treebb10db136a7aaa6e5c65fd6db5cce6add3b7f665 /plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration
parenta05ab388944236edcd11d7af98a844cc71bb313e (diff)
downloadorg.eclipse.papyrus-b64b63012b1ef2c0d5a7ffd7d6e0df7794311fab.tar.gz
org.eclipse.papyrus-b64b63012b1ef2c0d5a7ffd7d6e0df7794311fab.tar.xz
org.eclipse.papyrus-b64b63012b1ef2c0d5a7ffd7d6e0df7794311fab.zip
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
Diffstat (limited to 'plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration')
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project2
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF13
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet8
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties2
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/Activator.java (renamed from plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/Activator.java)4
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetDrawerLabelQuery.java (renamed from plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetDrawerLabelQuery.java)2
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetIconQuery.java (renamed from plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetIconQuery.java)2
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetToolLabelQuery.java (renamed from plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetToolLabelQuery.java)2
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/HasIconQuery.java (renamed from plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/HasIconQuery.java)8
9 files changed, 22 insertions, 21 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
index ade61aa1a4f..31a4c55ab3a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.customization.paletteconfiguration</name>
+ <name>org.eclipse.papyrus.customization.paletteconfiguration</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
index 3392e6f5b2f..5ca873aedb4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
@@ -4,16 +4,17 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="0.9.0",
org.eclipse.uml2.uml;bundle-version="3.2.0",
org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0"
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="0.9.0"
+Export-Package: org.eclipse.papyrus.customization.paletteconfiguration,
+ org.eclipse.papyrus.customization.paletteconfiguration.queries
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.customizati
- on.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.customization.paletteconfiguration;singleton:=true
+Bundle-Activator: org.eclipse.papyrus.customization.paletteconfiguration.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.customization.paletteconfiguration;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.papyrus.paletteconfiguration.customization,
- org.eclipse.papyrus.paletteconfiguration.customization.queries
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
index b22af87fcb6..371e8194cfe 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
@@ -3,19 +3,19 @@
<associatedMetamodels href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#/"/>
<associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>
<associatedMetamodels href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
- <queries xsi:type="query:JavaModelQuery" name="getIcon" description="Gets the icon for a configuration element in the palette configuration model" implementationClassName="org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization.queries.GetIconQuery">
+ <queries xsi:type="query:JavaModelQuery" name="getIcon" description="Gets the icon for a configuration element in the palette configuration model" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetIconQuery">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
<scope href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#//Configuration"/>
</queries>
- <queries xsi:type="query:JavaModelQuery" name="hasIcon" description="Returns &lt;code>true&lt;/code> if the element has a specific icon to display" implementationClassName="org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization.queries.HasIconQuery">
+ <queries xsi:type="query:JavaModelQuery" name="hasIcon" description="Returns &lt;code>true&lt;/code> if the element has a specific icon to display" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.HasIconQuery">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
<scope href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#//Configuration"/>
</queries>
- <queries xsi:type="query:JavaModelQuery" name="getToolLabel" description="Returns the Label for a tool." implementationClassName="org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization.queries.GetToolLabelQuery">
+ <queries xsi:type="query:JavaModelQuery" name="getToolLabel" description="Returns the Label for a tool." implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetToolLabelQuery">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
<scope href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#//ToolConfiguration"/>
</queries>
- <queries xsi:type="query:JavaModelQuery" name="getDrawerLabel" description="Returns the label for a drawer" implementationClassName="org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization.queries.GetDrawerLabelQuery">
+ <queries xsi:type="query:JavaModelQuery" name="getDrawerLabel" description="Returns the label for a drawer" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetDrawerLabelQuery">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
<scope href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#//DrawerConfiguration"/>
</queries>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties
index 67fea175fdf..d730d09b9f4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization
+#Properties file for org.eclipse.papyrus.customization.paletteconfiguration
Bundle-Vendor = Eclipse Modeling Project
Bundle-Name = Customization
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/Activator.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/Activator.java
index ad748bc6821..2c057e3642e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/Activator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.paletteconfiguration.customization;
+package org.eclipse.papyrus.customization.paletteconfiguration;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.customization.paletteconfiguration"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.customization.paletteconfiguration"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetDrawerLabelQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetDrawerLabelQuery.java
index 08cdc54a663..5390581b77d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetDrawerLabelQuery.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetDrawerLabelQuery.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.paletteconfiguration.customization.queries;
+package org.eclipse.papyrus.customization.paletteconfiguration.queries;
import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetIconQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetIconQuery.java
index 61429406ddf..04d3a70d940 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetIconQuery.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetIconQuery.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.paletteconfiguration.customization.queries;
+package org.eclipse.papyrus.customization.paletteconfiguration.queries;
import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetToolLabelQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetToolLabelQuery.java
index 991711ddaa4..3af1d78a2ab 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetToolLabelQuery.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetToolLabelQuery.java
@@ -11,7 +11,7 @@
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.paletteconfiguration.customization.queries;
+package org.eclipse.papyrus.customization.paletteconfiguration.queries;
import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/HasIconQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/HasIconQuery.java
index 42320ab583a..77a9cc765fd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/HasIconQuery.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/HasIconQuery.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.paletteconfiguration.customization.queries;
+package org.eclipse.papyrus.customization.paletteconfiguration.queries;
import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
@@ -7,11 +7,11 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;
/** Returns <code>true</code> if the element has a specific icon to display */
public class HasIconQuery implements IJavaModelQuery<Configuration, Boolean> {
public Boolean evaluate(final Configuration context, final ParameterValueList parameterValues)
- throws ModelQueryExecutionException {
-
+ throws ModelQueryExecutionException {
+
IJavaModelQuery<Configuration, String> getImageQuery = new GetIconQuery();
String imagePath = getImageQuery.evaluate(context, parameterValues);
-
+
if(imagePath!=null && imagePath.length() > 0) {
return true;
}

Back to the top