Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2017-01-05 13:02:50 +0000
committerGerrit Code Review @ Eclipse.org2017-01-05 15:28:53 +0000
commit77e23e45679da64c94622251d878e02f320f4253 (patch)
tree5f65aa0442cf4b3130a3ab2dd44ee56f7802f953
parente00588c495e0d1067625d7037f0fccf1ba3107b4 (diff)
downloadorg.eclipse.papyrus-77e23e45679da64c94622251d878e02f320f4253.tar.gz
org.eclipse.papyrus-77e23e45679da64c94622251d878e02f320f4253.tar.xz
org.eclipse.papyrus-77e23e45679da64c94622251d878e02f320f4253.zip
Bug 509976 - Proterty view for Symbol is broken
- fix namespaces for xwt files - fix name in plugin.properties and bundle.properties - fix quality warnings Change-Id: Ia97c902146d719f46e3928658f9783fcfdc1db96 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/build.properties3
-rwxr-xr-x[-rw-r--r--]plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/plugin.properties (renamed from plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.properties)9
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/MultipleTypeSymbolDefinition.xwt4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/SingleTypeSymbolDefinition.xwt4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/OSGI-INF/l10n/bundle.properties3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/IPapyrusInternalProfileConstants.java10
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/ShapeCompartmentViewProvider.java2
9 files changed, 23 insertions, 19 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
index ea64f537219..4b259e1a524 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.diagram.symbols;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Symbols Properties
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols.properties;singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/build.properties
index 8133d279850..453e407a04d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/build.properties
@@ -3,5 +3,6 @@
bin.includes = META-INF/,\
propertyView/,\
plugin.xml,\
- about.html
+ about.html,\
+ plugin.properties
src.includes = about.html
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/plugin.properties
index 3228d2e8a1b..89802767af3 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/plugin.properties
@@ -1,5 +1,5 @@
#################################################################################
-# Copyright (c) 2015 CEA LIST.
+# Copyright (c) 2017 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
@@ -7,6 +7,7 @@
#
# Contributors:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
-##################################################################################)
-
-pluginDescription=This plugin contributes to the Shape Service. It proposes a profile to annote elements in a UML model. First implementation is the possibility to annote Types and to display the associated shape on this type representations and the representations of TypedElement typed by this annotated type. \ No newline at end of file
+##################################################################################
+Bundle-Name=Papyrus Symbols Support Properties
+Bundle-Description=This plug-in contains all properties for Papyrus Symbols Support.
+Bundle-Vendor=Eclipse Modeling Project \ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/MultipleTypeSymbolDefinition.xwt b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/MultipleTypeSymbolDefinition.xwt
index b4843707907..6a814feb5b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/MultipleTypeSymbolDefinition.xwt
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/MultipleTypeSymbolDefinition.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns:x="http://www.eclipse.org/xwt"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
xmlns:j="clr-namespace:java.lang">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/SingleTypeSymbolDefinition.xwt b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/SingleTypeSymbolDefinition.xwt
index 58fa39711a8..693ae55093b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/SingleTypeSymbolDefinition.xwt
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/propertyView/symbols/ui/SingleTypeSymbolDefinition.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
- xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+ xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
index 92122eb8f4b..5c0524bdf15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Bundle-Version: 1.2.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator
Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
+Bundle-Description: %Bundle-Description
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/OSGI-INF/l10n/bundle.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/OSGI-INF/l10n/bundle.properties
index 4b571124bea..2b831585bc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/OSGI-INF/l10n/bundle.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,4 @@
#Properties file for org.eclipse.papyrus.uml.diagram.symbols
Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus Symbols Support \ No newline at end of file
+Bundle-Name = Papyrus Symbols Support
+Bundle-Description=This plugin contributes to the Shape Service. It proposes a profile to annote elements in a UML model. First implementation is the possibility to annote Types and to display the associated shape on this type representations and the representations of TypedElement typed by this annotated type. \ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/IPapyrusInternalProfileConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/IPapyrusInternalProfileConstants.java
index aecee9d3ad7..4e1f3f8fea8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/IPapyrusInternalProfileConstants.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/IPapyrusInternalProfileConstants.java
@@ -22,23 +22,23 @@ public interface IPapyrusInternalProfileConstants {
// profile
/** main profile name */
- public final static String PAPYRUS_INTERNAL_PROFILE_NAME = "PapyrusInternal";
+ public static final String PAPYRUS_INTERNAL_PROFILE_NAME = "PapyrusInternal";
/** Symbols Sub Profile name */
- public final static String SYMBOL_PROFILE_NAME = PAPYRUS_INTERNAL_PROFILE_NAME + NamedElementUtil.QUALIFIED_NAME_SEPARATOR + "Symbols";
+ public static final String SYMBOL_PROFILE_NAME = PAPYRUS_INTERNAL_PROFILE_NAME + NamedElementUtil.QUALIFIED_NAME_SEPARATOR + "Symbols";
// stereotypes definition
/** TypeSymbolDefinition stereotype name */
- public final static String TYPE_SYMBOL_DEFINITION_QUALIFIED_NAME = SYMBOL_PROFILE_NAME + NamedElementUtil.QUALIFIED_NAME_SEPARATOR + "TypeSymbolDefinition";
+ public static final String TYPE_SYMBOL_DEFINITION_QUALIFIED_NAME = SYMBOL_PROFILE_NAME + NamedElementUtil.QUALIFIED_NAME_SEPARATOR + "TypeSymbolDefinition";
// Stereotype properties definition
/** TypeSymbolDefinition::symbolPath property name */
- public final static String TYPE_SYMBOL_DEFINITION_SYMBOL_PATH = "symbolPath";
+ public static final String TYPE_SYMBOL_DEFINITION_SYMBOL_PATH = "symbolPath";
// Extension definition
/** profile name as defined in the extension point */
- public final static String PAPYRUS_INTERNAL_PROFILE_EXTENSION_NAME = "Papyrus Internal";
+ public static final String PAPYRUS_INTERNAL_PROFILE_EXTENSION_NAME = "Papyrus Internal";
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/ShapeCompartmentViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/ShapeCompartmentViewProvider.java
index e45e939ce0e..6eb8fd16420 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/ShapeCompartmentViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/ShapeCompartmentViewProvider.java
@@ -34,7 +34,7 @@ public class ShapeCompartmentViewProvider extends AbstractShapeCompartmentViewPr
if ((diagramType == null) || (!diagramType.equals(op.getContainerView().getDiagram().getType()))) {
return false;
}
- throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram.");
+ throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram."); //$NON-NLS-1$ //$NON-NLS-2$
}
/**

Back to the top