UI bundles now use icons from main ui bundle when possible
Each UI bundle used to have it's own copy of shared icons. With this
patch, those bundles that reference org.eclipse.capra.ui use the icons
from this bundle. This avoids duplicating the files in the different
bundles. The notable exception is org.eclipse.capra.ui.office which does
not reference org.eclipse.capra.ui and thus has it's own set of icons.
diff --git a/bundles/org.eclipse.capra.ui.drive/icons/selectionView.png b/bundles/org.eclipse.capra.ui.drive/icons/selectionView.png
deleted file mode 100644
index 42fdc5a..0000000
--- a/bundles/org.eclipse.capra.ui.drive/icons/selectionView.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.capra.ui.drive/plugin.xml b/bundles/org.eclipse.capra.ui.drive/plugin.xml
index c0ccfc7..c5eb160 100644
--- a/bundles/org.eclipse.capra.ui.drive/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.drive/plugin.xml
@@ -8,7 +8,7 @@
<view
category="org.eclipse.capra.ui.views"
class="org.eclipse.capra.ui.drive.CapraGoogleDriveView"
- icon="icons/selectionView.png"
+ icon="platform:/plugin/org.eclipse.capra.ui/icons/selectionView.png"
id="org.eclipse.capra.ui.drive.CapraGoogleDriveView"
name="%view.name">
</view>
diff --git a/bundles/org.eclipse.capra.ui.plantuml/build.properties b/bundles/org.eclipse.capra.ui.plantuml/build.properties
index 9e0142c..e4a9e6d 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/build.properties
+++ b/bundles/org.eclipse.capra.ui.plantuml/build.properties
@@ -12,7 +12,6 @@
src/
bin.includes = META-INF/,\
.,\
- icons/,\
plugin.xml,\
OSGI-INF/,\
OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.capra.ui.plantuml/icons/capra.png b/bundles/org.eclipse.capra.ui.plantuml/icons/capra.png
deleted file mode 100644
index 4e60434..0000000
--- a/bundles/org.eclipse.capra.ui.plantuml/icons/capra.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.capra.ui.plantuml/plugin.xml b/bundles/org.eclipse.capra.ui.plantuml/plugin.xml
index 34c9e16..afcbfd8 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.plantuml/plugin.xml
@@ -23,7 +23,7 @@
<view
category="org.eclipse.capra.generic.views"
class="org.eclipse.capra.ui.plantuml.views.CapraPlantUmlView"
- icon="icons/capra.png"
+ icon="platform:/plugin/org.eclipse.capra.ui/icons/capra.png"
id="org.eclipse.capra.ui.plantuml.views.CapraPlantUmlView"
name="Capra PlantUML Viewer">
</view>
diff --git a/bundles/org.eclipse.capra.ui.zest/build.properties b/bundles/org.eclipse.capra.ui.zest/build.properties
index 1be7646..7c917d9 100644
--- a/bundles/org.eclipse.capra.ui.zest/build.properties
+++ b/bundles/org.eclipse.capra.ui.zest/build.properties
@@ -13,6 +13,5 @@
bin.includes = plugin.xml,\
META-INF/,\
.,\
- icons/,\
OSGI-INF/,\
OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.capra.ui.zest/icons/capra.png b/bundles/org.eclipse.capra.ui.zest/icons/capra.png
deleted file mode 100644
index 4e60434..0000000
--- a/bundles/org.eclipse.capra.ui.zest/icons/capra.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.capra.ui.zest/plugin.xml b/bundles/org.eclipse.capra.ui.zest/plugin.xml
index 46ff3ca..1000e90 100644
--- a/bundles/org.eclipse.capra.ui.zest/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.zest/plugin.xml
@@ -21,7 +21,7 @@
<view
category="org.eclipse.capra.generic.views"
class="org.eclipse.capra.ui.zest.ZestView"
- icon="icons/capra.png"
+ icon="platform:/plugin/org.eclipse.capra.ui/icons/capra.png"
id="org.eclipse.capra.ui.zest.zestView"
name="%view.name"
restorable="true">
