provide package, import-package, require-bundle, export-package + (error and optional equivalents)
update icon paths in label provider
(FELIX-1336)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@829872 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/eclipse/ui/icons/active.gif b/sigil/eclipse/ui/icons/active.gif
index f4151fb..fb90cb1 100644
--- a/sigil/eclipse/ui/icons/active.gif
+++ b/sigil/eclipse/ui/icons/active.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/bundle.gif b/sigil/eclipse/ui/icons/bundle.gif
index f4151fb..fb90cb1 100644
--- a/sigil/eclipse/ui/icons/bundle.gif
+++ b/sigil/eclipse/ui/icons/bundle.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/export-package.gif b/sigil/eclipse/ui/icons/export-package.gif
index 1dd79bf..4fc70c3 100644
--- a/sigil/eclipse/ui/icons/export-package.gif
+++ b/sigil/eclipse/ui/icons/export-package.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/fragment.gif b/sigil/eclipse/ui/icons/fragment.gif
index 88edb7b..a0ab0d1 100644
--- a/sigil/eclipse/ui/icons/fragment.gif
+++ b/sigil/eclipse/ui/icons/fragment.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/host.gif b/sigil/eclipse/ui/icons/host.gif
index 3b8a5b1..14b0dd3 100644
--- a/sigil/eclipse/ui/icons/host.gif
+++ b/sigil/eclipse/ui/icons/host.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/import-package-error.gif b/sigil/eclipse/ui/icons/import-package-error.gif
new file mode 100644
index 0000000..57a64be
--- /dev/null
+++ b/sigil/eclipse/ui/icons/import-package-error.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/import-package-optional-error.gif b/sigil/eclipse/ui/icons/import-package-optional-error.gif
new file mode 100644
index 0000000..dcd9507
--- /dev/null
+++ b/sigil/eclipse/ui/icons/import-package-optional-error.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/import-package-optional.gif b/sigil/eclipse/ui/icons/import-package-optional.gif
new file mode 100644
index 0000000..2ab3ff8
--- /dev/null
+++ b/sigil/eclipse/ui/icons/import-package-optional.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/import-package.gif b/sigil/eclipse/ui/icons/import-package.gif
index b9c7bfa..30a5199 100644
--- a/sigil/eclipse/ui/icons/import-package.gif
+++ b/sigil/eclipse/ui/icons/import-package.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/importing-bundle.gif b/sigil/eclipse/ui/icons/importing-bundle.gif
index 2572b79..430252c 100644
--- a/sigil/eclipse/ui/icons/importing-bundle.gif
+++ b/sigil/eclipse/ui/icons/importing-bundle.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/package.gif b/sigil/eclipse/ui/icons/package.gif
new file mode 100644
index 0000000..d281d2c
--- /dev/null
+++ b/sigil/eclipse/ui/icons/package.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/require-bundle-error.gif b/sigil/eclipse/ui/icons/require-bundle-error.gif
new file mode 100644
index 0000000..b6d6e31
--- /dev/null
+++ b/sigil/eclipse/ui/icons/require-bundle-error.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/require-bundle-optional-error.gif b/sigil/eclipse/ui/icons/require-bundle-optional-error.gif
new file mode 100644
index 0000000..ec0adbd
--- /dev/null
+++ b/sigil/eclipse/ui/icons/require-bundle-optional-error.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/require-bundle-optional.gif b/sigil/eclipse/ui/icons/require-bundle-optional.gif
new file mode 100644
index 0000000..d1fec08
--- /dev/null
+++ b/sigil/eclipse/ui/icons/require-bundle-optional.gif
Binary files differ
diff --git a/sigil/eclipse/ui/icons/require-bundle.gif b/sigil/eclipse/ui/icons/require-bundle.gif
new file mode 100644
index 0000000..3d2d8dc
--- /dev/null
+++ b/sigil/eclipse/ui/icons/require-bundle.gif
Binary files differ
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java
index 072cdc7..cd3cbc4 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java
@@ -44,7 +44,6 @@
public class ModelLabelProvider extends LabelProvider
{
-
private volatile Set<? extends IModelElement> unresolvedElements = null;
@@ -179,7 +178,7 @@
private Image findPackage()
{
- return cacheImage( "icons/package_obj.png" );
+ return cacheImage( "icons/package.gif" );
}
@@ -188,11 +187,11 @@
String path;
if ( optional )
{
- path = unresolved ? "icons/package_obj_import_opt_error.png" : "icons/package_obj_import_opt.png";
+ path = unresolved ? "icons/import-package-optional-error.gif" : "icons/import-package-optional.gif";
}
else
{
- path = unresolved ? "icons/package_obj_import_error.png" : "icons/package_obj_import.png";
+ path = unresolved ? "icons/import-package-error.gif" : "icons/import-package.gif";
}
return cacheImage( path );
}
@@ -200,13 +199,13 @@
private Image findPackageExport()
{
- return cacheImage( "icons/package_obj_export.png" );
+ return cacheImage( "icons/export-package.gif" );
}
private Image findBundle()
{
- return cacheImage( "icons/jar_obj.png" );
+ return cacheImage( "icons/bundle.gif" );
}
@@ -215,11 +214,11 @@
String path;
if ( optional )
{
- path = unresolved ? "icons/required_bundle_opt_error.png" : "icons/required_bundle_opt.png";
+ path = unresolved ? "icons/require-bundle-optional-error.gif" : "icons/require-bundle-optional.gif";
}
else
{
- path = unresolved ? "icons/required_bundle_error.png" : "icons/jar_obj.png";
+ path = unresolved ? "icons/require-bundle-error.gif" : "icons/require-bundle.gif";
}
return cacheImage( path );
}
