Attachment #118782 for bug #256603

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ecf.discovery.edit;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.ecf.discovery.edit.provider.DiscoveryEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.ecf.discovery.edit;x-internal:=true,
 org.eclipse.ecf.discovery.edit.provider;x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
 org.eclipse.ecf.discovery.model;bundle-version="3.0.0",
 org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)"
Eclipse-LazyStart: true




     <view
           allowMultiple="true"
           category="org.eclipse.ui"
           class="org.eclipse.ecf.internal.discovery.ui.views.DiscoveryView"
           icon="icons/full/obj16/dbbrowser_view.gif"
           id="org.eclipse.ecf.discovery.ui.DiscoveryView"
           name="%discovery.view">
     </view>
  </extension>
	
	 <extension
         point="org.eclipse.core.expressions.propertyTesters">
      <propertyTester
            class="org.eclipse.ecf.internal.discovery.ui.property.ServiceTypeTester"
            id="org.eclipse.ecf.discovery.ServiceTypePropertyTester"
            namespace="org.eclipse.ecf.discovery"
            properties="isServiceType"
            type="org.eclipse.ecf.discovery.model.IServiceInfo">
      </propertyTester>
   </extension>


  <!-- map from EMF models to platform's property sources -->
  <extension
        point="org.eclipse.core.runtime.adapters">
     <factory
           adaptableType="org.eclipse.emf.ecore.EObject"
           class="org.eclipse.ecf.internal.discovery.ui.EObjectPropertySourceFactory">
        <adapter
              type="org.eclipse.ui.views.properties.IPropertySource">
        </adapter>
     </factory>
  </extension>    
</plugin>




Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ecf.discovery.ui;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.ecf.internal.discovery.ui.DiscoveryUIPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
 org.eclipse.ecf.discovery.edit;bundle-version="3.0.0",
 org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)",
 org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
 org.eclipse.ecf.discovery.model;bundle-version="3.0.0",
 org.eclipse.core.expressions;bundle-version="3.4.0",
 org.eclipse.ecf.discovery;bundle-version="2.1.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.ecf.discovery.ui;version="3.0.0"




/****************************************************************************
 * Copyright (c) 2008 Versant Corp. and others.
 * 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:
 *    Versant Corp. - initial API and implementation
 *****************************************************************************/
package org.eclipse.ecf.discovery.ui.views;

import org.eclipse.ecf.discovery.edit.provider.DiscoveryEditingDomainProvider;
import org.eclipse.ecf.discovery.ui.statusline.AdapterFactoryStatuslineProvider;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.part.DrillDownAdapter;
import org.eclipse.ui.part.ViewPart;


public class DiscoveryView extends ViewPart {

	public static final String ID = "org.eclipse.ecf.discovery.ui.DiscoveryView";

	private DrillDownAdapter drillDownAdapter;

	private TreeViewer selectionViewer;

	private void contributeToActionBars() {
		IActionBars bars = getViewSite().getActionBars();
		fillLocalPullDown(bars.getMenuManager());
		fillLocalToolBar(bars.getToolBarManager());
	}

	/**
	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. <!--
	 * begin-user-doc --> <!-- end-user-doc -->
	 */
	protected void createContextMenuFor(StructuredViewer viewer) {
		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
		contextMenu.setRemoveAllWhenShown(true);
		Menu menu = contextMenu.createContextMenu(viewer.getControl());
		viewer.getControl().setMenu(menu);
		getSite().registerContextMenu(contextMenu, viewer);
    }

	/* (non-Javadoc)
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
	 */
	public void createPartControl(Composite parent) {
		ComposedAdapterFactory adapterFactory = DiscoveryEditingDomainProvider.eINSTANCE.getAdapterFactory();
		
		// create the viewer
		selectionViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
		selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
		selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
		selectionViewer.setComparator(new ViewerComparator());
		selectionViewer.setFilters(getViewerFilters());
		getSite().setSelectionProvider(selectionViewer);

		// populate the viewer with the model if available
		EList<Resource> resources = DiscoveryEditingDomainProvider.eINSTANCE.getEditingDomain().getResourceSet()
				.getResources();
		if (resources != null) {
			selectionViewer.setInput(resources.get(0));
			selectionViewer.setSelection(new StructuredSelection(resources.get(0)), true);
		}

		new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
		selectionViewer.addPostSelectionChangedListener(new AdapterFactoryStatuslineProvider(adapterFactory,
				getViewSite().getActionBars().getStatusLineManager()));
		
		drillDownAdapter = new DrillDownAdapter(selectionViewer);
		createContextMenuFor(selectionViewer);
		hookContextMenu();
		contributeToActionBars();
	}

	/**
	 * @return
	 */
	private ViewerFilter[] getViewerFilters() {
		//TODO lookup view filters via EP
		return new ViewerFilter[0];
	}

	private void fillContextMenu(IMenuManager manager) {
		manager.add(new Separator());
		drillDownAdapter.addNavigationActions(manager);
		// Other plug-ins can contribute their actions here
		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
	}

	private void fillLocalPullDown(IMenuManager manager) {
		manager.add(new Separator());
	}

	private void fillLocalToolBar(IToolBarManager manager) {
		drillDownAdapter.addNavigationActions(manager);
	}

	private void hookContextMenu() {
		MenuManager menuMgr = new MenuManager("#PopupMenu");
		menuMgr.setRemoveAllWhenShown(true);
		menuMgr.addMenuListener(new IMenuListener() {
			/* (non-Javadoc)
			 * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
			 */
			public void menuAboutToShow(IMenuManager manager) {
				//TODO https://bugs.eclipse.org/bugs/show_bug.cgi?id=151604
				// add a menu listener 
		        // that will fire a selection changed event, in order
		        // to update the selection in contributed actions
				selectionViewer.setSelection(selectionViewer.getSelection());
				
				DiscoveryView.this.fillContextMenu(manager);
			}
		});
		Menu menu = menuMgr.createContextMenu(selectionViewer.getControl());
		selectionViewer.getControl().setMenu(menu);
		getSite().registerContextMenu(menuMgr, selectionViewer);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
	 */
	public void setFocus() {
		selectionViewer.getControl().setFocus();
	}
}




/****************************************************************************
 * Copyright (c) 2008 Versant Corp. and others.
 * 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:
 *    Versant Corp. - initial API and implementation
 *****************************************************************************/
package org.eclipse.ecf.discovery.ui.statusline;

import org.eclipse.ecf.discovery.edit.IItemStatusLineProvider;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;


public class AdapterFactoryStatuslineProvider implements ISelectionChangedListener {
	private ComposedAdapterFactory adapterFactory;
	private IStatusLineManager statusline;

	/**
	 * @param aStatusline
	 * @param adapterFactory
	 */
	public AdapterFactoryStatuslineProvider(ComposedAdapterFactory anAdapterFactory, IStatusLineManager aStatusline) {
		adapterFactory = anAdapterFactory;
		statusline = aStatusline;
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
	 */
	public void selectionChanged(SelectionChangedEvent event) {
		ISelection selection = event.getSelection();
		if (selection instanceof IStructuredSelection) {
			IStructuredSelection ss = (IStructuredSelection) selection;
			EObject object = (EObject) ss.getFirstElement();
			if (object != null) { // do we really have a selection?
				IItemStatusLineProvider itemStatusLineProvider = (IItemStatusLineProvider) adapterFactory
						.adapt(object, IItemStatusLineProvider.class);
				if (itemStatusLineProvider != null) {
					statusline.setMessage(itemStatusLineProvider.getStatusLineText(object));
				} else {
					// fallback to IItemLabelProvider.getText(..)
					IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProvider.class);
					if (itemLabelProvider != null) {
						statusline.setMessage(itemLabelProvider.getText(object));
					}
				}

			}
		} else {
			statusline.setMessage("");
		}
	}
}




/****************************************************************************
 * Copyright (c) 2008 Versant Corp. and others.
 * 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:
 *    Versant Corp. - initial API and implementation
 *****************************************************************************/
package org.eclipse.ecf.discovery.ui;

import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.ui.EclipseUIPlugin;
import org.eclipse.emf.common.util.ResourceLocator;

/**
 * This is the central singleton for the Discovery plugin.
 * <!-- begin-user-doc -->
 * <!-- end-user-doc -->
 * @generated
 */
public final class DiscoveryUIPlugin extends EMFPlugin {
	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public static final String copyright = "";
	
	/**
	 * Keep track of the singleton.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public static final DiscoveryUIPlugin INSTANCE = new DiscoveryUIPlugin();
	
	/**
	 * Keep track of the singleton.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	private static Implementation plugin;

	/**
	 * Create the instance.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public DiscoveryUIPlugin() {
		super
			(new ResourceLocator [] {
			});
	}

	/**
	 * Returns the singleton instance of the Eclipse plugin.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the singleton instance.
	 * @generated
	 */
	@Override
	public ResourceLocator getPluginResourceLocator() {
		return plugin;
	}
	
	/**
	 * Returns the singleton instance of the Eclipse plugin.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the singleton instance.
	 * @generated
	 */
	public static Implementation getPlugin() {
		return plugin;
	}
	
	/**
	 * The actual implementation of the Eclipse <b>Plugin</b>.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public static class Implementation extends EclipseUIPlugin {
		/**
		 * Creates an instance.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		public Implementation() {
			super();
	
			// Remember the static instance.
			//
			plugin = this;
		}
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Versant Corp.
 * 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:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/

package org.eclipse.ecf.discovery.ui;

import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.ecf.discovery.IServiceInfo;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.handlers.HandlerUtil;

public class DiscoveryHandlerUtil {
	public static IServiceInfo getActiveIServiceInfoChecked(ExecutionEvent event) throws ExecutionException {
		ISelection selection = HandlerUtil.getCurrentSelectionChecked(event);
		org.eclipse.ecf.discovery.model.IServiceInfo serviceInfo = toIServiceInfo(selection);
		if(serviceInfo == null) {
			return null;
		} else {
			return serviceInfo.getEcfServiceInfo();
		}
	}
	public static IServiceInfo getActiveIServiceInfo(ExecutionEvent event) {
		ISelection selection = HandlerUtil.getCurrentSelection(event);
		org.eclipse.ecf.discovery.model.IServiceInfo serviceInfo = toIServiceInfo(selection);
		if(serviceInfo == null) {
			return null;
		} else {
			return serviceInfo.getEcfServiceInfo();
		}
	}
	private static org.eclipse.ecf.discovery.model.IServiceInfo toIServiceInfo(ISelection selection) {
		if(selection instanceof IStructuredSelection) {
			return (org.eclipse.ecf.discovery.model.IServiceInfo) ((IStructuredSelection) selection).getFirstElement();
		}
		return null;
	}
}




/****************************************************************************
 * Copyright (c) 2008 Versant Corp. and others.
 * 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:
 *    Versant Corp. - initial API and implementation
 *****************************************************************************/
package org.eclipse.ecf.internal.discovery.ui.statusline;

import org.eclipse.ecf.discovery.edit.IItemStatusLineProvider;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;


public class AdapterFactoryStatuslineProvider implements ISelectionChangedListener {
	private ComposedAdapterFactory adapterFactory;
	private IStatusLineManager statusline;

	/**
	 * @param aStatusline
	 * @param adapterFactory
	 */
	public AdapterFactoryStatuslineProvider(ComposedAdapterFactory anAdapterFactory, IStatusLineManager aStatusline) {
		adapterFactory = anAdapterFactory;
		statusline = aStatusline;
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
	 */
	public void selectionChanged(SelectionChangedEvent event) {
		ISelection selection = event.getSelection();
		if (selection instanceof IStructuredSelection) {
			IStructuredSelection ss = (IStructuredSelection) selection;
			EObject object = (EObject) ss.getFirstElement();
			if (object != null) { // do we really have a selection?
				IItemStatusLineProvider itemStatusLineProvider = (IItemStatusLineProvider) adapterFactory
						.adapt(object, IItemStatusLineProvider.class);
				if (itemStatusLineProvider != null) {
					statusline.setMessage(itemStatusLineProvider.getStatusLineText(object));
				} else {
					// fallback to IItemLabelProvider.getText(..)
					IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProvider.class);
					if (itemLabelProvider != null) {
						statusline.setMessage(itemLabelProvider.getText(object));
					}
				}

			}
		} else {
			statusline.setMessage("");
		}
	}
}




/****************************************************************************
 * Copyright (c) 2008 Versant Corp. and others.
 * 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:
 *    Versant Corp. - initial API and implementation
 *****************************************************************************/
package org.eclipse.ecf.internal.discovery.ui;

import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.ui.provider.PropertySource;
import org.eclipse.ui.views.properties.IPropertySource;

public class EObjectPropertySourceFactory implements IAdapterFactory {

	/* (non-Javadoc)
	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
	 */
	public Object getAdapter(Object adaptableObject, Class adapterType) {
		if (adapterType.equals(IPropertySource.class) && adaptableObject instanceof EObject) {
			EObject eObj = (EObject) adaptableObject;
			EList<Adapter> adapters = eObj.eAdapters();
			for (Adapter adapter : adapters) {
				if (adapter instanceof IItemPropertySource) {
					//TODO handle the case with multiple IItemPropertySource adapters for this EObject
					return new PropertySource(adaptableObject, (IItemPropertySource) adapter);
				}
			}
		}
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
	 */
	public Class[] getAdapterList() {
		return new Class[] { IPropertySource.class };
	}
}




/****************************************************************************
 * Copyright (c) 2008 Versant Corp. and others.
 * 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:
 *    Versant Corp. - initial API and implementation
 *****************************************************************************/
package org.eclipse.ecf.internal.discovery.ui;

import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.ui.EclipseUIPlugin;
import org.eclipse.emf.common.util.ResourceLocator;

/**
 * This is the central singleton for the Discovery plugin.
 * <!-- begin-user-doc -->
 * <!-- end-user-doc -->
 * @generated
 */
public final class DiscoveryUIPlugin extends EMFPlugin {
	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public static final String copyright = "";
	
	/**
	 * Keep track of the singleton.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public static final DiscoveryUIPlugin INSTANCE = new DiscoveryUIPlugin();
	
	/**
	 * Keep track of the singleton.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	private static Implementation plugin;

	/**
	 * Create the instance.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public DiscoveryUIPlugin() {
		super
			(new ResourceLocator [] {
			});
	}

	/**
	 * Returns the singleton instance of the Eclipse plugin.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the singleton instance.
	 * @generated
	 */
	@Override
	public ResourceLocator getPluginResourceLocator() {
		return plugin;
	}
	
	/**
	 * Returns the singleton instance of the Eclipse plugin.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the singleton instance.
	 * @generated
	 */
	public static Implementation getPlugin() {
		return plugin;
	}
	
	/**
	 * The actual implementation of the Eclipse <b>Plugin</b>.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public static class Implementation extends EclipseUIPlugin {
		/**
		 * Creates an instance.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		public Implementation() {
			super();
	
			// Remember the static instance.
			//
			plugin = this;
		}
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Versant Corp.
 * 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:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/

package org.eclipse.ecf.internal.discovery.ui.property;

import java.util.Arrays;
import java.util.List;

import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.ecf.discovery.model.IServiceInfo;
import org.eclipse.ecf.discovery.model.IServiceTypeID;

public class ServiceTypeTester extends PropertyTester {

	/* (non-Javadoc)
	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
	 */
	public boolean test(Object receiver, String property, Object[] args,
			Object expectedValue) {
		if(args == null || !(expectedValue instanceof Boolean)) {
			return false;
		}
		boolean expected = ((Boolean)expectedValue).booleanValue();
		
		// convert the args to a list we can use for comparison
		List<Object> asList = Arrays.asList(args);
		
		// extract the sublist from the service types
		IServiceInfo serviceInfo = (IServiceInfo) receiver;
		IServiceTypeID serviceTypeId = serviceInfo.getServiceID().getServiceTypeID();
		List<String> services = serviceTypeId.getEcfServices();
		if(services.size() < args.length) {
			return false;
		} else {
			List<String> ecfServices = services.subList(0, args.length);
			boolean equals = asList.equals(ecfServices);
			return equals == expected ? true : false;
		}
	}
}




/****************************************************************************
 * Copyright (c) 2008 Versant Corp. and others.
 * 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:
 *    Versant Corp. - initial API and implementation
 *****************************************************************************/
package org.eclipse.ecf.internal.discovery.ui.views;

import org.eclipse.ecf.discovery.edit.provider.DiscoveryEditingDomainProvider;
import org.eclipse.ecf.internal.discovery.ui.statusline.AdapterFactoryStatuslineProvider;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DragSourceAdapter;
import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.CollapseAllHandler;
import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.part.DrillDownAdapter;
import org.eclipse.ui.part.ViewPart;


public class DiscoveryView extends ViewPart {

	public static final String ID = "org.eclipse.ecf.discovery.ui.DiscoveryView";

	private DrillDownAdapter drillDownAdapter;

	private TreeViewer selectionViewer;

	private CollapseAllHandler collapseHandler;


	private void contributeToActionBars() {
		IActionBars bars = getViewSite().getActionBars();
		fillLocalPullDown(bars.getMenuManager());
		fillLocalToolBar(bars.getToolBarManager());
	}

	/**
	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. <!--
	 * begin-user-doc --> <!-- end-user-doc -->
	 */
	protected void createContextMenuFor(StructuredViewer viewer) {
		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
		contextMenu.setRemoveAllWhenShown(true);
		Menu menu = contextMenu.createContextMenu(viewer.getControl());
		viewer.getControl().setMenu(menu);
		getSite().registerContextMenu(contextMenu, viewer);
    }

	/* (non-Javadoc)
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
	 */
	public void createPartControl(Composite parent) {
		ComposedAdapterFactory adapterFactory = DiscoveryEditingDomainProvider.eINSTANCE.getAdapterFactory();
		
		// create the viewer
		selectionViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
		selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
		selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
		selectionViewer.setComparator(new ViewerComparator());
		selectionViewer.setFilters(getViewerFilters());
		getSite().setSelectionProvider(selectionViewer);

		// populate the viewer with the model if available
		EList<Resource> resources = DiscoveryEditingDomainProvider.eINSTANCE.getEditingDomain().getResourceSet()
				.getResources();
		if (resources != null) {
			selectionViewer.setInput(resources.get(0));
			selectionViewer.setSelection(new StructuredSelection(resources.get(0)), true);
		}

		new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
		selectionViewer.addPostSelectionChangedListener(new AdapterFactoryStatuslineProvider(adapterFactory,
				getViewSite().getActionBars().getStatusLineManager()));
		
		drillDownAdapter = new DrillDownAdapter(selectionViewer);
		createContextMenuFor(selectionViewer);
		hookContextMenu();
		contributeToActionBars();
		
		// add collapse handler
		IHandlerService handlerService = (IHandlerService) getSite().getService(IHandlerService.class);
		collapseHandler = new CollapseAllHandler(selectionViewer);
		handlerService.activateHandler(CollapseAllHandler.COMMAND_ID, collapseHandler);
		
		// add DND support
		Transfer[] supportedTransfers = { LocalSelectionTransfer.getTransfer() };
		selectionViewer.addDragSupport(DND.DROP_DEFAULT | DND.DROP_COPY | DND.DROP_MOVE, supportedTransfers, new DragSourceAdapter() {
			@Override
			public void dragSetData(DragSourceEvent event) {
				LocalSelectionTransfer.getTransfer().setSelection(selectionViewer.getSelection());
			}
		});
		
		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, "org.eclipse.ecf.discovery.ui.ServiceView");
	}

	/**
	 * @return
	 */
	private ViewerFilter[] getViewerFilters() {
		//TODO lookup view filters via EP
		return new ViewerFilter[0];
	}

	private void fillContextMenu(IMenuManager manager) {
		manager.add(new Separator());
		drillDownAdapter.addNavigationActions(manager);

		// Other plug-ins can contribute their actions here
		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
	}

	private void fillLocalPullDown(IMenuManager manager) {
		manager.add(new Separator());
	}

	private void fillLocalToolBar(IToolBarManager manager) {
		drillDownAdapter.addNavigationActions(manager);
	}

	private void hookContextMenu() {
		MenuManager menuMgr = new MenuManager("#PopupMenu");
		menuMgr.setRemoveAllWhenShown(true);
		menuMgr.addMenuListener(new IMenuListener() {
			/* (non-Javadoc)
			 * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
			 */
			public void menuAboutToShow(IMenuManager manager) {
				//TODO https://bugs.eclipse.org/bugs/show_bug.cgi?id=151604
				// add a menu listener 
		        // that will fire a selection changed event, in order
		        // to update the selection in contributed actions
				selectionViewer.setSelection(selectionViewer.getSelection());
				
				DiscoveryView.this.fillContextMenu(manager);
			}
		});
		Menu menu = menuMgr.createContextMenu(selectionViewer.getControl());
		selectionViewer.getControl().setMenu(menu);
		getSite().registerContextMenu(menuMgr, selectionViewer);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
	 */
	public void setFocus() {
		selectionViewer.getControl().setFocus();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
	 */
	public void dispose() {
		super.dispose();
		collapseHandler.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Versant Corp.
 * 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:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/

package org.eclipse.ecf.discovery.ui;

import org.eclipse.ecf.discovery.IServiceInfo;

public class DiscoveryPropertyTesterUtil {

	public static IServiceInfo getIServiceInfoReceiver(Object receiver) {
		if(receiver instanceof org.eclipse.ecf.discovery.model.IServiceInfo) {
			org.eclipse.ecf.discovery.model.IServiceInfo isi = (org.eclipse.ecf.discovery.model.IServiceInfo) receiver;
			return isi.getEcfServiceInfo();
		}
		return null;
	}

}

Lines 1-7 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	3	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	4	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
		5	<classpathentry kind="src" path="src"/>
6	<classpathentry kind="output" path="bin"/>	6	<classpathentry kind="output" path="bin"/>
7	</classpath>	7	</classpath>

Lines 3-9 Link Here

(-)build.properties (-1 / +2 lines)
3	bin.includes = META-INF/,\	3	bin.includes = META-INF/,\
4	.,\	4	.,\
5	about.html,\	5	about.html,\
6	plugin.properties	6	plugin.properties,\
		7	plugin.xml
7	src.includes = about.html,\	8	src.includes = about.html,\
8	META-INF/,\	9	META-INF/,\
9	plugin.properties	10	plugin.properties

Lines 32-37 Link Here

(-)src/org/eclipse/ecf/internal/remoteservices/ui/Messages.java (+7 lines)
32	public static String MethodInvocationDialog_InvocationTypeRemoteServiceProxy;	32	public static String MethodInvocationDialog_InvocationTypeRemoteServiceProxy;
33	public static String MethodInvocationDialog_InvocationTypeSynchronous;	33	public static String MethodInvocationDialog_InvocationTypeSynchronous;
34		34
		35	public static String AbstractRemoteServiceAccessHandler_DISCONNECT_MENU_TEXT;
		36	public static String AbstractRemoteServiceAccessHandler_MSG_BOX_RECEIVED_EXCEPTION_TEXT;
		37	public static String AbstractRemoteServiceAccessHandler_MSG_BOX_RECEIVED_EXCEPTION_TITLE;
		38	public static String AbstractRemoteServiceAccessHandler_MSG_BOX_RECEIVED_RESP_TEXT;
		39	public static String AbstractRemoteServiceAccessHandler_MSG_BOX_RECEIVED_RESP_TITLE;
		40	public static String AbstractRemoteServiceAccessHandler_NOT_AVAILABLE_MENU_TEXT;
		41
35	static {	42	static {
36	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	43	NLS.initializeMessages(BUNDLE_NAME, Messages.class);
37	}	44	}




Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Require-Bundle: org.eclipse.core.runtime,
 org.eclipse.ui,
 org.eclipse.core.expressions;bundle-version="3.4.0",
 org.eclipse.ecf;bundle-version="2.0.1",
 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"
Export-Package: org.eclipse.ecf.remoteservices.ui;version="3.0.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.ecf.internal.remoteservices.ui.Activator




/*******************************************************************************
 * Copyright (c) 2008 Versant Corp.
 * 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:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/
package org.eclipse.ecf.internal.remoteservices.ui.handlers;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ecf.core.ContainerConnectException;
import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.internal.remoteservices.ui.RemoteServiceHandlerUtil;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;

public class ConnectRemoteServicehandler extends AbstractHandler {

	public Object execute(final ExecutionEvent event) throws ExecutionException {
		final ID createConnectId = RemoteServiceHandlerUtil.getActiveConnectIDChecked(event);
		// decouple the long running connect call from the ui thread
		Job job = new Job(NLS.bind("Connecting {0}", createConnectId.getName())) {
			protected IStatus run(IProgressMonitor monitor) {
				try {
					final IContainer container = RemoteServiceHandlerUtil.getActiveIRemoteServiceContainerChecked(event);
					container.connect(createConnectId, null);
				} catch (ContainerConnectException e) {
					showException(e);
					return Status.CANCEL_STATUS;
				} catch (ExecutionException e) {
					showException(e);
					return Status.CANCEL_STATUS;
				}
				return Status.OK_STATUS;
			}
		};
		job.setUser(true);
		job.schedule();
		return null;
	}

	private void showException(final Throwable t) {
		Display.getDefault().asyncExec(new Runnable() {
			public void run() {
				String msg = t.toString();
				if (t.getCause() != null) {
					msg += t.getCause().toString();
				}
				MessageDialog.openError(null, t.getLocalizedMessage(), NLS.bind("Exception: {0}", msg));
			}
		});
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Versant Corp.
 * 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:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/
package org.eclipse.ecf.internal.remoteservices.ui.property;


import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.IContainerManager;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.IDCreateException;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.discovery.IServiceInfo;
import org.eclipse.ecf.discovery.ui.DiscoveryPropertyTesterUtil;
import org.eclipse.ecf.internal.remoteservices.ui.Activator;
import org.eclipse.ecf.remoteservice.Constants;

public class ConnectedTester extends PropertyTester {
	
	private IContainerManager containerManager;

	public ConnectedTester() {
		containerManager = Activator.getDefault().getContainerManager();
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
	 */
	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
		// consumers expect connected or disconnected
		if(!(expectedValue instanceof Boolean)) {
			return false;
		}
		boolean expected = ((Boolean) expectedValue).booleanValue();

		// get the container instance
		IServiceInfo serviceInfo = DiscoveryPropertyTesterUtil.getIServiceInfoReceiver(receiver);
		final String connectNamespace = getConnectNamespace(serviceInfo);
		final String connectId = getConnectID(serviceInfo);
		try {
			ID createConnectId = IDFactory.getDefault().createID(connectNamespace, connectId);
			IContainer container = containerManager.getContainer(createConnectId);
			if(container == null) {
				//Trace.trace(...);
				return expected == false;
			}
			ID connectedId = container.getConnectedID();
			boolean isConnected = connectedId == null ? false : true;
			return expected == isConnected;
		} catch (IDCreateException e) {
			//Trace.trace(...);
			return expected == false;
		}
	}

	private String getConnectNamespace(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_CONNECT_ID_NAMESPACE_PROPERTY);
	}

	private String getConnectID(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_CONNECT_ID_PROPERTY);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Versant Corp.
 * 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:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/
package org.eclipse.ecf.internal.remoteservices.ui.handlers;

import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.util.IAsyncResult;
import org.eclipse.ecf.internal.remoteservices.ui.RemoteServiceHandlerUtil;
import org.eclipse.ecf.remoteservice.IRemoteCall;
import org.eclipse.ecf.remoteservice.IRemoteCallListener;
import org.eclipse.ecf.remoteservice.IRemoteService;
import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
import org.eclipse.ecf.remoteservice.events.IRemoteCallCompleteEvent;
import org.eclipse.ecf.remoteservice.events.IRemoteCallEvent;
import org.eclipse.ecf.remoteservices.ui.MethodInvocationDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

public class ReflectiveRemoteServiceHandler extends AbstractHandler implements
		IHandler {

	/*
	 * (non-Javadoc)
	 * @see
	 * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
	 * .ExecutionEvent)
	 */
	public Object execute(ExecutionEvent event) throws ExecutionException {
		final String clazz = event.getParameter("org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogParameter");
		final IRemoteServiceContainerAdapter adapter = RemoteServiceHandlerUtil.getActiveIRemoteServiceContainerAdapterChecked(event);
		final IRemoteServiceReference[] references = RemoteServiceHandlerUtil.getActiveIRemoteServiceReferencesChecked(event);
		final IRemoteService remoteService = adapter.getRemoteService(references[0]);
		try {
			executeMethodInvocationDialog(Class.forName(clazz), remoteService);
		} catch (ClassNotFoundException e) {
			throw new ExecutionException(e.getMessage(), e);
		}
		return null;
	}

	private void executeMethodInvocationDialog(final Class cls, final IRemoteService remoteService) {
		final MethodInvocationDialog mid = new MethodInvocationDialog(
				(Shell) null, cls);
		if (mid.open() == Window.OK) {
			final int timeout = (mid.getTimeout() > 0) ? mid.getTimeout()
					: 30000;
			final String methodName = mid.getMethod().getName();
			final Object[] methodArgs = mid.getMethodArguments();
			final IRemoteCall remoteCall = new IRemoteCall() {
				public String getMethod() {
					return methodName;
				}

				public Object[] getParameters() {
					return methodArgs;
				}

				public long getTimeout() {
					return timeout;
				}
			};
			final int invokeType = mid.getInvocationType();
			try {
				switch (invokeType) {
				case MethodInvocationDialog.ASYNC_FIRE_AND_GO:
					remoteService.callAsynch(remoteCall);
					break;
				case MethodInvocationDialog.ASYNC_FUTURE_RESULT:
					invokeFuture(cls, remoteService, remoteCall);
					break;
				case MethodInvocationDialog.ASYNC_LISTENER:
					invokeAsyncListener(cls, remoteService, remoteCall);
					break;
				case MethodInvocationDialog.OSGI_SERVICE_PROXY:
					throw new UnsupportedOperationException();
					// invokeOSGiProxy(interfaceClass, remoteCall);
					// break;
				case MethodInvocationDialog.REMOTE_SERVICE_PROXY:
					throw new UnsupportedOperationException();
					// invokeProxy(interfaceClass, remoteService, remoteCall);
					// break;
				case MethodInvocationDialog.SYNCHRONOUS:
					throw new UnsupportedOperationException();
					// invokeSync(cls, remoteService, remoteCall);
					// break;
				default:
					break;
				}
			} catch (final Exception e) {
				showException(e);
			}
		}
	}

	protected void showException(final Throwable t, final IContainer container,
			ID targetID) {
		Display.getDefault().asyncExec(new Runnable() {
			public void run() {
				String msg = t.toString();
				if (t.getCause() != null) {
					msg += t.getCause().toString();
				}
				MessageDialog.openInformation(null, "Received Exception", NLS
						.bind("Exception: {0}", msg));
				container.disconnect();
			}
		});
	}

	protected void invokeFuture(Class cls, IRemoteService remoteService,
			IRemoteCall remoteCall) throws InterruptedException,
			InvocationTargetException {
		// Make async call with future result
		final IAsyncResult asyncResult = remoteService.callAsynch(remoteCall);
		// Call blocking get and show result
		showResult(cls.getName(), remoteCall, asyncResult.get());
	}

	private void invokeAsyncListener(final Class interfaceClass,
			final IRemoteService remoteService, final IRemoteCall remoteCall) {
		// Make async call
		remoteService.callAsynch(remoteCall, new IRemoteCallListener() {
			public void handleEvent(IRemoteCallEvent event) {
				if (event instanceof IRemoteCallCompleteEvent) {
					final IRemoteCallCompleteEvent complete = (IRemoteCallCompleteEvent) event;
					if (complete.hadException()) {
						showException(complete.getException());
					} else
						showResult(interfaceClass.getName(), remoteCall,
								complete.getResponse());
				}
			}
		});
	}

	protected void showException(final Throwable t) {
		Display.getDefault().asyncExec(new Runnable() {
			public void run() {
				String msg = t.toString();
				if (t.getCause() != null) {
					msg += t.getCause().toString();
				}
				MessageDialog.openInformation(null, "Received Exception", NLS
						.bind("Exception: {0}", msg));
			}
		});
	}

	protected void showResult(final String serviceInterface,
			final IRemoteCall remoteCall, final Object result) {
		final Object display = (result != null && result.getClass().isArray()) ? Arrays
				.asList((Object[]) result)
				: result;
		final Object[] bindings = new Object[] { serviceInterface,
				remoteCall.getMethod(),
				Arrays.asList(remoteCall.getParameters()), display };
		Display.getDefault().asyncExec(new Runnable() {
			public void run() {
				MessageDialog
						.openInformation(
								null,
								"Received Response",
								NLS
										.bind(
												"Service Interface:\n{0}\n\nMethod: {1}\nParameters: {2}\n\nResult:  {3}",
												bindings));
			}
		});
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Versant Corp.
 * 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:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/

package org.eclipse.ecf.internal.remoteservices.ui;

import org.eclipse.ecf.core.IContainerManager;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;

public class Activator extends AbstractUIPlugin {

	private volatile ServiceTracker containerManagerTracker;
	// The shared instance
	private volatile static Activator plugin;
	
	/**
	 * The constructor
	 */
	public Activator() {
		plugin = this;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
	 */
	public void stop(BundleContext context) throws Exception {
		plugin = null;
		if(containerManagerTracker != null) {
			containerManagerTracker.close();
			containerManagerTracker = null;
		}
		super.stop(context);
	}
	
	/**
	 * Returns the shared instance
	 *
	 * @return the shared instance
	 */
	public static Activator getDefault() {
		return plugin;
	}

	public IContainerManager getContainerManager() {
		BundleContext context = getBundle().getBundleContext();
		if (containerManagerTracker == null) {
			containerManagerTracker = new ServiceTracker(context, IContainerManager.class.getName(), null);
			containerManagerTracker.open();
		}
		return (IContainerManager) containerManagerTracker.getService();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Versant Corp.
 * 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:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/

package org.eclipse.ecf.internal.remoteservices.ui;

import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.ecf.core.ContainerCreateException;
import org.eclipse.ecf.core.ContainerFactory;
import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.IContainerManager;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.IDCreateException;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.discovery.IServiceInfo;
import org.eclipse.ecf.discovery.ui.DiscoveryHandlerUtil;
import org.eclipse.ecf.remoteservice.Constants;
import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
import org.osgi.framework.InvalidSyntaxException;

public class RemoteServiceHandlerUtil {

	public static IRemoteServiceContainerAdapter getActiveIRemoteServiceContainerAdapterChecked(ExecutionEvent event) throws ExecutionException {
		final ID activeConnectId = getActiveConnectIDChecked(event);
		final IContainerManager containerManager = Activator.getDefault().getContainerManager();
		final IContainer container = containerManager.getContainer(activeConnectId);
		final IRemoteServiceContainerAdapter adapter = (IRemoteServiceContainerAdapter) container.getAdapter(IRemoteServiceContainerAdapter.class);
		return adapter;
	}

	public static IRemoteServiceReference[] getActiveIRemoteServiceReferencesChecked(ExecutionEvent event) throws ExecutionException {
		IServiceInfo serviceInfo = DiscoveryHandlerUtil.getActiveIServiceInfoChecked(event);
		IRemoteServiceContainerAdapter adapter = getActiveIRemoteServiceContainerAdapterChecked(event);
		try {
			return getRemoteServiceReferencesForRemoteServiceAdapter(adapter, serviceInfo);
		} catch (IDCreateException e) {
			throw new ExecutionException(e.getMessage(), e);
		} catch (InvalidSyntaxException e) {
			throw new ExecutionException(e.getMessage(), e);
		}
	}

	public static ID getActiveConnectIDChecked(ExecutionEvent event) throws ExecutionException {
		IServiceInfo serviceInfo = DiscoveryHandlerUtil.getActiveIServiceInfoChecked(event);
		final String connectNamespace = getConnectNamespace(serviceInfo);
		final String connectId = getConnectID(serviceInfo);
		try {
			return IDFactory.getDefault().createID(connectNamespace, connectId);
		} catch (IDCreateException e) {
			throw new ExecutionException(e.getMessage(), e);
		}
	}

	public static IContainer getActiveIRemoteServiceContainerChecked(ExecutionEvent event) throws ExecutionException {
		final IServiceInfo serviceInfo = DiscoveryHandlerUtil.getActiveIServiceInfoChecked(event);
		final ID createConnectId = getActiveConnectIDChecked(event);
		//TODO remove parameters once https://bugs.eclipse.org/bugs/show_bug.cgi?id=256586 is fixed
		final Object[] parameters = new Object[]{createConnectId};
		try {
			return ContainerFactory.getDefault().createContainer(getContainerFactory(serviceInfo), parameters);
		} catch (ContainerCreateException e) {
			throw new ExecutionException(e.getMessage(), e);
		}
	}

	private static IRemoteServiceReference[] getRemoteServiceReferencesForRemoteServiceAdapter(IRemoteServiceContainerAdapter adapter, IServiceInfo serviceInfo) throws InvalidSyntaxException, IDCreateException {
		ID serviceID = null;
		String serviceNamespace = getServiceNamespace(serviceInfo);
		String serviceid = getServiceID(serviceInfo);
		if (serviceNamespace != null && serviceid != null) {
			serviceID = IDFactory.getDefault().createID(serviceNamespace, serviceid);
		}
		ID[] targets = (serviceID == null) ? null : new ID[] {serviceID};
		return adapter.getRemoteServiceReferences(targets, getRemoteServiceClass(serviceInfo), getFilter(serviceInfo));
	}
	
	private static String getServiceNamespace(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_SERVICE_ID_NAMESPACE_PROPERTY);
	}
	private static String getServiceID(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_SERVICE_ID_PROPERTY);
	}
	private static String getRemoteServiceClass(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_OBJECTCLASS_PROPERTY);
	}
	private static String getFilter(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_FILTER_PROPERTY);
	}
	private static String getConnectNamespace(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_CONNECT_ID_NAMESPACE_PROPERTY);
	}
	private static String getConnectID(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_CONNECT_ID_PROPERTY);
	}
	private static String getContainerFactory(IServiceInfo serviceInfo) {
		return serviceInfo.getServiceProperties().getPropertyString(Constants.DISCOVERY_CONTAINER_FACTORY_PROPERTY);
	}
}




<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
   <extension
         point="org.eclipse.ui.commands">
      <command
            defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.ConnectRemoteServicehandler"
            id="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"
            name="Connect Command">
      </command>
      <command
            defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.ReflectiveRemoteServiceHandler"
            id="org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogHandler"
            name="Reflective Method Invocation Command">
         <commandParameter
               id="org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogParameter"
               name="name"
               optional="true">
         </commandParameter>
      </command>
   </extension>
   <extension
         point="org.eclipse.ui.menus">
      <menuContribution
            locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">
         <command
               commandId="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"
               id="org.eclipse.ecf.remoteservices.ui.menus.connectCommand"
               mnemonic="S">
            <visibleWhen>
               <with
                     variable="activeMenuSelection">
                  <iterate
                        ifEmpty="false"
                        operator="and">
                     <test
                           args="remotesvcs"
                           property="org.eclipse.ecf.discovery.isServiceType"
                           value="true">
                     </test>
                     <test
                           property="org.eclipse.ecf.remoteservices.isConnected"
                           value="false">
                     </test>
                  </iterate>
               </with>
            </visibleWhen>
         </command>
      </menuContribution>
   </extension>

	 <extension
         point="org.eclipse.core.expressions.propertyTesters">
      <propertyTester
            class="org.eclipse.ecf.internal.remoteservices.ui.property.ConnectedTester"
            id="org.eclipse.ecf.remoteservices.ui.property.ConnectedPropertyTester"
            namespace="org.eclipse.ecf.remoteservices"
            properties="isConnected"
            type="org.eclipse.ecf.discovery.model.IServiceInfo">
      </propertyTester>
   </extension>

</plugin>




Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ecf.discovery.model;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
 org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
 org.eclipse.ecf.discovery;bundle-version="2.0.0",
 org.eclipse.ecf;bundle-version="2.0.0"
Eclipse-LazyStart: true
Export-Package: org.eclipse.ecf.discovery.model,
 org.eclipse.ecf.discovery.model.impl,

Return to bug 256603

Lines 2-16 Link Here

(-)META-INF/MANIFEST.MF (-6 / +6 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ecf.discovery.edit;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ecf.discovery.edit;singleton:=true
5	Bundle-Version: 2.0.0.qualifier	5	Bundle-Version: 3.0.0.qualifier
6	Bundle-ClassPath: .	6	Bundle-ClassPath: .
7	Bundle-Activator: org.eclipse.ecf.discovery.edit.provider.DiscoveryEditPlugin$Implementation	7	Bundle-Activator: org.eclipse.ecf.discovery.edit.provider.DiscoveryEditPlugin$Implementation
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName
9	Bundle-Localization: plugin	9	Bundle-Localization: plugin
10	Bundle-RequiredExecutionEnvironment: J2SE-1.5	10	Bundle-RequiredExecutionEnvironment: J2SE-1.5
11	Export-Package: org.eclipse.ecf.discovery.edit,	11	Export-Package: org.eclipse.ecf.discovery.edit;x-internal:=true,
12	org.eclipse.ecf.discovery.edit.provider	12	org.eclipse.ecf.discovery.edit.provider;x-internal:=true
13	Require-Bundle: org.eclipse.core.runtime,	13	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
14	org.eclipse.ecf.discovery.model;visibility:=reexport,	14	org.eclipse.ecf.discovery.model;bundle-version="3.0.0",
15	org.eclipse.emf.edit;visibility:=reexport	15	org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)"
16	Eclipse-LazyStart: true	16	Eclipse-LazyStart: true

Lines 6-15 Link Here

(-)plugin.xml (-1 / +25 lines)
6	<view	6	<view
7	allowMultiple="true"	7	allowMultiple="true"
8	category="org.eclipse.ui"	8	category="org.eclipse.ui"
9	class="org.eclipse.ecf.discovery.ui.views.DiscoveryView"	9	class="org.eclipse.ecf.internal.discovery.ui.views.DiscoveryView"
10	icon="icons/full/obj16/dbbrowser_view.gif"	10	icon="icons/full/obj16/dbbrowser_view.gif"
11	id="org.eclipse.ecf.discovery.ui.DiscoveryView"	11	id="org.eclipse.ecf.discovery.ui.DiscoveryView"
12	name="%discovery.view">	12	name="%discovery.view">
13	</view>	13	</view>
14	</extension>	14	</extension>
		15
		16	<extension
		17	point="org.eclipse.core.expressions.propertyTesters">
		18	<propertyTester
		19	class="org.eclipse.ecf.internal.discovery.ui.property.ServiceTypeTester"
		20	id="org.eclipse.ecf.discovery.ServiceTypePropertyTester"
		21	namespace="org.eclipse.ecf.discovery"
		22	properties="isServiceType"
		23	type="org.eclipse.ecf.discovery.model.IServiceInfo">
		24	</propertyTester>
		25	</extension>
		26
		27
		28	<!-- map from EMF models to platform's property sources -->
		29	<extension
		30	point="org.eclipse.core.runtime.adapters">
		31	<factory
		32	adaptableType="org.eclipse.emf.ecore.EObject"
		33	class="org.eclipse.ecf.internal.discovery.ui.EObjectPropertySourceFactory">
		34	<adapter
		35	type="org.eclipse.ui.views.properties.IPropertySource">
		36	</adapter>
		37	</factory>
		38	</extension>
15	</plugin>	39	</plugin>

Lines 2-15 Link Here

(-)META-INF/MANIFEST.MF (-7 / +11 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ecf.discovery.ui;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ecf.discovery.ui;singleton:=true
5	Bundle-Version: 2.0.0.qualifier	5	Bundle-Version: 3.0.0.qualifier
6	Bundle-ClassPath: .	6	Bundle-ClassPath: .
7	Bundle-Activator: org.eclipse.ecf.discovery.ui.DiscoveryUIPlugin$Implementation	7	Bundle-Activator: org.eclipse.ecf.internal.discovery.ui.DiscoveryUIPlugin$Implementation
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName
9	Bundle-Localization: plugin	9	Bundle-Localization: plugin
10	Bundle-RequiredExecutionEnvironment: J2SE-1.5	10	Bundle-RequiredExecutionEnvironment: J2SE-1.5
11	Require-Bundle: org.eclipse.core.runtime,	11	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
12	org.eclipse.ecf.discovery.edit;visibility:=reexport,	12	org.eclipse.ecf.discovery.edit;bundle-version="3.0.0",
13	org.eclipse.emf.edit.ui,	13	org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)",
14	org.eclipse.ui	14	org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
15	Eclipse-LazyStart: true	15	org.eclipse.ecf.discovery.model;bundle-version="3.0.0",
		16	org.eclipse.core.expressions;bundle-version="3.4.0",
		17	org.eclipse.ecf.discovery;bundle-version="2.1.0"
		18	Bundle-ActivationPolicy: lazy
		19	Export-Package: org.eclipse.ecf.discovery.ui;version="3.0.0"

Removed Link Here

(-)src/org/eclipse/ecf/discovery/ui/views/DiscoveryView.java (-150 lines)
1	/****************************************************************************
2	* Copyright (c) 2008 Versant Corp. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Versant Corp. - initial API and implementation
10	*****************************************************************************/
11	package org.eclipse.ecf.discovery.ui.views;
12
13	import org.eclipse.ecf.discovery.edit.provider.DiscoveryEditingDomainProvider;
14	import org.eclipse.ecf.discovery.ui.statusline.AdapterFactoryStatuslineProvider;
15	import org.eclipse.emf.common.util.EList;
16	import org.eclipse.emf.ecore.resource.Resource;
17	import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
18	import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
19	import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
20	import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
21	import org.eclipse.jface.action.IMenuListener;
22	import org.eclipse.jface.action.IMenuManager;
23	import org.eclipse.jface.action.IToolBarManager;
24	import org.eclipse.jface.action.MenuManager;
25	import org.eclipse.jface.action.Separator;
26	import org.eclipse.jface.viewers.StructuredSelection;
27	import org.eclipse.jface.viewers.StructuredViewer;
28	import org.eclipse.jface.viewers.TreeViewer;
29	import org.eclipse.jface.viewers.ViewerComparator;
30	import org.eclipse.jface.viewers.ViewerFilter;
31	import org.eclipse.swt.SWT;
32	import org.eclipse.swt.widgets.Composite;
33	import org.eclipse.swt.widgets.Menu;
34	import org.eclipse.ui.IActionBars;
35	import org.eclipse.ui.IWorkbenchActionConstants;
36	import org.eclipse.ui.part.DrillDownAdapter;
37	import org.eclipse.ui.part.ViewPart;
38
39
40	public class DiscoveryView extends ViewPart {
41
42	public static final String ID = "org.eclipse.ecf.discovery.ui.DiscoveryView";
43
44	private DrillDownAdapter drillDownAdapter;
45
46	private TreeViewer selectionViewer;
47
48	private void contributeToActionBars() {
49	IActionBars bars = getViewSite().getActionBars();
50	fillLocalPullDown(bars.getMenuManager());
51	fillLocalToolBar(bars.getToolBarManager());
52	}
53
54	/**
55	* This creates a context menu for the viewer and adds a listener as well registering the menu for extension. <!--
56	* begin-user-doc --> <!-- end-user-doc -->
57	*/
58	protected void createContextMenuFor(StructuredViewer viewer) {
59	MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
60	contextMenu.add(new Separator("additions")); //$NON-NLS-1$
61	contextMenu.setRemoveAllWhenShown(true);
62	Menu menu = contextMenu.createContextMenu(viewer.getControl());
63	viewer.getControl().setMenu(menu);
64	getSite().registerContextMenu(contextMenu, viewer);
65	}
66
67	/* (non-Javadoc)
68	* @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
69	*/
70	public void createPartControl(Composite parent) {
71	ComposedAdapterFactory adapterFactory = DiscoveryEditingDomainProvider.eINSTANCE.getAdapterFactory();
72
73	// create the viewer
74	selectionViewer = new TreeViewer(parent, SWT.MULTI \| SWT.H_SCROLL \| SWT.V_SCROLL);
75	selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
76	selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
77	selectionViewer.setComparator(new ViewerComparator());
78	selectionViewer.setFilters(getViewerFilters());
79	getSite().setSelectionProvider(selectionViewer);
80
81	// populate the viewer with the model if available
82	EList<Resource> resources = DiscoveryEditingDomainProvider.eINSTANCE.getEditingDomain().getResourceSet()
83	.getResources();
84	if (resources != null) {
85	selectionViewer.setInput(resources.get(0));
86	selectionViewer.setSelection(new StructuredSelection(resources.get(0)), true);
87	}
88
89	new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
90	selectionViewer.addPostSelectionChangedListener(new AdapterFactoryStatuslineProvider(adapterFactory,
91	getViewSite().getActionBars().getStatusLineManager()));
92
93	drillDownAdapter = new DrillDownAdapter(selectionViewer);
94	createContextMenuFor(selectionViewer);
95	hookContextMenu();
96	contributeToActionBars();
97	}
98
99	/**
100	* @return
101	*/
102	private ViewerFilter[] getViewerFilters() {
103	//TODO lookup view filters via EP
104	return new ViewerFilter[0];
105	}
106
107	private void fillContextMenu(IMenuManager manager) {
108	manager.add(new Separator());
109	drillDownAdapter.addNavigationActions(manager);
110	// Other plug-ins can contribute their actions here
111	manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
112	}
113
114	private void fillLocalPullDown(IMenuManager manager) {
115	manager.add(new Separator());
116	}
117
118	private void fillLocalToolBar(IToolBarManager manager) {
119	drillDownAdapter.addNavigationActions(manager);
120	}
121
122	private void hookContextMenu() {
123	MenuManager menuMgr = new MenuManager("#PopupMenu");
124	menuMgr.setRemoveAllWhenShown(true);
125	menuMgr.addMenuListener(new IMenuListener() {
126	/* (non-Javadoc)
127	* @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
128	*/
129	public void menuAboutToShow(IMenuManager manager) {
130	//TODO https://bugs.eclipse.org/bugs/show_bug.cgi?id=151604
131	// add a menu listener
132	// that will fire a selection changed event, in order
133	// to update the selection in contributed actions
134	selectionViewer.setSelection(selectionViewer.getSelection());
135
136	DiscoveryView.this.fillContextMenu(manager);
137	}
138	});
139	Menu menu = menuMgr.createContextMenu(selectionViewer.getControl());
140	selectionViewer.getControl().setMenu(menu);
141	getSite().registerContextMenu(menuMgr, selectionViewer);
142	}
143
144	/* (non-Javadoc)
145	* @see org.eclipse.ui.part.WorkbenchPart#setFocus()
146	*/
147	public void setFocus() {
148	selectionViewer.getControl().setFocus();
149	}
150	}

Removed Link Here

(-)src/org/eclipse/ecf/discovery/ui/statusline/AdapterFactoryStatuslineProvider.java (-64 lines)
1	/****************************************************************************
2	* Copyright (c) 2008 Versant Corp. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Versant Corp. - initial API and implementation
10	*****************************************************************************/
11	package org.eclipse.ecf.discovery.ui.statusline;
12
13	import org.eclipse.ecf.discovery.edit.IItemStatusLineProvider;
14	import org.eclipse.emf.ecore.EObject;
15	import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
16	import org.eclipse.emf.edit.provider.IItemLabelProvider;
17	import org.eclipse.jface.action.IStatusLineManager;
18	import org.eclipse.jface.viewers.ISelection;
19	import org.eclipse.jface.viewers.ISelectionChangedListener;
20	import org.eclipse.jface.viewers.IStructuredSelection;
21	import org.eclipse.jface.viewers.SelectionChangedEvent;
22
23
24	public class AdapterFactoryStatuslineProvider implements ISelectionChangedListener {
25	private ComposedAdapterFactory adapterFactory;
26	private IStatusLineManager statusline;
27
28	/**
29	* @param aStatusline
30	* @param adapterFactory
31	*/
32	public AdapterFactoryStatuslineProvider(ComposedAdapterFactory anAdapterFactory, IStatusLineManager aStatusline) {
33	adapterFactory = anAdapterFactory;
34	statusline = aStatusline;
35	}
36
37	/*
38	* (non-Javadoc)
39	* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
40	*/
41	public void selectionChanged(SelectionChangedEvent event) {
42	ISelection selection = event.getSelection();
43	if (selection instanceof IStructuredSelection) {
44	IStructuredSelection ss = (IStructuredSelection) selection;
45	EObject object = (EObject) ss.getFirstElement();
46	if (object != null) { // do we really have a selection?
47	IItemStatusLineProvider itemStatusLineProvider = (IItemStatusLineProvider) adapterFactory
48	.adapt(object, IItemStatusLineProvider.class);
49	if (itemStatusLineProvider != null) {
50	statusline.setMessage(itemStatusLineProvider.getStatusLineText(object));
51	} else {
52	// fallback to IItemLabelProvider.getText(..)
53	IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProvider.class);
54	if (itemLabelProvider != null) {
55	statusline.setMessage(itemLabelProvider.getText(object));
56	}
57	}
58
59	}
60	} else {
61	statusline.setMessage("");
62	}
63	}
64	}

Removed Link Here

(-)src/org/eclipse/ecf/discovery/ui/DiscoveryUIPlugin.java (-104 lines)
1	/****************************************************************************
2	* Copyright (c) 2008 Versant Corp. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Versant Corp. - initial API and implementation
10	*****************************************************************************/
11	package org.eclipse.ecf.discovery.ui;
12
13	import org.eclipse.emf.common.EMFPlugin;
14	import org.eclipse.emf.common.ui.EclipseUIPlugin;
15	import org.eclipse.emf.common.util.ResourceLocator;
16
17	/**
18	* This is the central singleton for the Discovery plugin.
19	* <!-- begin-user-doc -->
20	* <!-- end-user-doc -->
21	* @generated
22	*/
23	public final class DiscoveryUIPlugin extends EMFPlugin {
24	/**
25	* <!-- begin-user-doc -->
26	* <!-- end-user-doc -->
27	* @generated
28	*/
29	public static final String copyright = "";
30
31	/**
32	* Keep track of the singleton.
33	* <!-- begin-user-doc -->
34	* <!-- end-user-doc -->
35	* @generated
36	*/
37	public static final DiscoveryUIPlugin INSTANCE = new DiscoveryUIPlugin();
38
39	/**
40	* Keep track of the singleton.
41	* <!-- begin-user-doc -->
42	* <!-- end-user-doc -->
43	* @generated
44	*/
45	private static Implementation plugin;
46
47	/**
48	* Create the instance.
49	* <!-- begin-user-doc -->
50	* <!-- end-user-doc -->
51	* @generated
52	*/
53	public DiscoveryUIPlugin() {
54	super
55	(new ResourceLocator [] {
56	});
57	}
58
59	/**
60	* Returns the singleton instance of the Eclipse plugin.
61	* <!-- begin-user-doc -->
62	* <!-- end-user-doc -->
63	* @return the singleton instance.
64	* @generated
65	*/
66	@Override
67	public ResourceLocator getPluginResourceLocator() {
68	return plugin;
69	}
70
71	/**
72	* Returns the singleton instance of the Eclipse plugin.
73	* <!-- begin-user-doc -->
74	* <!-- end-user-doc -->
75	* @return the singleton instance.
76	* @generated
77	*/
78	public static Implementation getPlugin() {
79	return plugin;
80	}
81
82	/**
83	* The actual implementation of the Eclipse <b>Plugin</b>.
84	* <!-- begin-user-doc -->
85	* <!-- end-user-doc -->
86	* @generated
87	*/
88	public static class Implementation extends EclipseUIPlugin {
89	/**
90	* Creates an instance.
91	* <!-- begin-user-doc -->
92	* <!-- end-user-doc -->
93	* @generated
94	*/
95	public Implementation() {
96	super();
97
98	// Remember the static instance.
99	//
100	plugin = this;
101	}
102	}
103
104	}

Added Link Here

(-)src/org/eclipse/ecf/discovery/ui/DiscoveryHandlerUtil.java (+46 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Versant Corp.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.ecf.discovery.ui;
13
14	import org.eclipse.core.commands.ExecutionEvent;
15	import org.eclipse.core.commands.ExecutionException;
16	import org.eclipse.ecf.discovery.IServiceInfo;
17	import org.eclipse.jface.viewers.ISelection;
18	import org.eclipse.jface.viewers.IStructuredSelection;
19	import org.eclipse.ui.handlers.HandlerUtil;
20
21	public class DiscoveryHandlerUtil {
22	public static IServiceInfo getActiveIServiceInfoChecked(ExecutionEvent event) throws ExecutionException {
23	ISelection selection = HandlerUtil.getCurrentSelectionChecked(event);
24	org.eclipse.ecf.discovery.model.IServiceInfo serviceInfo = toIServiceInfo(selection);
25	if(serviceInfo == null) {
26	return null;
27	} else {
28	return serviceInfo.getEcfServiceInfo();
29	}
30	}
31	public static IServiceInfo getActiveIServiceInfo(ExecutionEvent event) {
32	ISelection selection = HandlerUtil.getCurrentSelection(event);
33	org.eclipse.ecf.discovery.model.IServiceInfo serviceInfo = toIServiceInfo(selection);
34	if(serviceInfo == null) {
35	return null;
36	} else {
37	return serviceInfo.getEcfServiceInfo();
38	}
39	}
40	private static org.eclipse.ecf.discovery.model.IServiceInfo toIServiceInfo(ISelection selection) {
41	if(selection instanceof IStructuredSelection) {
42	return (org.eclipse.ecf.discovery.model.IServiceInfo) ((IStructuredSelection) selection).getFirstElement();
43	}
44	return null;
45	}
46	}

Added Link Here

(-)src/org/eclipse/ecf/internal/discovery/ui/statusline/AdapterFactoryStatuslineProvider.java (+64 lines)
1	/****************************************************************************
2	* Copyright (c) 2008 Versant Corp. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Versant Corp. - initial API and implementation
10	*****************************************************************************/
11	package org.eclipse.ecf.internal.discovery.ui.statusline;
12
13	import org.eclipse.ecf.discovery.edit.IItemStatusLineProvider;
14	import org.eclipse.emf.ecore.EObject;
15	import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
16	import org.eclipse.emf.edit.provider.IItemLabelProvider;
17	import org.eclipse.jface.action.IStatusLineManager;
18	import org.eclipse.jface.viewers.ISelection;
19	import org.eclipse.jface.viewers.ISelectionChangedListener;
20	import org.eclipse.jface.viewers.IStructuredSelection;
21	import org.eclipse.jface.viewers.SelectionChangedEvent;
22
23
24	public class AdapterFactoryStatuslineProvider implements ISelectionChangedListener {
25	private ComposedAdapterFactory adapterFactory;
26	private IStatusLineManager statusline;
27
28	/**
29	* @param aStatusline
30	* @param adapterFactory
31	*/
32	public AdapterFactoryStatuslineProvider(ComposedAdapterFactory anAdapterFactory, IStatusLineManager aStatusline) {
33	adapterFactory = anAdapterFactory;
34	statusline = aStatusline;
35	}
36
37	/*
38	* (non-Javadoc)
39	* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
40	*/
41	public void selectionChanged(SelectionChangedEvent event) {
42	ISelection selection = event.getSelection();
43	if (selection instanceof IStructuredSelection) {
44	IStructuredSelection ss = (IStructuredSelection) selection;
45	EObject object = (EObject) ss.getFirstElement();
46	if (object != null) { // do we really have a selection?
47	IItemStatusLineProvider itemStatusLineProvider = (IItemStatusLineProvider) adapterFactory
48	.adapt(object, IItemStatusLineProvider.class);
49	if (itemStatusLineProvider != null) {
50	statusline.setMessage(itemStatusLineProvider.getStatusLineText(object));
51	} else {
52	// fallback to IItemLabelProvider.getText(..)
53	IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProvider.class);
54	if (itemLabelProvider != null) {
55	statusline.setMessage(itemLabelProvider.getText(object));
56	}
57	}
58
59	}
60	} else {
61	statusline.setMessage("");
62	}
63	}
64	}

Lines 2-13 Link Here

(-)META-INF/MANIFEST.MF (-4 / +9 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %plugin.name	3	Bundle-Name: %plugin.name
4	Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui;singleton:=true
5	Bundle-Version: 2.0.0.qualifier	5	Bundle-Version: 3.0.0.qualifier
6	Bundle-RequiredExecutionEnvironment: J2SE-1.4	6	Bundle-RequiredExecutionEnvironment: J2SE-1.4
7	Require-Bundle: org.eclipse.core.runtime,	7	Require-Bundle: org.eclipse.core.runtime,
8	org.eclipse.ui	8	org.eclipse.ui,
9	Export-Package: org.eclipse.ecf.internal.remoteservices.ui;x-internal:=true,	9	org.eclipse.core.expressions;bundle-version="3.4.0",
10	org.eclipse.ecf.remoteservices.ui	10	org.eclipse.ecf;bundle-version="2.0.1",
		11	org.eclipse.ecf.remoteservice;bundle-version="2.0.0",
		12	org.eclipse.ecf.discovery;bundle-version="2.1.0",
		13	org.eclipse.ecf.discovery.ui;bundle-version="3.0.0"
		14	Export-Package: org.eclipse.ecf.remoteservices.ui;version="3.0.0"
11	Bundle-ActivationPolicy: lazy	15	Bundle-ActivationPolicy: lazy
12	Bundle-Vendor: %plugin.provider	16	Bundle-Vendor: %plugin.provider
13	Bundle-Localization: plugin	17	Bundle-Localization: plugin
		18	Bundle-Activator: org.eclipse.ecf.internal.remoteservices.ui.Activator

Added Link Here

(-)plugin.xml (+63 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<?eclipse version="3.2"?>
3	<plugin>
4	<extension
5	point="org.eclipse.ui.commands">
6	<command
7	defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.ConnectRemoteServicehandler"
8	id="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"
9	name="Connect Command">
10	</command>
11	<command
12	defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.ReflectiveRemoteServiceHandler"
13	id="org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogHandler"
14	name="Reflective Method Invocation Command">
15	<commandParameter
16	id="org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogParameter"
17	name="name"
18	optional="true">
19	</commandParameter>
20	</command>
21	</extension>
22	<extension
23	point="org.eclipse.ui.menus">
24	<menuContribution
25	locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">
26	<command
27	commandId="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"
28	id="org.eclipse.ecf.remoteservices.ui.menus.connectCommand"
29	mnemonic="S">
30	<visibleWhen>
31	<with
32	variable="activeMenuSelection">
33	<iterate
34	ifEmpty="false"
35	operator="and">
36	<test
37	args="remotesvcs"
38	property="org.eclipse.ecf.discovery.isServiceType"
39	value="true">
40	</test>
41	<test
42	property="org.eclipse.ecf.remoteservices.isConnected"
43	value="false">
44	</test>
45	</iterate>
46	</with>
47	</visibleWhen>
48	</command>
49	</menuContribution>
50	</extension>
51
52	<extension
53	point="org.eclipse.core.expressions.propertyTesters">
54	<propertyTester
55	class="org.eclipse.ecf.internal.remoteservices.ui.property.ConnectedTester"
56	id="org.eclipse.ecf.remoteservices.ui.property.ConnectedPropertyTester"
57	namespace="org.eclipse.ecf.remoteservices"
58	properties="isConnected"
59	type="org.eclipse.ecf.discovery.model.IServiceInfo">
60	</propertyTester>
61	</extension>
62
63	</plugin>

Lines 2-16 Link Here

(-)META-INF/MANIFEST.MF (-5 / +5 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ecf.discovery.model;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ecf.discovery.model;singleton:=true
5	Bundle-Version: 2.0.0.qualifier	5	Bundle-Version: 3.0.0.qualifier
6	Bundle-ClassPath: .	6	Bundle-ClassPath: .
7	Bundle-Vendor: %providerName	7	Bundle-Vendor: %providerName
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin
9	Bundle-RequiredExecutionEnvironment: J2SE-1.5	9	Bundle-RequiredExecutionEnvironment: J2SE-1.5
10	Require-Bundle: org.eclipse.core.runtime,	10	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
11	org.eclipse.emf.ecore;visibility:=reexport,	11	org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
12	org.eclipse.ecf.discovery,	12	org.eclipse.ecf.discovery;bundle-version="2.0.0",
13	org.eclipse.ecf	13	org.eclipse.ecf;bundle-version="2.0.0"
14	Eclipse-LazyStart: true	14	Eclipse-LazyStart: true
15	Export-Package: org.eclipse.ecf.discovery.model,	15	Export-Package: org.eclipse.ecf.discovery.model,
16	org.eclipse.ecf.discovery.model.impl,	16	org.eclipse.ecf.discovery.model.impl,