Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org')
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java85
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java63
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java61
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java77
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java63
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java192
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java69
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java305
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java309
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java169
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java189
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java134
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java58
-rw-r--r--plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java126
14 files changed, 0 insertions, 1900 deletions
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java
deleted file mode 100644
index 3174b2249..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-public class NewProjectsListener implements IResourceChangeListener, IResourceDeltaVisitor {
-
-
- private WebServiceViewerSynchronization synchronization;
- private boolean listening = false;
- private boolean synchronizing = false;
-
- public NewProjectsListener(WebServiceViewerSynchronization sync) {
- synchronization = sync;
- if(synchronization.webServiceProjectsExist(new NullProgressMonitor())) {
- synchronizing = true;
- }
- startListening();
- }
-
- public void dispose() {
- if(listening)
- stopListening();
- if(synchronizing)
- synchronization.stop();
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- try {
- event.getDelta().accept(this);
- } catch (CoreException e) {
- WebServicePlugin.logError(0, e.getMessage(), e);
- }
- }
-
- public boolean visit(IResourceDelta delta) throws CoreException {
-
- IResource resource = delta.getResource();
- switch (resource.getType()) {
- case IResource.ROOT :
- return true;
- case IResource.PROJECT:
- if(delta.getKind() == IResourceDelta.ADDED) {
- if(WebServiceViewerSynchronization.isInteresting((IProject)resource)) {
- stopListening();
- synchronizing = true;
- synchronization.start();
- }
- }
-
- default :
- break;
- }
-
- return false;
- }
-
- private void startListening() {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- listening = true;
- }
-
- private void stopListening() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- listening = false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
deleted file mode 100644
index 9bdde44bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.net.URL;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- */
-public class OpenExternalWSDLAction extends AbstractOpenAction {
-
- String uri = ""; //$NON-NLS-1$
-
- /**
- * @param text
- */
- public OpenExternalWSDLAction(String text) {
- super(text);
- this.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(J2EEUIPlugin.PLUGIN_ID, "icons/web_type.gif")); //$NON-NLS-1$
- }
-
- public void run() {
- try {
- IWorkbenchBrowserSupport browserSupport = WebServiceUIPlugin.getDefault().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR,"WSDL","",""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- browser.openURL(new URL(uri));
- } catch (Exception e) {
- //Ignore
- }
- }
-
- public boolean updateSelection(IStructuredSelection s) {
- Object obj = s.getFirstElement();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isWSDLResource(obj))
- uri = ((Resource) obj).getURI().toString();
- else if (serviceHelper.isService(obj))
- uri = WebServicesManager.getInstance().getWSDLResource((EObject)obj).getURI().toString();
- return super.updateSelection(s);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
deleted file mode 100644
index 2ee23ed9c..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceAdapterFactory extends J2EEEMFAdapterFactory {
-
- /**
- * Default constructor
- */
- public WebServiceAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- Resource res = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isService(adaptableObject))
- res = WebServicesManager.getInstance().getWsddResource((EObject) adaptableObject);
- if (res == null)
- res = WebServicesManager.getInstance().getWSDLResource((EObject) adaptableObject);
- if (res != null && adapterType == J2EEEMFAdapterFactory.IFILE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else if (res != null && adapterType == J2EEEMFAdapterFactory.IRESOURCE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else
- return super.getAdapter(adaptableObject, adapterType);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
deleted file mode 100644
index 37f0a6593..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 23, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceFilesContribution {
-
- protected WebServiceDescription webService;
- protected List allFiles = null;
-
- /**
- * Constructor
- */
- public WebServiceFilesContribution(WebServiceDescription webService) {
- super();
- this.webService = webService;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return WebServiceUIResourceHandler.WebServiceFilesContribution_UI_0;
- }
-
- public String getWSDLFile() {
- return webService.getWsdlFile();
- }
-
- public String getMappingFile() {
- return webService.getJaxrpcMappingFile();
- }
-
- public List getAllFiles() {
- if (allFiles == null) {
- allFiles = new ArrayList();
- allFiles.add(getWSDLFile());
- allFiles.add(getMappingFile());
- }
- return allFiles;
- }
-
- /**
- * @return Returns the webService.
- */
- public WebServiceDescription getWebService() {
- return webService;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
deleted file mode 100644
index 665e5151d..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 20, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroup {
-
- private String label = WebServiceUIResourceHandler.WebServiceNavigatorGroup_UI_0;
- private IWorkspaceRoot root;
-
- /**
- * Default constructor
- */
- public WebServiceNavigatorGroup(IWorkspaceRoot wsRoot) {
- super();
- root = wsRoot;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return label;
- }
-
- /**
- * @return Returns the root.
- */
- public IWorkspaceRoot getRoot() {
- return root;
- }
-
- /**
- * @param root
- * The root to set.
- */
- public void setRoot(IWorkspaceRoot root) {
- this.root = root;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
deleted file mode 100644
index d131da1e3..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Feb 25, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.ui.IActionFilter;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroupType implements IActionFilter {
-
- private static final Class ITreeItemContentProviderClass = ITreeItemContentProvider.class;
-
- private static final Object[] NO_CHILDREN = new Object[0];
-
- public static final int SERVICES = 0;
- public static final int CLIENTS = 2;
- public static final int HANDLERS = 3;
-
- public static final String SERVICES_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_0;
- public static final String CLIENTS_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_1;
- public static final String HANDLERS_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_2;
-
- private int TYPE;
- private EObject wsdlService = null;
- private ServiceRef serviceRef = null;
- private final AdapterFactory adapterFactory;
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType, AdapterFactory factory) {
- super();
- TYPE = groupType;
- adapterFactory = factory;
- }
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType, EObject wsdlService, AdapterFactory factory) {
- super();
- TYPE = groupType;
- this.wsdlService = wsdlService;
- adapterFactory = factory;
- }
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType, ServiceRef serviceRef, AdapterFactory factory) {
- super();
- TYPE = groupType;
- this.serviceRef = serviceRef;
- adapterFactory = factory;
- }
-
- /**
- * @return Returns the TYPE.
- */
- public int getGroupType() {
- return TYPE;
- }
-
- public boolean isServices() {
- return getGroupType() == SERVICES;
- }
-
- public boolean isClients() {
- return getGroupType() == CLIENTS;
- }
-
- public boolean isHandlers() {
- return getGroupType() == HANDLERS;
- }
-
- public EObject getWsdlService() {
- return wsdlService;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- if (isServices())
- return SERVICES_UI;
- else if (isClients())
- return CLIENTS_UI;
- else if (isHandlers())
- return HANDLERS_UI;
- else
- return super.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionFilter#testAttribute(java.lang.Object, java.lang.String,
- * java.lang.String)
- */
- public boolean testAttribute(Object target, String name, String value) {
- if (target != null && target instanceof WebServiceNavigatorGroupType && value != null) {
- WebServiceNavigatorGroupType group = (WebServiceNavigatorGroupType) target;
- if (group.isClients() && value.equals(CLIENTS_UI))
- return true;
- else if (group.isServices() && value.equals(SERVICES_UI))
- return true;
- else if (group.isHandlers() && value.equals(HANDLERS_UI))
- return true;
- }
- return false;
- }
-
- /**
- * @return Returns the serviceRef.
- */
- public ServiceRef getServiceRef() {
- return serviceRef;
- }
-
-
- public Object[] getChildren() {
-
- switch (getGroupType()) {
-
- case CLIENTS :
- return WebServicesManager.getInstance().getAllWorkspaceServiceRefs().toArray();
- case HANDLERS : {
-// List result = new ArrayList();
- // handle web service handlers case
- if (getWsdlService() != null) {
- PortComponent port = WebServicesManager.getInstance().getPortComponent(getWsdlService());
- if (port != null && port.getHandlers() != null && !port.getHandlers().isEmpty()) {
-
- /*
- * The rendering in the viewer is the list of handlers from an object
- * that is never touched by the AdapterFactoryContentProvider, and
- * thus never adapted by the AdapterFactory, and thus never has an
- * ItemProvider for the viewer attached to it. The following line
- * ensures that it looks like this element was "rendered" by the
- * content provider, so that updates to the list of handlers will
- * be propagated to the viewer.
- */
- adapterFactory.adapt(port, ITreeItemContentProviderClass);
-
- return port.getHandlers().toArray();
- }
- }
- // handle service ref case
- else if (getServiceRef() != null)
- return getServiceRef().getHandlers().toArray();
-
- return NO_CHILDREN;
- }
- case SERVICES : {
- List result = new ArrayList();
- result.addAll(WebServicesManager.getInstance().getInternalWSDLServices());
- result.addAll(WebServicesManager.getInstance().getExternalWSDLServices());
- return result.toArray();
- }
- }
- return NO_CHILDREN;
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
deleted file mode 100644
index 79325c2bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WebServiceUIResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "webserviceui";//$NON-NLS-1$
-
- private WebServiceUIResourceHandler() {
- // Do not instantiate
- }
-
- public static String NEW_BUTTON_LABEL;
- public static String NEW_HANDLER_WIZARD_WINDOW_TITLE;
- public static String NEW_HANDLER_WIZARD_PAGE_TITLE;
- public static String NEW_HANDLER_WIZARD_PAGE_DESC;
- public static String HANDLER_DISPLAY_NAME_LABEL;
- public static String HANDLER_DESCRIPTION_LABEL;
- public static String HANDLER_NAME_LABEL;
- public static String HANDLER_CLASS_NAME_LABEL;
- public static String HANDLER_INIT_PARAM_WIZARD_WINDOW_TITLE;
- public static String HANDLER_INIT_PARAM_WIZARD_PAGE_TITLE;
- public static String HANDLER_INIT_PARAM_WIZARD_PAGE_DESC;
- public static String HANDLER_SOAP_HEADER_WIZARD_WINDOW_TITLE;
- public static String HANDLER_SOAP_HEADER_WIZARD_PAGE_TITLE;
- public static String HANDLER_SOAP_HEADER_WIZARD_PAGE_DESC;
- public static String HANDLER_NAMESPACE_URL_LABEL;
- public static String HANDLER_LOCAL_PART_LABEL;
- public static String PortComponentRefLabelProvider_UI_1;
- public static String PortComponentRefLabelProvider_UI_2;
- public static String WebServiceNavigatorGroupType_UI_0;
- public static String WebServiceNavigatorGroupType_UI_1;
- public static String WebServiceNavigatorGroupType_UI_2;
- public static String WebServiceFilesContribution_UI_0;
- public static String WebServiceGroupContentExtension_UI_1;
- public static String WebServiceNavigatorGroup_UI_0;
- public static String Server_Invalid_For_Exisitng_EAR_UI_;
- public static String ServiceReferenceSelectionWizard_UI_6;
- public static String ServiceReferenceSelectionWizard_UI_7;
- public static String ServiceReferenceSelectionPage_UI_0;
- public static String ServiceReferenceSelectionPage_UI_1;
- public static String ServiceReferenceSelectionPage_UI_2;
- public static String SERVICE_CLASSES_UI_;
- public static String PORT_UI_;
- public static String HANDLER_UI_;
- public static String WS_NAV_JOB0;
- public static String WS_NAV_JOB1;
- public static String WS_NAV_JOB2;
- public static String WS_NAV_JOB3;
- public static String WS_NAV_JOB4;
- public static String WS_NAV_JOB5;
- public static String WSDL_PORT_UI_;
- public static String SERVICE_IMPL_UI_;
- public static String WSDL_UI_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WebServiceUIResourceHandler.class);
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java
deleted file mode 100644
index 5c69f50fa..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.jface.viewers.TreeViewer;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceEvent;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceManagerListener;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants;
-import org.eclipse.jst.j2ee.navigator.internal.NonConflictingRule;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectPropertyTester;
-
-public class WebServiceViewerSynchronization implements WebServiceManagerListener{
-
-
- private WebServicesManager webServicesManager = null;
-
- private static final String PROJECT_FACET = "projectFacet"; //$NON-NLS-1$
-
- /* The facets are duplicated here to avoid loading plugins just for constants */
- /* package */ static final String EAR_FACET = "jst.ear"; //$NON-NLS-1$
- /* package */ static final String APPCLIENT_FACET = "jst.appclient"; //$NON-NLS-1$
- /* package */ static final String WEB_FACET = "jst.web"; //$NON-NLS-1$
- /* package */ static final String EJB_FACET = "jst.ejb"; //$NON-NLS-1$
- /* package */ static final String UTILITY_FACET = "jst.utility"; //$NON-NLS-1$
- /* package */ static final String CONNECTOR_FACET = "jst.connector"; //$NON-NLS-1$
- /* package */ static final String STATIC_WEB_FACET = "wst.web"; //$NON-NLS-1$
-
- private static final FacetedProjectPropertyTester facetPropertyTester = new FacetedProjectPropertyTester();
-
-
- private WebServicesNavigatorContentProvider contentProvider;
-
- private Job indexJob = new WebServiceIndexJob();
- private Job updateJob = new UpdateWebServicesNodeUIJob();
- private Job removeJob = new RemoveWebServicesNodeUIJob();
-
- private boolean navigatorGroupAdded = false;
- private boolean indexJobScheduled = false;
-
- private boolean initialized = false;
-
- public WebServiceViewerSynchronization(WebServicesNavigatorContentProvider provider) {
- contentProvider = provider;
- }
-
-
- public void start() {
-
- try {
-
- getWebServicesManager().addListener(this);
-
- // create the default synchronizer for any web service editor to use with view due
- // to the usage of seperate edit models.
- WebServicesNavigatorSynchronizer.createInstance(
- new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID), contentProvider);
- } finally {
- initialized = true;
- }
- }
-
- public void stop() {
- if(initialized) {
- getWebServicesManager().removeListener(this);
- // dispose current instance of web service editor/explorer synchronizer
- WebServicesNavigatorSynchronizer.disposeInstance();
- }
- }
-
- public void webServiceManagerChanged(WebServiceEvent anEvent) {
-
- switch (anEvent.getEventType()) {
- case WebServiceEvent.REFRESH:
-
- if(!hasNavigatorGroupBeenAdded()) {
- if(!hasIndexJobBeenScheduled()){
- indexJob.schedule();
- }
- if(!hasNavigatorGroupBeenAdded())
- new AddWebServicesNodeUIJob().schedule();
- } else {
- updateJob.schedule();
- }
- break;
- case WebServiceEvent.REMOVE:
- removeJob.schedule();
- }
- }
-
-
- public void startIndexJob() {
- indexJob.schedule();
- }
-
- /**
- * Employ a Test-And-Set (TST) primitive to ensure the Job is only scheduled once per load.
- *
- * @return True if the the index job has been scheduled. The value of indexJobSchedule will
- * _always_ be true after this method executes, so if false is returned, the job must be
- * scheduled by the caller.
- */
- /* package */ synchronized boolean hasIndexJobBeenScheduled() {
- if (!indexJobScheduled) {
- indexJobScheduled = true;
- return false;
- }
- return true;
- }
-
- /**
- * Multiple threads access this boolean flag, so we synchronize it to ensure that its value is
- * consistent across different threads.
- *
- * @return True if the WebServicesNavigatorGroup has already been processed and added to the
- * tree.
- */
- /* package */ synchronized boolean hasNavigatorGroupBeenAdded() {
- return navigatorGroupAdded;
- }
-
- /* package */ synchronized void setNavigatorGroupAdded(boolean hasBeenAdded) {
- navigatorGroupAdded = hasBeenAdded;
- }
-
- private WebServicesManager getWebServicesManager() {
- if (webServicesManager == null)
- webServicesManager = WebServicesManager.getInstance();
- return webServicesManager;
- }
-
- private boolean indexWebServices(IProgressMonitor monitor) {
- boolean hasChildren = false;
- if (!monitor.isCanceled()) {
- try {
- hasChildren |= getWebServicesManager().getWorkspace13ServiceRefs().size() > 0;
- } catch (RuntimeException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- } else {
- return hasChildren;
- }
- monitor.worked(1);
-
- if (!monitor.isCanceled()) {
- try {
- hasChildren |= getWebServicesManager().getWorkspace14ServiceRefs().size() > 0;
- } catch (RuntimeException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- } else {
- return hasChildren;
- }
- monitor.worked(1);
-
- if (!monitor.isCanceled()) {
- try {
- hasChildren |= getWebServicesManager().getInternalWSDLServices().size() > 0;
- } catch (RuntimeException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- } else {
- return hasChildren;
- }
- monitor.worked(1);
-
- if (!monitor.isCanceled()) {
- try {
- hasChildren |= getWebServicesManager().getExternalWSDLServices().size() > 0;
- } catch (RuntimeException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- } else {
- return hasChildren;
- }
- monitor.worked(1);
- return hasChildren;
- }
-
- /* package */ static boolean hasFacet(Object element, String facet) {
- return facetPropertyTester.test(element, PROJECT_FACET, new Object[] {}, facet);
- }
-
- /* package */ boolean webServiceProjectsExist(IProgressMonitor monitor) {
- boolean ret = false;
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-
- monitor.beginTask("Searching for web service capable projects...", projects.length);
- for (int i = 0; i < projects.length; i++) {
- if(isInteresting(projects[i])){
- ret = true;
- break;
- }
- }
- monitor.worked(1);
- return ret;
- }
-
- /* package */ static boolean isInteresting(IProject project) {
- return hasFacet(project, WEB_FACET) ||
- hasFacet(project, EJB_FACET) ||
- hasFacet(project, APPCLIENT_FACET);
- }
-
- public class WebServiceIndexJob extends Job {
-
- public WebServiceIndexJob() {
- super(WebServiceUIResourceHandler.WS_NAV_JOB0);
- setRule(new NonConflictingRule());
- }
-
- protected IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(WebServiceUIResourceHandler.WS_NAV_JOB1, 5);
-
- if (webServiceProjectsExist(monitor))
- indexWebServices(monitor);
-
- monitor.done();
-
- return Status.OK_STATUS;
- }
- }
-
- public class AddWebServicesNodeUIJob extends UIJob {
-
-
- public AddWebServicesNodeUIJob() {
- super(WebServiceUIResourceHandler.WS_NAV_JOB2);
- }
-
- public IStatus runInUIThread(IProgressMonitor monitor) {
-
- TreeViewer viewer = contentProvider.getViewer();
- if(!viewer.getControl().isDisposed()) {
- viewer.add(viewer.getInput(), contentProvider.getNavigatorGroup());
- }
- setNavigatorGroupAdded(true);
- return Status.OK_STATUS;
- }
- }
-
- public class UpdateWebServicesNodeUIJob extends UIJob {
-
- public UpdateWebServicesNodeUIJob () {
- super(WebServiceUIResourceHandler.WS_NAV_JOB3);
- }
-
- public IStatus runInUIThread(IProgressMonitor monitor) {
- TreeViewer viewer = contentProvider.getViewer();
-
- if(!viewer.getControl().isDisposed()) {
- if(hasNavigatorGroupBeenAdded())
- contentProvider.getViewer().refresh(contentProvider.getNavigatorGroup());
- else {
- viewer.add(viewer.getInput(), contentProvider.getNavigatorGroup());
- setNavigatorGroupAdded(true);
- }
- }
- return Status.OK_STATUS;
- }
- }
-
- public class RemoveWebServicesNodeUIJob extends UIJob {
-
- public RemoveWebServicesNodeUIJob() {
- super(WebServiceUIResourceHandler.WS_NAV_JOB4);
- }
-
- public IStatus runInUIThread(IProgressMonitor monitor) {
-
- monitor.beginTask(WebServiceUIResourceHandler.WS_NAV_JOB5, 4);
-
- TreeViewer viewer = contentProvider.getViewer();
-
- if(!viewer.getControl().isDisposed()) {
- if (indexWebServices(monitor)) {
- viewer.refresh(contentProvider.getNavigatorGroup());
- } else {
- viewer.remove(contentProvider.getNavigatorGroup());
- setNavigatorGroupAdded(false);
- }
- }
- return Status.OK_STATUS;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
deleted file mode 100644
index 552aeef22..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorContentProvider extends AdapterFactoryContentProvider {
-
- private static final Object[] NO_CHILDREN = new Object[0];
-
- private WebServicesManager webServicesManager = null;
- private WebServiceNavigatorGroup webServiceNavigatorGroup;
- private WebServiceNavigatorGroupType SERVICES = null;
- private WebServiceNavigatorGroupType CLIENTS = null;
- private HashMap HANDLERS = new HashMap();
- private TreeViewer viewer = null;
-
- private WebServiceViewerSynchronization viewerSynchronization;
- private NewProjectsListener projectListener;
-
-
- public WebServicesNavigatorContentProvider() {
- super(createAdapterFactory());
- viewerSynchronization = new WebServiceViewerSynchronization(this);
- projectListener = new NewProjectsListener(viewerSynchronization);
-
- }
-
- public void dispose() {
- super.dispose();
- projectListener.dispose();
- }
-
- /**
- * Configure and return a composite adapter factory for our contents
- */
- public static AdapterFactory createAdapterFactory() {
- return new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getChildren(java.lang.Object)
- */
- public Object[] getChildren(Object parentElement) {
-
- if (parentElement instanceof IWorkspaceRoot) {
- // return new Object[]{ getWebServicesNavigatorGroup(parentElement) };
- viewerSynchronization.setNavigatorGroupAdded(true);
- return new Object[]{getNavigatorGroup()};
- } else if (parentElement instanceof WebServiceNavigatorGroup){
- if (!viewerSynchronization.hasIndexJobBeenScheduled()) {
- viewerSynchronization.startIndexJob();
- }
- return new Object[]{getServicesGroup(), getClientsGroup()};
-
- }else if (parentElement instanceof WebServiceNavigatorGroupType) {
- if (!viewerSynchronization.hasIndexJobBeenScheduled()) {
- viewerSynchronization.startIndexJob();
- }
- WebServiceNavigatorGroupType wsGroupType = (WebServiceNavigatorGroupType) parentElement;
- return wsGroupType.getChildren();
-
- } else if (WSDLServiceExtManager.getServiceHelper().isService(parentElement))
- return getServiceLevelNodes(parentElement).toArray();
-
- else if (parentElement instanceof ServiceRef)
- return new Object[]{getHandlersGroup(parentElement)};
-
- else if (parentElement instanceof Handler || parentElement instanceof org.eclipse.jst.j2ee.webservice.wsclient.Handler || WSDLServiceExtManager.getServiceHelper().isWSDLResource(parentElement))
- return NO_CHILDREN;
-
- else
- return super.getChildren(parentElement);
- }
-
-
- private List getServiceLevelNodes(Object parentElement) {
- List result = new ArrayList();
- // add service classes
- if (getWebServicesManager().isServiceInternal((EObject) parentElement) && getWebServicesManager().getServiceImplBean((EObject) parentElement) != null)
- result.add(getWebServicesManager().getServiceImplBean((EObject) parentElement));
- // Add handlers
- if (getWebServicesManager().isServiceInternal((EObject) parentElement))
- result.add(getHandlersGroup(parentElement));
- // add wsdl file
- Resource wsdl = getWebServicesManager().getWSDLResource((EObject) parentElement);
- if (wsdl != null)
- result.add(wsdl);
- return result;
- }
-
-// private List getHandlerChildren(Object parentElement) {
-// List result = new ArrayList();
-// WebServiceNavigatorGroupType handlersGroup = (WebServiceNavigatorGroupType) parentElement;
-// // handle web service handlers case
-// if (handlersGroup.getWsdlService() != null) {
-// PortComponent port = getWebServicesManager().getPortComponent(handlersGroup.getWsdlService());
-// if (port != null && port.getHandlers() != null && !port.getHandlers().isEmpty())
-// result.addAll(port.getHandlers());
-// }
-// // handle service ref case
-// else if (handlersGroup.getServiceRef() != null) {
-// result.addAll(handlersGroup.getServiceRef().getHandlers());
-// }
-// return result;
-// }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object element) {
- if (element instanceof IWorkspaceRoot)
- return null;
- else if (element instanceof WebServiceNavigatorGroup)
- return ((WebServiceNavigatorGroup) element).getRoot();
- else
- return super.getParent(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object element) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- // TODO handle change events
- if (aViewer != null && aViewer instanceof TreeViewer)
- viewer = (TreeViewer) aViewer;
- super.inputChanged(aViewer, oldInput, newInput);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- /**
- * @return Returns the navigatorGroup.
- */
- public WebServiceNavigatorGroup getNavigatorGroup() {
- if (null == webServiceNavigatorGroup) {
- webServiceNavigatorGroup = new WebServiceNavigatorGroup(ResourcesPlugin.getWorkspace().getRoot());
- }
- return webServiceNavigatorGroup;
- }
-
- protected WebServicesManager getWebServicesManager() {
- if (webServicesManager == null)
- webServicesManager = WebServicesManager.getInstance();
- return webServicesManager;
- }
-
- private WebServiceNavigatorGroupType getServicesGroup() {
- if (SERVICES == null)
- SERVICES = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.SERVICES, getAdapterFactory());
- return SERVICES;
- }
-
- private WebServiceNavigatorGroupType getClientsGroup() {
- if (CLIENTS == null)
- CLIENTS = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.CLIENTS, getAdapterFactory());
- return CLIENTS;
- }
-
- private WebServiceNavigatorGroupType getHandlersGroup(Object key) {
- if (key == null)
- return null;
- WebServiceNavigatorGroupType handler = null;
- handler = (WebServiceNavigatorGroupType) HANDLERS.get(key);
- if (handler == null) {
- if (WSDLServiceExtManager.getServiceHelper().isService(key))
- handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (EObject) key, getAdapterFactory());
- else if (key instanceof ServiceRef)
- handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (ServiceRef) key, getAdapterFactory());
-
- if (handler != null)
- HANDLERS.put(key, handler);
- }
- return handler;
- }
-
- /**
- * @return Returns the viewer.
- */
- public TreeViewer getViewer() {
- return viewer;
- }
-
- public void notifyChanged(Notification notification) {
-
- if(notification.getNotifier() instanceof ServiceRef) {
- switch(notification.getFeatureID(ServiceRef.class)) {
- case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-
- WebServiceNavigatorGroupType handlersGroup = getHandlersGroup(notification.getNotifier());
-
- if(handlersGroup != null) {
- switch(notification.getEventType()) {
- case Notification.ADD:
- viewer.add(handlersGroup, notification.getNewValue());
- break;
- case Notification.ADD_MANY:
- viewer.add(handlersGroup, ((Collection)notification.getNewValue()).toArray());
- break;
- case Notification.REMOVE:
- viewer.remove(notification.getOldValue());
- break;
- case Notification.REMOVE_MANY:
- viewer.remove(((Collection)notification.getOldValue()).toArray());
- break;
- }
- }
- return;
- default:
- }
- } else if(notification.getNotifier() instanceof PortComponent) {
- switch(notification.getFeatureID(PortComponent.class)) {
- case WsddPackage.PORT_COMPONENT__HANDLERS:
-
- PortComponent pComp = (PortComponent) notification.getNotifier();
- EObject service = getWebServicesManager().getService(pComp);
- if(service != null) {
- WebServiceNavigatorGroupType handlersGroup = getHandlersGroup(service);
- if(handlersGroup != null) {
- switch(notification.getEventType()) {
- case Notification.ADD:
- viewer.add(handlersGroup, notification.getNewValue());
- break;
- case Notification.ADD_MANY:
- viewer.add(handlersGroup, ((Collection)notification.getNewValue()).toArray());
- break;
- case Notification.REMOVE:
- viewer.remove(notification.getOldValue());
- break;
- case Notification.REMOVE_MANY:
- viewer.remove(((Collection)notification.getOldValue()).toArray());
- break;
- }
- }
- }
-
-
- return;
- default:
- }
- }
- super.notifyChanged(notification);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
deleted file mode 100644
index ba94ebbf0..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 10, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WebServicesNavigatorGroupOpenListener extends CommonActionProvider {
-
- private OpenExternalWSDLAction openExternalWSDLAction;
- private OpenJ2EEResourceAction openAction;
-
- /**
- * @param text
- */
- public WebServicesNavigatorGroupOpenListener() {
- }
-
- public void init(ICommonActionExtensionSite aConfig) {
- openExternalWSDLAction = new OpenExternalWSDLAction(WebServiceUIResourceHandler.WebServiceGroupContentExtension_UI_1);
- openAction = new OpenJ2EEResourceAction();
- }
-
- public void setContext(ActionContext aContext) {
- if (aContext != null && aContext.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) aContext.getSelection();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (selection == null || selection.getFirstElement()==null)
- return;
- Object selectedObject = selection.getFirstElement();
- if (serviceHelper==null)
- return;
- else if (selectedObject instanceof ServiceImpl) {
- WsddResource resource = WebServicesManager.getInstance().getWsddResource((ServiceImpl)selectedObject);
- if (resource == null) {
- openExternalWSDLAction.selectionChanged(selection);
- super.setContext(aContext);
- return;
- }
- List wsddSelection = new ArrayList();
- wsddSelection.add(resource);
- openAction.selectionChanged(new StructuredSelection(wsddSelection));
- }
- else if (serviceHelper.isWSDLResource(selectedObject)) {
- Resource wsdl = (Resource) selectedObject;
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- super.setContext(aContext);
- return;
- }
- openAction.selectionChanged(selection);
- }
-
- else {
- openAction.selectionChanged(selection);
- }
- }
- super.setContext(aContext);
- }
-
- public void fillActionBars(IActionBars theActionBars) {
- if (getContext()==null || getContext().getSelection().isEmpty())
- return;
- IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
-
- if (selection.getFirstElement() instanceof ServiceImpl) {
- ServiceImpl wsdl = (ServiceImpl) selection.getFirstElement();
- WsddResource resource = WebServicesManager.getInstance().getWsddResource(wsdl);
- if (resource == null) {
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openExternalWSDLAction);
- return;
- }
- openAction.selectionChanged(selection);
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
- }
- List wsddSelection = new ArrayList();
- wsddSelection.add(resource);
- openAction.selectionChanged(new StructuredSelection(wsddSelection));
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
-
- } else if (selection.getFirstElement() instanceof WSDLResourceImpl) {
- WSDLResourceImpl wsdl = (WSDLResourceImpl) selection.getFirstElement();
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openExternalWSDLAction);
- return;
- }
- }
-
- openAction.selectionChanged(selection);
- if(openAction.isEnabled())
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
- }
-
- public void fillContextMenu(IMenuManager menu) {
- if (getContext()==null || getContext().getSelection().isEmpty())
- return;
- IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
- if (selection.getFirstElement() instanceof ServiceImpl) {
- ServiceImpl wsdl = (ServiceImpl) selection.getFirstElement();
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openExternalWSDLAction);
- return;
- }
- }
- else if (selection.getFirstElement() instanceof WSDLResourceImpl) {
- WSDLResourceImpl wsdl = (WSDLResourceImpl) selection.getFirstElement();
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openExternalWSDLAction);
- return;
- }
- }
- openAction.selectionChanged(selection);
- if (openAction.isEnabled())
- menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openAction);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
deleted file mode 100644
index 5f1d285c7..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorLabelProvider extends AdapterFactoryLabelProvider implements ILabelProvider {
-
- private final static String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPCommonNavigator";//$NON-NLS-1$
-
- public WebServicesNavigatorLabelProvider() {
- super(createAdapterFactory());
- }
-
- /**
- * Configure and return a composite adapter factory for our contents
- */
- public static AdapterFactory createAdapterFactory() {
- return new DynamicAdapterFactory(VIEWER_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- public Image getImage(Object element) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (element instanceof WebServiceNavigatorGroup)
- return J2EEUIPlugin.getDefault().getImage("webServicesFolder_obj"); //$NON-NLS-1$
- else if (element instanceof String)
- return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
- else if (element instanceof WebServiceNavigatorGroupType)
- return J2EEUIPlugin.getDefault().getImage("folder"); //$NON-NLS-1$
- else if (serviceHelper.isService(element)) {
- if (WebServicesManager.getInstance().isServiceInternal((EObject) element))
- return J2EEUIPlugin.getDefault().getImage("webServiceItemProvider_obj"); //$NON-NLS-1$
- return J2EEUIPlugin.getDefault().getImage("extwebserviceitemprovider_obj"); //$NON-NLS-1$
- } else if (serviceHelper.isWSDLResource(element))
- return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
- else
- return super.getImage(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- public String getText(Object element) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- String space = " "; //$NON-NLS-1$
- if (element instanceof WebServiceDescription)
- return getWebServiceDescriptionText((WebServiceDescription) element);
- else if (element instanceof PortComponent)
- return WebServiceUIResourceHandler.PORT_UI_ + space + super.getText(element);
- else if (element instanceof Handler)
- return WebServiceUIResourceHandler.HANDLER_UI_ + space + super.getText(element);
- else if (element instanceof WSDLPort)
- return WebServiceUIResourceHandler.WSDL_PORT_UI_ + space + super.getText(element);
- else if (element instanceof ServiceImplBean)
- return WebServiceUIResourceHandler.SERVICE_CLASSES_UI_;
- else if (element instanceof EJBLink)
- return WebServiceUIResourceHandler.SERVICE_IMPL_UI_ + space + super.getText(element);
- else if (element instanceof ServletLink)
- return WebServiceUIResourceHandler.SERVICE_IMPL_UI_ + space + super.getText(element);
- else if (serviceHelper.isService(element))
- return serviceHelper.getServiceLocalPart(element);
- else if (serviceHelper.isWSDLResource(element)) {
- String result = ""; //$NON-NLS-1$
- IFile file = WorkbenchResourceHelper.getFile((Resource) element);
- if (file != null && file.exists())
- result = file.getFullPath().toString();
- else
- result = ((Resource) element).getURI().toString();
- return WebServiceUIResourceHandler.WSDL_UI_ + space + result;
- } else if (element instanceof ServiceRef) {
- String beanName14 = ""; //$NON-NLS-1$
- if (WebServicesManager.getInstance().isJ2EE14((ServiceRef) element)) {
- if (((ServiceRef) element).eContainer() instanceof Session)
- beanName14 = ((Session) ((ServiceRef) element).eContainer()).getName() + ": "; //$NON-NLS-1$
- }
-
- return ProjectUtilities.getProject((ServiceRef) element).getName() + ": " + beanName14 //$NON-NLS-1$
- + ((ServiceRef) element).getServiceRefName();
- } else
- return super.getText(element);
- }
-
- /**
- * get text for web service
- */
- private String getWebServiceDescriptionText(WebServiceDescription description) {
- Resource res = description.eResource();
- IProject project = null;
- String projString = ""; //$NON-NLS-1$
- if (res != null)
- project = WorkbenchResourceHelper.getProject(res);
- if (project != null)
- projString = project.getName() + ": "; //$NON-NLS-1$
- return projString + super.getText(description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- // TODO add any listeners?
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- // TODO handle dispose
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- // TODO do something smart here?
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- // TODO how do we remove listeners?
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
deleted file mode 100644
index 135f48abb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 10, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-/**
- * @author jlanuti
- */
-public class WebServicesNavigatorSynchronizer extends AdapterFactoryContentProvider implements Adapter {
-
-
- private static WebServicesNavigatorSynchronizer INSTANCE = null;
- protected Notifier target = null;
- private WebServicesNavigatorContentProvider contentProvider = null;
-
- /**
- * Constructor
- */
- public WebServicesNavigatorSynchronizer(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
- super(adapterFactory);
- contentProvider = provider;
- }
-
- public static WebServicesNavigatorSynchronizer getInstance() {
- return INSTANCE;
- }
-
- public static WebServicesNavigatorSynchronizer createInstance(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
- INSTANCE = new WebServicesNavigatorSynchronizer(adapterFactory, provider);
- return INSTANCE;
- }
-
- public static void disposeInstance() {
- INSTANCE = null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#getTarget()
- */
- public Notifier getTarget() {
- return target;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
- */
- public void setTarget(Notifier newTarget) {
- target = newTarget;
- }
-
- public void notifyChanged(final Notification notification) {
- if (notification.isTouch()) {
- //There is nothing that is required since nothing changed.
- return;
- }
-
- EObject notifier = (EObject) notification.getNotifier();
- if (notifier instanceof WebServices) {
- //Do nothing.
- } else if (isServiceRefModification(notification)) {
- // Handle service ref edits
- contentProvider.getViewer().refresh(notifier);
- } else if (isServiceRefAddOrRemove(notification)) {
- //Handle service ref adds or removes
- contentProvider.getViewer().refresh();
- } else {
- // Handle web service changes by getting the WSDD parent
- while (!(notifier instanceof WebServiceDescription) && notifier != null) {
- notifier = notifier.eContainer();
- }
- // Refresh the associated wsdl service for the WSDD parent
- if (notifier instanceof WebServiceDescription && notifier !=null) {
- EObject wsdl = WebServicesManager.getInstance().getWSDLServiceForWebService((WebServiceDescription)notifier);
- contentProvider.getViewer().refresh(wsdl);
- }
- super.notifyChanged(notification);
- }
- }
-
- private boolean isServiceRefAddOrRemove(Notification notification) {
- //Note this check is not handling ADD_MANY or REMOVE_MANY.
- Object value = null;
- switch (notification.getEventType()) {
- case Notification.ADD:
- value = notification.getNewValue();
- break;
- case Notification.REMOVE:
- value = notification.getOldValue();
- break;
- }
- return value != null && (value instanceof ServiceRef || value instanceof ComponentScopedRefs);
- }
-
- private boolean isServiceRefModification(Notification notification) {
- Object notifier = notification.getNotifier();
- return notifier instanceof ServiceRef || notifier instanceof Handler;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
deleted file mode 100644
index 066f4d940..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 5, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WsdlResourceAdapterFactory extends J2EEEMFAdapterFactory {
-
- /**
- * Default constructor
- */
- public WsdlResourceAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- Resource res = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isWSDLResource(adaptableObject))
- res = (Resource) adaptableObject;
-
- if (res != null && adapterType == J2EEEMFAdapterFactory.IFILE_CLASS)
- return WorkbenchResourceHelper.getFile(res) != null ? WorkbenchResourceHelper.getFile(res) : null;
- else if (res != null && adapterType == J2EEEMFAdapterFactory.IRESOURCE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else
- return super.getAdapter(adaptableObject, adapterType);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 8e9c3572d..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservice.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WebServiceUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.webservice.ui"; //$NON-NLS-1$
-
- // The shared instance.
- private static WebServiceUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public WebServiceUIPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * Returns the shared instance.
- */
- public static WebServiceUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
-
- /**
- * Record an error against this plugin's log.
- *
- * @param aCode
- * @param aMessage
- * @param anException
- */
- public static void logError(int aCode, String aMessage,
- Throwable anException) {
- getDefault().getLog().log(
- createErrorStatus(aCode, aMessage, anException));
- }
-
- /**
- *
- * Record a message against this plugin's log.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- */
- public static void log(int severity, int aCode, String aMessage,
- Throwable exception) {
- log(createStatus(severity, aCode, aMessage, exception));
- }
-
- /**
- *
- * Record a status against this plugin's log.
- *
- * @param aStatus
- */
- public static void log(IStatus aStatus) {
- getDefault().getLog().log(aStatus);
- }
-
- /**
- * Create a status associated with this plugin.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createStatus(int severity, int aCode,
- String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode,
- aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
- }
-
- /**
- *
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createErrorStatus(int aCode, String aMessage,
- Throwable exception) {
- return createStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
-}

Back to the top