Updated namespace visualization
diff --git a/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/META-INF/MANIFEST.MF
index f3cc031..88f28b5 100644
--- a/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/META-INF/MANIFEST.MF
@@ -23,3 +23,5 @@
Bundle-Vendor: Eclipse APP4MC
Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.visualizations.addon.MappingModelVisualization.xml,
OSGI-INF/org.eclipse.app4mc.amalthea.visualizations.addon.NamespaceMemberVisualization.xml
+Export-Package: org.eclipse.app4mc.amalthea.visualizations.addon,
+ org.eclipse.app4mc.amalthea.visualizations.addon.util
diff --git a/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/src/org/eclipse/app4mc/amalthea/visualizations/addon/NamespaceMemberVisualization.java b/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/src/org/eclipse/app4mc/amalthea/visualizations/addon/NamespaceMemberVisualization.java
index dd86ba1..66d5b1a 100644
--- a/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/src/org/eclipse/app4mc/amalthea/visualizations/addon/NamespaceMemberVisualization.java
+++ b/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/src/org/eclipse/app4mc/amalthea/visualizations/addon/NamespaceMemberVisualization.java
@@ -22,19 +22,15 @@
import org.eclipse.app4mc.amalthea.model.INamed;
import org.eclipse.app4mc.amalthea.model.INamespaceMember;
import org.eclipse.app4mc.amalthea.model.Namespace;
-import org.eclipse.app4mc.amalthea.model.provider.AmaltheaItemProviderAdapterFactory;
+import org.eclipse.app4mc.amalthea.visualizations.addon.util.AmaltheaDefaultLabelProvider;
import org.eclipse.app4mc.visualization.ui.registry.Visualization;
import org.eclipse.e4.core.services.events.IEventBroker;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
@@ -59,19 +55,21 @@
tableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
// label provider
- final LocalLabelProvider provider = new LocalLabelProvider();
- tableViewer.setLabelProvider(new LabelProvider() {
+ tableViewer.setLabelProvider(new AmaltheaDefaultLabelProvider() {
@Override
public String getText(Object element) {
return name(element);
}
-
- @Override
- public Image getImage(Object element) {
- return provider.getImage(element);
- }
});
+ // content provider
+ tableViewer.setContentProvider(ArrayContentProvider.getInstance());
+ tableViewer.setInput(namespace.getMemberObjects());
+
+ // alphabetic order
+ tableViewer.setComparator(new ViewerComparator());
+
+ // doubleclick listener
tableViewer.addDoubleClickListener(event -> {
IStructuredSelection selection = (IStructuredSelection) event.getSelection();
Object firstElement = selection.getFirstElement();
@@ -83,13 +81,6 @@
broker.send("org/eclipse/app4mc/amalthea/editor/SELECT", data);
}
});
-
- // content provider
- tableViewer.setContentProvider(ArrayContentProvider.getInstance());
- tableViewer.setInput(namespace.getMemberObjects());
-
- // alphabetic order
- tableViewer.setComparator(new ViewerComparator());
}
private String name(final Object object) {
@@ -100,40 +91,4 @@
return "<undefined>";
}
- /**
- * Simple label provider for Amalthea objects
- *
- * (makes use of generated EMF label providers to get text and image)
- */
- private static class LocalLabelProvider implements IItemLabelProvider {
- AmaltheaItemProviderAdapterFactory providerFactory;
-
- public LocalLabelProvider() {
- // use Amalthea default adapter factory
- providerFactory = new AmaltheaItemProviderAdapterFactory();
- }
-
- private IItemLabelProvider getProviderFor(Object object) {
- return (IItemLabelProvider) providerFactory.adapt(object, IItemLabelProvider.class);
- }
-
- @Override
- public String getText(Object object) {
- IItemLabelProvider provider = getProviderFor(object);
- if (provider == null)
- return "";
-
- return provider.getText(object);
- }
-
- @Override
- public Image getImage(Object object) {
- IItemLabelProvider provider = getProviderFor(object);
- if (provider == null)
- return null;
-
- return ExtendedImageRegistry.INSTANCE.getImage(provider.getImage(object));
- }
- }
-
}
diff --git a/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/src/org/eclipse/app4mc/amalthea/visualizations/addon/util/AmaltheaDefaultLabelProvider.java b/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/src/org/eclipse/app4mc/amalthea/visualizations/addon/util/AmaltheaDefaultLabelProvider.java
new file mode 100644
index 0000000..67ae20b
--- /dev/null
+++ b/plugins/org.eclipse.app4mc.amalthea.visualizations.addon/src/org/eclipse/app4mc/amalthea/visualizations/addon/util/AmaltheaDefaultLabelProvider.java
@@ -0,0 +1,60 @@
+/*
+ ********************************************************************************
+ * Copyright (c) 2022 Robert Bosch GmbH and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Robert Bosch GmbH - initial API and implementation
+ ********************************************************************************
+ */
+
+package org.eclipse.app4mc.amalthea.visualizations.addon.util;
+
+import org.eclipse.app4mc.amalthea.model.provider.AmaltheaItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Simple label provider for Amalthea objects
+ *
+ * (makes use of generated EMF label providers to get text and image)
+ *
+ */
+public class AmaltheaDefaultLabelProvider extends LabelProvider {
+ AmaltheaItemProviderAdapterFactory providerFactory;
+
+ public AmaltheaDefaultLabelProvider() {
+ // use Amalthea default adapter factory
+ providerFactory = new AmaltheaItemProviderAdapterFactory();
+ }
+
+ private IItemLabelProvider getProviderFor(Object object) {
+ return (IItemLabelProvider) providerFactory.adapt(object, IItemLabelProvider.class);
+ }
+
+ @Override
+ public String getText(Object object) {
+ IItemLabelProvider provider = getProviderFor(object);
+ if (provider == null)
+ return "";
+
+ return provider.getText(object);
+ }
+
+ @Override
+ public Image getImage(Object object) {
+ IItemLabelProvider provider = getProviderFor(object);
+ if (provider == null)
+ return null;
+
+ return ExtendedImageRegistry.INSTANCE.getImage(provider.getImage(object));
+ }
+
+}
