From aa5415cbe33bf335e84e9ef749b5b27e22c88a1f Mon Sep 17 00:00:00 2001 From: slewis Date: Wed, 25 Nov 2015 10:18:36 -0800 Subject: Removed ServicesView because of dependency on OSGi DTOs (only in R6+ frameworks) Change-Id: Iec9cd57e040b15fb1cd3f89c41e1b8b95aab85e7 --- .../META-INF/MANIFEST.MF | 3 +- .../org.eclipse.ecf.remoteservice.ui/plugin.xml | 80 +------- .../ui/RemoteServicePerspective.java | 4 +- .../ui/endpoint/EndpointDiscoveryView.java | 19 +- .../ui/rsa/AbstractRemoteServiceAdminView.java | 50 ----- .../ui/service/AbstractServicesView.java | 218 --------------------- .../ui/service/ServicesView.java | 108 ---------- .../model/AbstractServicesContentProvider.java | 42 ---- .../ui/service/model/AbstractServicesNode.java | 85 -------- .../model/AbstractServicesWorkbenchAdapter.java | 28 --- .../ui/service/model/BundleIdNode.java | 14 -- .../model/BundleIdNodeWorkbenchAdapter.java | 29 --- .../ui/service/model/RegisteringBundleIdNode.java | 9 - .../RegisteringBundleIdNodeWorkbenchAdapter.java | 30 --- .../ui/service/model/ServiceNode.java | 60 ------ .../service/model/ServiceNodeWorkbenchAdapter.java | 31 --- .../ui/service/model/ServicePropertySource.java | 79 -------- .../ui/service/model/ServicesAdapterFactory.java | 59 ------ .../ui/service/model/ServicesContentProvider.java | 26 --- .../ui/service/model/ServicesRootNode.java | 27 --- .../model/ServicesRootNodeWorkbenchAdapter.java | 30 --- .../ui/service/model/UsingBundleIdsNode.java | 17 -- .../model/UsingBundleIdsNodeWorkbenchAdapter.java | 30 --- 23 files changed, 17 insertions(+), 1061 deletions(-) delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/AbstractServicesView.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/ServicesView.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesContentProvider.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesNode.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesWorkbenchAdapter.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/BundleIdNode.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/BundleIdNodeWorkbenchAdapter.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/RegisteringBundleIdNode.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/RegisteringBundleIdNodeWorkbenchAdapter.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServiceNode.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServiceNodeWorkbenchAdapter.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicePropertySource.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesAdapterFactory.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesContentProvider.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesRootNode.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesRootNodeWorkbenchAdapter.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/UsingBundleIdsNode.java delete mode 100644 framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/UsingBundleIdsNodeWorkbenchAdapter.java (limited to 'framework') diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF index 5d6a0cab2..f6d2ca1e7 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ecf.remoteservice;bundle-version="2.0.0", org.eclipse.ecf.discovery;bundle-version="2.1.0", org.eclipse.ecf.discovery.ui;bundle-version="3.0.0", - org.eclipse.ecf.discovery.ui.model;bundle-version="3.0.0" + org.eclipse.ecf.discovery.ui.model;bundle-version="3.0.0", + org.eclipse.pde.runtime;bundle-version="3.4.500" Export-Package: org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model;version="1.0.0", org.eclipse.ecf.remoteserviceadmin.ui.rsa, org.eclipse.ecf.remoteserviceadmin.ui.rsa.model, diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml index c9f7e4c61..7d01bb9e5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml @@ -117,13 +117,6 @@ category="org.eclipse.ecf.remoteservice.ui.rsgroup" class="org.eclipse.ecf.remoteserviceadmin.ui.rsa.RemoteServiceAdminView" id="org.eclipse.ecf.remoteserviceadmin.ui.views.RSAView"> - - @@ -307,78 +300,7 @@ type="org.eclipse.ui.model.IWorkbenchAdapter3"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java index dab8349ce..b64680d39 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java @@ -12,7 +12,6 @@ package org.eclipse.ecf.internal.remoteservices.ui; import org.eclipse.ecf.remoteserviceadmin.ui.endpoint.EndpointDiscoveryView; import org.eclipse.ecf.remoteserviceadmin.ui.rsa.RemoteServiceAdminView; -import org.eclipse.ecf.remoteserviceadmin.ui.service.ServicesView; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; @@ -36,7 +35,6 @@ public class RemoteServicePerspective implements IPerspectiveFactory { layout.addShowViewShortcut("org.eclipse.ui.navigator.ProjectExplorer"); //$NON-NLS-1$ layout.addShowViewShortcut(EndpointDiscoveryView.ID_VIEW); layout.addShowViewShortcut(RemoteServiceAdminView.ID_VIEW); - layout.addShowViewShortcut(ServicesView.ID_VIEW); layout.addShowViewShortcut(IPageLayout.ID_OUTLINE); layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET); layout.addShowViewShortcut(IPageLayout.ID_PROGRESS_VIEW); @@ -58,7 +56,7 @@ public class RemoteServicePerspective implements IPerspectiveFactory { IFolderLayout rightBottom = layout.createFolder("rightBottom", //$NON-NLS-1$ IPageLayout.RIGHT, 0.5f, "bottom"); //$NON-NLS-1$ // Add the registry browser on right bottom - rightBottom.addView(ServicesView.ID_VIEW); //$NON-NLS-1$ + rightBottom.addView("org.eclipse.pde.runtime.RegistryBrowser"); //$NON-NLS-1$ // Add properties view in the middle bottom.addView(IPageLayout.ID_PROP_SHEET); // Create folder for left side above Endpoint Discover/Service Discovery diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java index 39b10e394..461eb5b8f 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java @@ -10,6 +10,7 @@ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint; import java.io.FileInputStream; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -53,6 +54,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.pde.internal.runtime.registry.RegistryBrowser; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.TextTransfer; @@ -62,7 +64,10 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IActionBars; import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewSite; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.part.ViewPart; @@ -132,16 +137,15 @@ public class EndpointDiscoveryView extends ViewPart { return new EndpointContentProvider(viewSite, Messages.EndpointDiscoveryView_ENDPOINT_ROOT_NAME); } - /* + private int previousRegistryBrowserGroupBy; + private int invokeShowGroupBy(RegistryBrowser registryBrowser, int groupBy) throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { return (int) registryBrowser.getClass().getDeclaredMethod("showGroupBy", int.class) //$NON-NLS-1$ .invoke(registryBrowser, groupBy); } - */ - + protected int showInRegistryBrowser(int groupBy) { - /* // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=270684#c33 try { IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); @@ -156,15 +160,16 @@ public class EndpointDiscoveryView extends ViewPart { } catch (Exception e) { logWarning("Could not show services in PDE Plugin view", e); //$NON-NLS-1$ } - */ - return 0; + return RegistryBrowser.BUNDLES; } protected void showServicesInRegistryBrowser() { + this.previousRegistryBrowserGroupBy = showInRegistryBrowser(RegistryBrowser.SERVICES); } @Override public void dispose() { + showInRegistryBrowser(previousRegistryBrowserGroupBy); super.dispose(); viewer = null; contentProvider = null; @@ -413,6 +418,8 @@ public class EndpointDiscoveryView extends ViewPart { private List discoveredEndpointIds = new ArrayList(); protected void addEndpoint(EndpointDescription ed) { + if (EndpointDiscoveryView.this.previousRegistryBrowserGroupBy != RegistryBrowser.SERVICES) + showServicesInRegistryBrowser(); String edId = ed.getId(); if (!discoveredEndpointIds.contains(edId)) { discoveredEndpointIds.add(edId); diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java index 92147fd9d..eb3ee4c92 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java @@ -15,30 +15,17 @@ import org.eclipse.ecf.internal.remoteservices.ui.DiscoveryComponent; import org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin; import org.eclipse.ecf.remoteserviceadmin.ui.rsa.model.AbstractRSAContentProvider; import org.eclipse.ecf.remoteserviceadmin.ui.rsa.model.AbstractRSANode; -import org.eclipse.ecf.remoteserviceadmin.ui.rsa.model.ExportRegistrationNode; -import org.eclipse.ecf.remoteserviceadmin.ui.rsa.model.ImportRegistrationNode; -import org.eclipse.ecf.remoteserviceadmin.ui.service.ServicesView; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; -import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewSite; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.part.ViewPart; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; /** * @since 3.3 @@ -108,42 +95,6 @@ public abstract class AbstractRemoteServiceAdminView extends ViewPart { log(IStatus.ERROR, message, e); } - protected void selectServiceInServicesView(final long serviceId) { - try { - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window != null) { - IWorkbenchPage page = window.getActivePage(); - if (page != null) { - IViewPart view = page.findView(ServicesView.ID_VIEW); //$NON-NLS-1$ - if (view != null) - ((ServicesView) view).setSelectedService(serviceId); - } - } - } catch (Exception e) { - logWarning("Could not show services in PDE Plugin view", e); //$NON-NLS-1$ - } - } - - protected void addSelectionListeners() { - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - ISelection sel = event.getSelection(); - Object selection = null; - if (sel instanceof IStructuredSelection) - selection = ((IStructuredSelection) sel).getFirstElement(); - ServiceReference sr = null; - if (selection instanceof ExportRegistrationNode) { - sr = ((ExportRegistrationNode) selection).getServiceReference(); - } else if (selection instanceof ImportRegistrationNode) { - sr = ((ImportRegistrationNode) selection).getServiceReference(); - } - if (sr != null) - selectServiceInServicesView((Long) sr.getProperty(Constants.SERVICE_ID)); - } - }); - } - @Override public void createPartControl(Composite parent) { @@ -162,7 +113,6 @@ public abstract class AbstractRemoteServiceAdminView extends ViewPart { viewSite.setSelectionProvider(viewer); - addSelectionListeners(); setupListeners(); RemoteServiceAdmin rsa = getLocalRSA(); diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/AbstractServicesView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/AbstractServicesView.java deleted file mode 100644 index 0171dd5c2..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/AbstractServicesView.java +++ /dev/null @@ -1,218 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service; - -import java.util.Collection; -import java.util.Map; - -import org.eclipse.ecf.internal.remoteservices.ui.Messages; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.AbstractServicesContentProvider; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.AbstractServicesNode; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.RegisteringBundleIdNode; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.ServiceNode; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.ServicesContentProvider; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.ServicesRootNode; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.UsingBundleIdsNode; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.ui.IViewSite; -import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.ui.part.ViewPart; -import org.osgi.framework.ServiceEvent; - -/** - * @since 3.3 - */ -public abstract class AbstractServicesView extends ViewPart { - - protected TreeViewer viewer; - protected AbstractServicesContentProvider contentProvider; - - public AbstractServicesView() { - super(); - } - - protected void fillContextMenu(IMenuManager manager) { - - } - - protected void makeActions() { - } - - protected void hookContextMenu() { - MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ - menuMgr.setRemoveAllWhenShown(true); - menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager manager) { - AbstractServicesView.this.fillContextMenu(manager); - } - }); - Menu menu = menuMgr.createContextMenu(viewer.getControl()); - viewer.getControl().setMenu(menu); - getSite().registerContextMenu(menuMgr, viewer); - } - - protected AbstractServicesNode getSelectedNode() { - return ((AbstractServicesNode) ((ITreeSelection) viewer.getSelection()).getFirstElement()); - } - - @Override - public void dispose() { - super.dispose(); - viewer = null; - contentProvider = null; - } - - protected abstract AbstractServicesContentProvider createContentProvider(IViewSite viewSite); - - protected void updateModel() { - } - - protected abstract void setupListeners(); - - public void setSelectedService(final long serviceId) { - if (viewer == null) - return; - viewer.getControl().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - if (viewer == null) - return; - ServiceNode sn = findServiceNode(serviceId); - if (sn != null) - viewer.setSelection(new StructuredSelection(sn)); - } - }); - } - - @Override - public void createPartControl(Composite parent) { - - IViewSite viewSite = getViewSite(); - - this.contentProvider = createContentProvider(viewSite); - - viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); - viewer.setContentProvider(this.contentProvider); - viewer.setLabelProvider(new WorkbenchLabelProvider()); - viewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS); - viewer.setInput(viewSite); - viewer.setComparator(new ViewerComparator() { - @Override - public int compare(Viewer viewer, Object e1, Object e2) { - if (e1 instanceof ServiceNode && e2 instanceof ServiceNode) { - return new Long(((ServiceNode) e2).getServiceId() - ((ServiceNode) e1).getServiceId()).intValue(); - } - return super.compare(viewer, e1, e2); - } - }); - - makeActions(); - hookContextMenu(); - - viewSite.setSelectionProvider(viewer); - - setupListeners(); - - updateModel(); - } - - @Override - public void setFocus() { - } - - protected ServiceNode createServiceNode(long serviceId, long bundleId, long[] usingBundleIds, - Map properties) { - ServiceNode result = new ServiceNode(bundleId, usingBundleIds, properties); - result.addChild(new RegisteringBundleIdNode(bundleId)); - result.addChild(new UsingBundleIdsNode(Messages.AbstractServicesView_UsingBundlesNodeName, usingBundleIds)); - return result; - } - - protected void removedService(long serviceId) { - ServiceNode sn = findServiceNode(serviceId); - if (sn != null) - getServicesRoot().removeChild(sn); - } - - protected ServiceNode findServiceNode(long serviceId) { - AbstractServicesNode[] services = getServicesRoot().getChildren(); - for (AbstractServicesNode asn : services) { - if (asn instanceof ServiceNode) { - ServiceNode sn = (ServiceNode) asn; - if (serviceId == sn.getServiceId()) - return sn; - } - } - return null; - } - - protected void modifiedService(long serviceId, Map properties) { - ServiceNode sn = findServiceNode(serviceId); - if (sn != null) - sn.setProperties(properties); - } - - protected ServicesRootNode getServicesRoot() { - return ((ServicesContentProvider) contentProvider).getServicesRoot(); - } - - protected void addServiceNodes(final Collection sns) { - if (viewer == null) - return; - viewer.getControl().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - ServicesRootNode srn = getServicesRoot(); - for (ServiceNode sn : sns) - srn.addChild(sn); - viewer.setExpandedState(getServicesRoot(), true); - viewer.refresh(); - } - }); - } - - protected void updateService(final int type, final long serviceId, final long bundleId, final long[] usingBundleIds, - final Map properties) { - if (viewer == null) - return; - viewer.getControl().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - switch (type) { - // add - case ServiceEvent.REGISTERED: - getServicesRoot().addChild(createServiceNode(serviceId, bundleId, usingBundleIds, properties)); - break; - // modified properties - case ServiceEvent.MODIFIED: - modifiedService(serviceId, properties); - break; - // removed - case ServiceEvent.UNREGISTERING: - removedService(serviceId); - break; - } - viewer.setExpandedState(getServicesRoot(), true); - viewer.refresh(); - } - }); - - } - -} \ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/ServicesView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/ServicesView.java deleted file mode 100644 index d50b76667..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/ServicesView.java +++ /dev/null @@ -1,108 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.ecf.internal.remoteservices.ui.DiscoveryComponent; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.AbstractServicesContentProvider; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.ServicesContentProvider; -import org.eclipse.ecf.remoteserviceadmin.ui.service.model.ServiceNode; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.ui.IViewSite; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.dto.FrameworkDTO; -import org.osgi.framework.dto.ServiceReferenceDTO; - -/** - * @since 3.3 - */ -public class ServicesView extends AbstractServicesView { - - public static final String ID_VIEW = "org.eclipse.ecf.remoteserviceadmin.ui.views.ServiceView"; //$NON-NLS-1$ - - public ServicesView() { - } - - @Override - public void dispose() { - super.dispose(); - DiscoveryComponent discovery = DiscoveryComponent.getDefault(); - if (discovery != null) { - BundleContext ctxt = discovery.getContext(); - if (ctxt != null) - ctxt.removeServiceListener(serviceListener); - discovery = null; - } - } - - @Override - protected void updateModel() { - final BundleContext ctxt = DiscoveryComponent.getDefault().getContext(); - new Thread(new Runnable() { - @Override - public void run() { - List snds = new ArrayList(); - for (ServiceReferenceDTO sr : getServiceDTOs(ctxt)) - snds.add(createServiceNode(sr.id, sr.bundle, sr.usingBundles, sr.properties)); - addServiceNodes(snds); - } - }).start(); - } - - @Override - protected AbstractServicesContentProvider createContentProvider(IViewSite viewSite) { - return new ServicesContentProvider(viewSite); - } - - private List getServiceDTOs(BundleContext ctxt) { - return ctxt.getBundle(0).adapt(FrameworkDTO.class).services; - } - - private ServiceReferenceDTO getServiceDTO(BundleContext ctxt, ServiceReference sr) { - long serviceId = (Long) sr.getProperty(Constants.SERVICE_ID); - for (ServiceReferenceDTO ref : getServiceDTOs(ctxt)) - if (serviceId == ref.id) - return ref; - return null; - } - - private ServiceListener serviceListener = new ServiceListener() { - @Override - public void serviceChanged(ServiceEvent event) { - if (viewer == null) - return; - BundleContext ctxt = DiscoveryComponent.getDefault().getContext(); - if (ctxt == null) - return; - ServiceReferenceDTO srDTO = getServiceDTO(ctxt, event.getServiceReference()); - if (srDTO != null) - updateService(event.getType(), srDTO.id, srDTO.bundle, srDTO.usingBundles, srDTO.properties); - } - }; - - @Override - protected void setupListeners() { - DiscoveryComponent.getDefault().getContext().addServiceListener(serviceListener); - } - - @Override - protected void fillContextMenu(IMenuManager manager) { - } - - @Override - protected void makeActions() { - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesContentProvider.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesContentProvider.java deleted file mode 100644 index 25b06dd6b..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesContentProvider.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.ui.IViewSite; -import org.eclipse.ui.model.BaseWorkbenchContentProvider; - -/** - * @since 3.3 - */ -public class AbstractServicesContentProvider extends BaseWorkbenchContentProvider { - - private IViewSite viewSite; - private final ServicesRootNode invisibleRoot; - - public AbstractServicesContentProvider(IViewSite viewSite) { - this.viewSite = viewSite; - this.invisibleRoot = new ServicesRootNode(""); //$NON-NLS-1$ - } - - protected IViewSite getViewSite() { - return this.viewSite; - } - - protected ServicesRootNode getInvisibleRoot() { - return this.invisibleRoot; - } - - public Object[] getElements(Object parent) { - if (parent.equals(viewSite)) { - return getChildren(getInvisibleRoot()); - } - return getChildren(parent); - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesNode.java deleted file mode 100644 index b1bba384e..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesNode.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.ecf.internal.remoteservices.ui.Messages; -import org.eclipse.ecf.remoteservices.ui.util.PropertyUtils; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; - -/** - * @since 3.3 - */ -public class AbstractServicesNode implements IAdaptable { - - public static final String CLOSED = Messages.AbstractRSANode_NodeClosed; - - private AbstractServicesNode parent; - private final List children = new ArrayList(); - - public AbstractServicesNode() { - } - - public AbstractServicesNode getParent() { - return this.parent; - } - - protected void setParent(AbstractServicesNode p) { - this.parent = p; - } - - public void addChild(AbstractServicesNode child) { - children.add(child); - child.setParent(this); - } - - public void addChildAtIndex(int index, AbstractServicesNode child) { - children.add(index, child); - child.setParent(this); - } - - public void removeChild(AbstractServicesNode child) { - children.remove(child); - child.setParent(null); - } - - public AbstractServicesNode[] getChildren() { - return (AbstractServicesNode[]) children.toArray(new AbstractServicesNode[children.size()]); - } - - public boolean hasChildren() { - return children.size() > 0; - } - - public void clearChildren() { - children.clear(); - } - - public static String convertStringArrayToString(String[] strings) { - return PropertyUtils.convertStringArrayToString(strings); - } - - public static Map convertServicePropsToMap(ServiceReference sr) { - return PropertyUtils.convertServicePropsToMap(sr); - } - - protected String convertObjectClassToString(ServiceReference sr) { - return (sr == null) ? CLOSED : convertStringArrayToString((String[]) sr.getProperty(Constants.OBJECTCLASS)); - } - - @Override - public Object getAdapter(Class adapter) { - return null; - } -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesWorkbenchAdapter.java deleted file mode 100644 index 7f79cf465..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/AbstractServicesWorkbenchAdapter.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.ui.model.WorkbenchAdapter; - -/** - * @since 3.3 - */ -public class AbstractServicesWorkbenchAdapter extends WorkbenchAdapter { - - @Override - public Object getParent(Object object) { - return ((AbstractServicesNode) object).getParent(); - } - - @Override - public Object[] getChildren(Object object) { - return ((AbstractServicesNode) object).getChildren(); - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/BundleIdNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/BundleIdNode.java deleted file mode 100644 index 795f8b3bf..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/BundleIdNode.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -public class BundleIdNode extends AbstractServicesNode { - - private final long bundleId; - - public BundleIdNode(long bundleId) { - this.bundleId = bundleId; - } - - public long getBundleId() { - return this.bundleId; - } -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/BundleIdNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/BundleIdNodeWorkbenchAdapter.java deleted file mode 100644 index 2dd7f72e5..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/BundleIdNodeWorkbenchAdapter.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.ecf.internal.remoteservices.ui.Messages; -import org.eclipse.jface.resource.ImageDescriptor; - -/** - * @since 3.3 - */ -public class BundleIdNodeWorkbenchAdapter extends AbstractServicesWorkbenchAdapter { - - @Override - public String getLabel(Object object) { - return Messages.BundleIdNodeWorkbenchAdapter_BundleIdNodeLabelPrefix + ((BundleIdNode) object).getBundleId(); - } - - @Override - public ImageDescriptor getImageDescriptor(Object object) { - return null; - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/RegisteringBundleIdNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/RegisteringBundleIdNode.java deleted file mode 100644 index 1e86828d8..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/RegisteringBundleIdNode.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -public class RegisteringBundleIdNode extends BundleIdNode { - - public RegisteringBundleIdNode(long bundleId) { - super(bundleId); - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/RegisteringBundleIdNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/RegisteringBundleIdNodeWorkbenchAdapter.java deleted file mode 100644 index 7cc0b1055..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/RegisteringBundleIdNodeWorkbenchAdapter.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.ecf.internal.remoteservices.ui.Messages; -import org.eclipse.jface.resource.ImageDescriptor; - -/** - * @since 3.3 - */ -public class RegisteringBundleIdNodeWorkbenchAdapter extends AbstractServicesWorkbenchAdapter { - - @Override - public String getLabel(Object object) { - return Messages.RegisteringBundleIdNodeWorkbenchAdapter_RegBundleIdLabelPrefix - + ((RegisteringBundleIdNode) object).getBundleId(); - } - - @Override - public ImageDescriptor getImageDescriptor(Object object) { - return null; - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServiceNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServiceNode.java deleted file mode 100644 index c2957cb23..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServiceNode.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import java.util.Map; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.ui.views.properties.IPropertySource; -import org.osgi.framework.Constants; - -public class ServiceNode extends AbstractServicesNode { - - private final long bundleId; - private final long[] usingBundleIds; - private Map properties; - - public ServiceNode(long bundleId, long[] usingBundles, Map props) { - this.bundleId = bundleId; - this.usingBundleIds = usingBundles; - this.properties = props; - } - - public void setProperties(Map updatedProperties) { - this.properties = updatedProperties; - } - - public long getServiceId() { - return (Long) getProperties().get(Constants.SERVICE_ID); - } - - public long getBundleId() { - return this.bundleId; - } - - public long[] getUsingBundleIds() { - return this.usingBundleIds; - } - - public Map getProperties() { - return this.properties; - } - - public String[] getServiceInterfaces() { - return (String[]) this.properties.get(Constants.OBJECTCLASS); - } - - @Override - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { - if (adapter == IPropertySource.class) - return new ServicePropertySource(getProperties()); - return Platform.getAdapterManager().getAdapter(this, adapter); - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServiceNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServiceNodeWorkbenchAdapter.java deleted file mode 100644 index c710f7b97..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServiceNodeWorkbenchAdapter.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; -import org.eclipse.ecf.remoteservices.ui.util.PropertyUtils; -import org.eclipse.jface.resource.ImageDescriptor; - -/** - * @since 3.3 - */ -public class ServiceNodeWorkbenchAdapter extends AbstractServicesWorkbenchAdapter { - - @Override - public String getLabel(Object object) { - ServiceNode sn = (ServiceNode) object; - return PropertyUtils.convertStringArrayToString(sn.getServiceInterfaces()) + " (" + sn.getServiceId() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ - } - - @Override - public ImageDescriptor getImageDescriptor(Object object) { - return RSAImageRegistry.INTERFACE_OBJ; - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicePropertySource.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicePropertySource.java deleted file mode 100644 index bce8bcd52..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicePropertySource.java +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This program and the - * accompanying materials are made available under the terms of the Eclipse - * Public License v1.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - * - * @since 3.3 - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.eclipse.ui.views.properties.IPropertyDescriptor; -import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.ui.views.properties.PropertyDescriptor; - -/** - * @since 3.3 - */ -public class ServicePropertySource implements IPropertySource { - - private final Map props; - private final List descriptors; - - public ServicePropertySource(Map props) { - this.props = props; - descriptors = new ArrayList(); - for (String k : props.keySet()) - descriptors.add(new PropertyDescriptor(k, k)); - } - - @Override - public Object getEditableValue() { - return null; - } - - @Override - public IPropertyDescriptor[] getPropertyDescriptors() { - return descriptors.toArray(new IPropertyDescriptor[descriptors.size()]); - } - - @Override - public Object getPropertyValue(Object id) { - Object val = props.get(id); - if (val != null) { - if (val instanceof String) - return val; - else if (val instanceof String[]) - return convertArrayToString((String[]) val); - else if (val != null) - return val.toString(); - } - return null; - } - - private String convertArrayToString(String[] val) { - List results = new ArrayList(); - for (String s : val) - results.add(s); - return results.toString(); - } - - @Override - public boolean isPropertySet(Object id) { - return false; - } - - @Override - public void resetPropertyValue(Object id) { - } - - @Override - public void setPropertyValue(Object id, Object value) { - } -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesAdapterFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesAdapterFactory.java deleted file mode 100644 index 15e862d8d..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesAdapterFactory.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.ui.model.IWorkbenchAdapter2; -import org.eclipse.ui.model.IWorkbenchAdapter3; - -/** - * @since 3.3 - */ -public class ServicesAdapterFactory implements IAdapterFactory { - - private ServicesRootNodeWorkbenchAdapter serviceRootAdapter = new ServicesRootNodeWorkbenchAdapter(); - private ServiceNodeWorkbenchAdapter serviceAdapter = new ServiceNodeWorkbenchAdapter(); - private BundleIdNodeWorkbenchAdapter bundleIdAdapter = new BundleIdNodeWorkbenchAdapter(); - private RegisteringBundleIdNodeWorkbenchAdapter registeringBundleIdAdapter = new RegisteringBundleIdNodeWorkbenchAdapter(); - private UsingBundleIdsNodeWorkbenchAdapter usingBundleIdsAdapter = new UsingBundleIdsNodeWorkbenchAdapter(); - - @Override - public Object getAdapter(Object adaptableObject, @SuppressWarnings("rawtypes") Class adapterType) { - if (adapterType.isInstance(adaptableObject)) { - return adaptableObject; - } - if (adapterType == IWorkbenchAdapter.class || adapterType == IWorkbenchAdapter2.class - || adapterType == IWorkbenchAdapter3.class) { - return getWorkbenchElement(adaptableObject); - } - return null; - } - - protected Object getWorkbenchElement(Object adaptableObject) { - if (adaptableObject instanceof ServicesRootNode) - return serviceRootAdapter; - if (adaptableObject instanceof ServiceNode) - return serviceAdapter; - if (adaptableObject instanceof RegisteringBundleIdNode) - return registeringBundleIdAdapter; - if (adaptableObject instanceof UsingBundleIdsNode) - return usingBundleIdsAdapter; - if (adaptableObject instanceof BundleIdNode) - return bundleIdAdapter; - return null; - } - - @SuppressWarnings("rawtypes") - @Override - public Class[] getAdapterList() { - return new Class[] { IWorkbenchAdapter.class, IWorkbenchAdapter2.class, IWorkbenchAdapter3.class }; - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesContentProvider.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesContentProvider.java deleted file mode 100644 index f509e9fc7..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesContentProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.ui.IViewSite; - -/** - * @since 3.3 - */ -public class ServicesContentProvider extends AbstractServicesContentProvider { - - public ServicesContentProvider(IViewSite viewSite) { - super(viewSite); - } - - public ServicesRootNode getServicesRoot() { - return getInvisibleRoot(); - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesRootNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesRootNode.java deleted file mode 100644 index ccefc9808..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesRootNode.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -/** - * @since 3.3 - */ -public class ServicesRootNode extends AbstractServicesNode { - - private final String groupName; - - public ServicesRootNode(String groupName) { - super(); - this.groupName = groupName; - } - - public String getGroupName() { - return groupName; - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesRootNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesRootNodeWorkbenchAdapter.java deleted file mode 100644 index 92678c1fe..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/ServicesRootNodeWorkbenchAdapter.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; - -/** - * @since 3.3 - */ -public class ServicesRootNodeWorkbenchAdapter extends AbstractServicesWorkbenchAdapter { - - @Override - public String getLabel(Object object) { - return ((ServicesRootNode) object).getGroupName(); - } - - @Override - public ImageDescriptor getImageDescriptor(Object object) { - return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/UsingBundleIdsNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/UsingBundleIdsNode.java deleted file mode 100644 index 2f81ab6b7..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/UsingBundleIdsNode.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -public class UsingBundleIdsNode extends AbstractServicesNode { - - private String usingBundlesName; - - public UsingBundleIdsNode(String name, long[] usingBundleIds) { - this.usingBundlesName = name; - for (int i = 0; i < usingBundleIds.length; i++) - addChild(new BundleIdNode(usingBundleIds[i])); - } - - public String getUsingBundleIdsName() { - return this.usingBundlesName; - } - -} diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/UsingBundleIdsNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/UsingBundleIdsNodeWorkbenchAdapter.java deleted file mode 100644 index 809730edd..000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/service/model/UsingBundleIdsNodeWorkbenchAdapter.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ -package org.eclipse.ecf.remoteserviceadmin.ui.service.model; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; - -/** - * @since 3.3 - */ -public class UsingBundleIdsNodeWorkbenchAdapter extends AbstractServicesWorkbenchAdapter { - - @Override - public String getLabel(Object object) { - return ((UsingBundleIdsNode) object).getUsingBundleIdsName(); - } - - @Override - public ImageDescriptor getImageDescriptor(Object object) { - return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); - } - -} -- cgit v1.2.3