aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2018-06-08 04:19:47 -0400
committerQuentin Le Menez2018-06-08 05:25:54 -0400
commitb5048303022cea4fa6e3f73dfa5c0d10a67868c2 (patch)
treeca32123980d39e47bc4f74c2a3ac22660afabe5b
parenta523a1589c4725f5ecb77ecd28f52520894da43e (diff)
downloadorg.eclipse.papyrus-b5048303022cea4fa6e3f73dfa5c0d10a67868c2.zip
org.eclipse.papyrus-b5048303022cea4fa6e3f73dfa5c0d10a67868c2.tar.gz
org.eclipse.papyrus-b5048303022cea4fa6e3f73dfa5c0d10a67868c2.tar.xz
Bug 535674 - [Example] Missing icon in Basic Papyrus Model
- add icon in build.properties - patch warninn in plugin.xml using correct parent category - use same name as plugin in .project configuration file - remove .settings for pure maven level Change-Id: I2ae97712b9e8e716d44f8b8be73ef809c3e6fd2c Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--examples/user/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--examples/user/.settings/org.eclipse.core.runtime.prefs2
-rw-r--r--examples/user/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--examples/user/org.eclipse.papyrus.examples.user.qvto/.project2
-rw-r--r--examples/user/org.eclipse.papyrus.examples.user.qvto/build.properties3
-rw-r--r--examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.xml2
6 files changed, 4 insertions, 11 deletions
diff --git a/examples/user/.settings/org.eclipse.core.resources.prefs b/examples/user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 896a9a5..0000000
--- a/examples/user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8 \ No newline at end of file
diff --git a/examples/user/.settings/org.eclipse.core.runtime.prefs b/examples/user/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/examples/user/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/examples/user/.settings/org.eclipse.m2e.core.prefs b/examples/user/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/examples/user/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/examples/user/org.eclipse.papyrus.examples.user.qvto/.project b/examples/user/org.eclipse.papyrus.examples.user.qvto/.project
index 71f4690..b48fed0 100644
--- a/examples/user/org.eclipse.papyrus.examples.user.qvto/.project
+++ b/examples/user/org.eclipse.papyrus.examples.user.qvto/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>QVToExamples</name>
+ <name>org.eclipse.papyrus.examples.user.qvto</name>
<comment></comment>
<projects>
</projects>
diff --git a/examples/user/org.eclipse.papyrus.examples.user.qvto/build.properties b/examples/user/org.eclipse.papyrus.examples.user.qvto/build.properties
index 603089a..1be54fc 100644
--- a/examples/user/org.eclipse.papyrus.examples.user.qvto/build.properties
+++ b/examples/user/org.eclipse.papyrus.examples.user.qvto/build.properties
@@ -5,5 +5,6 @@ bin.includes = META-INF/,\
plugin.xml,\
src/main/resources/models/,\
about.html,\
- plugin.properties
+ plugin.properties,\
+ src/main/resources/icons/
src.includes = about.html
diff --git a/examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.xml b/examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.xml
index eab80eb..c857246 100644
--- a/examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.xml
+++ b/examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.xml
@@ -8,7 +8,7 @@
<category
id="org.eclipse.papyrus.examples"
name="%wizardCategoryExamples"
- parentCategory="org.eclipse.ui.Examples/org.eclipse.papyrus.examples">
+ parentCategory="org.eclipse.papyrus.examples">
</category>
<wizard
canFinishEarly="false"