X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui.workbench%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2Fworkbench%2Fosgi%2FBundlesView.java;h=5ebd737912b993b6b48f7a4c9c072dcab953b594;hb=92dee1606725534bdfc067cd2cae017f0501ac5d;hp=ca32da0d839b99056c2a0ffb092f00ce6292833a;hpb=21a4ea1fb5380ce1dd763c1ea09067cdd2dfd0f3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
index ca32da0d8..5ebd73791 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
+++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
@@ -29,7 +29,6 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 import org.osgi.framework.Bundle;
@@ -39,9 +38,6 @@ import org.osgi.framework.BundleContext;
  * Overview of the bundles as a table. Equivalent to Equinox 'ss' console
  * command.
  */
-
-// public class BundlesView {}
-
 public class BundlesView extends ViewPart {
 	private TableViewer viewer;
 
@@ -84,7 +80,7 @@ public class BundlesView extends ViewPart {
 
 		// Symbolic name
 		column = new TableViewerColumn(viewer, SWT.NONE);
-		column.getColumn().setWidth(300);
+		column.getColumn().setWidth(250);
 		column.getColumn().setText("Symbolic Name");
 		column.setLabelProvider(new ColumnLabelProvider() {
 			private static final long serialVersionUID = -4280840684440451080L;
@@ -107,17 +103,13 @@ public class BundlesView extends ViewPart {
 			private static final long serialVersionUID = 6871926308708629989L;
 
 			public String getText(Object element) {
-
-				return "";
-				// FIXME triggers compilation failure
-				// return ((Bundle) element).getVersion().toString();
+				Bundle bundle = (org.osgi.framework.Bundle) element;
+				return bundle.getVersion().toString();
 			}
 		});
 		new ColumnViewerComparator<Bundle>(column, new Comparator<Bundle>() {
 			public int compare(Bundle o1, Bundle o2) {
-				return 0;
-				// FIXME getVersion() triggers compilation failure
-				// return o1.getVersion().compareTo(o2.getVersion());
+				return o1.getVersion().compareTo(o2.getVersion());
 			}
 		});
 
@@ -152,65 +144,4 @@ public class BundlesView extends ViewPart {
 		}
 
 	}
-
-	/** Label provider for the state column */
-	private static class StateLabelProvider extends ColumnLabelProvider {
-		private static final long serialVersionUID = -7885583135316000733L;
-
-		@Override
-		public Image getImage(Object element) {
-			Integer state = ((Bundle) element).getState();
-			switch (state) {
-			case Bundle.UNINSTALLED:
-				return OsgiExplorerImages.INSTALLED;
-			case Bundle.INSTALLED:
-				return OsgiExplorerImages.INSTALLED;
-			case Bundle.RESOLVED:
-				return OsgiExplorerImages.RESOLVED;
-			case Bundle.STARTING:
-				return OsgiExplorerImages.STARTING;
-			case Bundle.STOPPING:
-				return OsgiExplorerImages.STARTING;
-			case Bundle.ACTIVE:
-				return OsgiExplorerImages.ACTIVE;
-			default:
-				return null;
-			}
-		}
-
-		@Override
-		public String getText(Object element) {
-			return null;
-		}
-
-		@Override
-		public String getToolTipText(Object element) {
-			Bundle bundle = (Bundle) element;
-			Integer state = bundle.getState();
-			switch (state) {
-			case Bundle.UNINSTALLED:
-				return "UNINSTALLED";
-			case Bundle.INSTALLED:
-				return "INSTALLED";
-			case Bundle.RESOLVED:
-				return "RESOLVED";
-			case Bundle.STARTING:
-				String activationPolicy = bundle.getHeaders()
-						.get("Bundle-ActivationPolicy").toString();
-				// FIXME constant triggers the compilation failure
-				// .get(Constants.BUNDLE_ACTIVATIONPOLICY).toString();
-				if (activationPolicy != null && activationPolicy.equals("lazy"))
-					// FIXME constant triggers the compilation failure
-					// && activationPolicy.equals(Constants.ACTIVATION_LAZY))
-					return "<<LAZY>>";
-				return "STARTING";
-			case Bundle.STOPPING:
-				return "STOPPING";
-			case Bundle.ACTIVE:
-				return "ACTIVE";
-			default:
-				return null;
-			}
-		}
-	}
 }
\ No newline at end of file