diff options
Diffstat (limited to 'bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets')
84 files changed, 0 insertions, 15792 deletions
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java deleted file mode 100644 index 0e05fcc15..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java +++ /dev/null @@ -1,119 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -/** - * AbstractHandlersWidgetDefaultingCmd - * - * Initialize and load the handlers data - */ -public abstract class AbstractHandlersWidgetDefaultingCmd extends AbstractDataModelOperation -{ - - private IStructuredSelection initialSelection_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - - IStructuredSelection selection = initialSelection_; - if (selection == null) { - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED ); - env.getStatusHandler().reportError(status); - return status; - } - - - return status; - - } - - - public List getClientHandlers(){ - return null; - } - - public void setInitialSelection(IStructuredSelection initSelection){ - this.initialSelection_ = initSelection; - } - - public IStructuredSelection getInitialSelection(){ - return this.initialSelection_; - } - - protected IResource getResourceFromInitialSelection() - { - if (initialSelection_ != null && initialSelection_.size() == 1) - { - Object obj = initialSelection_.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - return resource; - } catch(CoreException e) - { - return null; - } - } - } - return null; - } - - public IProject getProject(){ - - IResource resource = getResourceFromInitialSelection(); - if (resource != null) - { - return ResourceUtils.getProjectOf( resource.getFullPath() ); - } - - return null; - } - - public String getComponentName(){ - IResource resource = getResourceFromInitialSelection(); - if (resource!=null) { - IPath absolutePath = resource.getFullPath(); - if (absolutePath.isAbsolute()) { - return absolutePath.segment(1); - } - } - return null; - } - -// public WebServiceEditModel getWebServiceEditModel() { -// WebServicesManager wsm = new WebServicesManager(); -// IProject project = getProject(); -// return wsm.getWSEditModel(project); -// } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java deleted file mode 100644 index acae4f7ac..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java +++ /dev/null @@ -1,261 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -/* - * Created on May 12, 2004 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.ws.internal.consumption.ui.widgets; - -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jdt.core.IType; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; - - - -public class AddHandlerDialog extends Dialog implements Listener { - - private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - - private boolean validateOn_; - private boolean isClient_; - private String className; - private String name; - private String selectedPortName; - - private Text classNameText; - private Text nameText; - private Combo portNameCombo; - - // ----TOOLTIPS Section---- - /* CONTEXT_ID AHDL0001 for the Handler Config Page */ - private final String INFOPOP_TEXT_HANDLER_NAME = "AHDL0001"; //$NON-NLS-1$ - - /* CONTEXT_ID AHDL0002 for the Handler Config Page */ - private final String INFOPOP_TEXT_HANDLER_CLASS = "AHDL0002"; //$NON-NLS-1$ - - /* CONTEXT_ID AHDL0001 for the Handler Config Page */ - private final String INFOPOP_TEXT_HANDLER_PORT = "AHDL0003"; //$NON-NLS-1$ - - private Button beanClassBrowseButton_; - /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/ - private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003"; - - public AddHandlerDialog( Shell shell, boolean isClientHandler) - { - super(shell); - isClient_ = isClientHandler; - } - - protected Control createContents(Composite parent) { - Composite comp = (Composite) super.createContents(parent); - parent.getShell().pack(); - return comp; - } - - protected Control createDialogArea(Composite parent) { - validateOn_ = false; - UIUtils uiUtils = new UIUtils(pluginId_); - - Shell thisShell = parent.getShell(); - if (thisShell == null) { - thisShell = createShell(); - } - thisShell.setText(ConsumptionUIMessages.DIALOG_TITLE_WS_ADD_HANDLER); - - Composite composite = (Composite) super.createDialogArea(parent); - - Composite sourceLocationComp = uiUtils.createComposite(composite, 3); - - classNameText = uiUtils.createText(sourceLocationComp, ConsumptionUIMessages.LABEL_TEXT_HANDLER_CLASS, ConsumptionUIMessages.TOOLTIP_TEXT_HANDLER_CLASS, INFOPOP_TEXT_HANDLER_CLASS, SWT.SINGLE | SWT.BORDER); - classNameText.addListener(SWT.Modify,this); - - beanClassBrowseButton_ = uiUtils.createPushButton( sourceLocationComp, ConsumptionUIMessages.BUTTON_BROWSE_CLASSES, - ConsumptionUIMessages.TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE, - INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE ); - beanClassBrowseButton_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleBrowseClasses(); - } - } ); - - nameText = uiUtils.createText(sourceLocationComp, ConsumptionUIMessages.LABEL_TEXT_HANDLER_NAME, ConsumptionUIMessages.TOOLTIP_TEXT_HANDLER_NAME, INFOPOP_TEXT_HANDLER_NAME, SWT.SINGLE | SWT.BORDER ); - nameText.addListener(SWT.Modify, this); - - // dummy label for column 3. - new Label( sourceLocationComp, SWT.NONE ); - - if (!isClient_){ - portNameCombo = uiUtils.createCombo(sourceLocationComp, ConsumptionUIMessages.LABEL_TEXT_HANDLER_PORT, ConsumptionUIMessages.TOOLTIP_TEXT_HANDLER_PORT, INFOPOP_TEXT_HANDLER_PORT, SWT.SINGLE | SWT.BORDER ); - portNameCombo.addListener(SWT.Modify, this); - - // dummy label for column 3. - new Label( sourceLocationComp, SWT.NONE ); - } - validateOn_ = true; - return composite; - } - - private void handleBrowseClasses() - { - Shell shell = getShell(); - IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell)); - - if( itype != null ) - { - classNameText.setText(itype.getFullyQualifiedName()); - } - } - - /* (non-Javadoc) - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ - public void handleEvent(Event event) { - if (!validateOn_) - return; - if (classNameText == event.widget) { - handleClassNameTextEvent(); - validateTextFieldEntries(); - return; - } - if (nameText == event.widget) { - handleNameTextEvent(); - validateTextFieldEntries(); - return; - } - if (portNameCombo == event.widget) { - handlePortNameTextEvent(); - validateTextFieldEntries(); - return; - } - } - - private void handleClassNameTextEvent(){ - className = classNameText.getText(); - if (className.lastIndexOf(".java") != -1){ - nameText.setText(className.substring(0, className.lastIndexOf(".java"))); - } - else { - nameText.setText(className); - } - - if (className.lastIndexOf(".") != -1){ - nameText.setText(className.substring(className.lastIndexOf(".")+1, className.length())); - } - name = nameText.getText(); - } - - private void handleNameTextEvent() { - name = nameText.getText(); - - } - - private void handlePortNameTextEvent(){ - selectedPortName = portNameCombo.getText(); - } - - private void disableOKButton() { - if (getButton(0) != null) - getButton(0).setEnabled(false); - } - - private void enableOKButton() { - if (getButton(0) != null) - getButton(0).setEnabled(true); - } - - private void validateTextFieldEntries(){ - if (classNameText.getText().equals("")){ - disableOKButton(); - return; - } - if (nameText.getText().equals("")){ - disableOKButton(); - return; - } - if (!isClient_){ - if (portNameCombo.getText()!=null && portNameCombo.getText().equals("")){ - disableOKButton(); - return; - } - else if (portNameCombo.getText()==null) { - disableOKButton(); - return; - } - } - - enableOKButton(); - - - } - - /** - * @return Returns the className. - */ - public String getClassName() { - if (className.lastIndexOf(".java") != -1){ - return className.substring(0, className.lastIndexOf(".java")); - } - else { - return className; - } - } - /** - * @param className The className to set. - */ - public void setClassName(String className) { - this.className = className; - } - /** - * @return Returns the name. - */ - public String getName() { - return name; - } - /** - * @param name The name to set. - */ - public void setName(String name) { - this.name = name; - } - /** - * @return Returns the portName. - */ - public String getPortName() { - return selectedPortName; - } - /** - * @param portName The portName to set. - */ - public void setPortNames(String[] portNames) { - portNameCombo.setItems(portNames); - portNameCombo.select(0); - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java deleted file mode 100644 index 67b1199d3..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.IJobManager; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ValidateWSDLJob; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.Choice; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; - - -public class CheckWSDLValidationCommand extends AbstractDataModelOperation -{ - - public CheckWSDLValidationCommand () { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - IJobManager jobManager = Platform.getJobManager(); - Job[] jobs = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY ); - ValidateWSDLJob existingValidateWSDLJob = null; - - if( jobs.length > 0 ) - { - for (int i=0; i<jobs.length; i++) { - existingValidateWSDLJob = (ValidateWSDLJob)jobs[i]; - - if (existingValidateWSDLJob.getState() != Job.NONE) { - if (ignoreWSDLValidation(env)) { - // if don't want to wait for validation, cancel existing validation job - existingValidateWSDLJob.cancel(); - return Status.OK_STATUS; - } else { - // wait for WSDL validation - return StatusUtils.errorStatus( ConsumptionUIMessages.WAIT_FOR_WSDL ); - } - } - } - } - - return Status.OK_STATUS; - - } - - private boolean ignoreWSDLValidation(IEnvironment env) { - if (!WSPlugin.getInstance().getWaitForWSDLValidationContext().getPersistentWaitForWSDLValidation()) - return true; // do not want to wait for WSDL validation, i.e. Ignore all - - // give a warning message with the options to stop, ignore this one, or - // ignore all coming messages - IStatus status_ = StatusUtils.warningStatus( ConsumptionUIMessages.STILL_VALIDATING_WSDL ); - // adding all messages from WSI Incompliances - - Choice ignoreChoice = new Choice('C', ConsumptionUIMessages.CANCEL_VALIDATION_LABEL, - ConsumptionUIMessages.CANCEL_VALIDATION_DESCRIPTION); - Choice ignoreAllChoice = new Choice('A', ConsumptionUIMessages.CANCEL_ALL_VALIDATION_LABEL, - ConsumptionUIMessages.CANCEL_ALL_VALIDATION_DESCRIPTION); - Choice cancelChoice = new Choice('W', ConsumptionUIMessages.WAIT_VALIDATION_LABEL, - ConsumptionUIMessages.WAIT_VALIDATION_DESCRIPTION); - - Choice result = env.getStatusHandler().report(status_, - new Choice[] { ignoreChoice, ignoreAllChoice, cancelChoice }); - - // if the user closes the message box or selects ignore continue - if (result == null - || (result.getLabel().equals(ignoreChoice.getLabel()))) { - return true; - // if the user selects ignore all, change the preference - } else if (result.getLabel().equals(ignoreAllChoice.getLabel())) { - // update ignore WSDL validation preference - WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(false); - return true; - } - // if the user selects to cancel , do not continue with the command - else if (result.getLabel().equals(cancelChoice.getLabel())) { - return false; - } - return true; - } - - -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java deleted file mode 100644 index f40bfbc2d..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java +++ /dev/null @@ -1,261 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.Collection; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Vector; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType; -import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager; -import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit; -import org.eclipse.jst.j2ee.webapplication.WebApp; -import org.eclipse.jst.j2ee.webservice.wsclient.Handler; -import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; -import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.environment.IEnvironment; - -/** - * ClientHandlersWidgetDefaultingCommand - * - * Initialize and load the handlers data - */ -public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd { - - private HandlerTableItem[] handlers_; - - private Hashtable wsRefsToHandlersTable_; - - private Hashtable refNameToServiceRefObj_; - -// private WebServiceEditModel wsEditModel_; - - private WebServicesManager webServicesManager_; - - private IProject project_; - - private WebServicesResource wsClientRes_; - - private String serviceRefName_ = null; - - private Collection wsServiceRefs_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - - webServicesManager_ = new WebServicesManager(); - - IStructuredSelection selection = getInitialSelection(); - if (selection == null) { - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED ); - env.getStatusHandler().reportError(status); - return status; - } - - status = processHandlers(); - return status; - - } - - public IStatus processHandlers() { - try { - Vector handlers = new Vector(); - wsRefsToHandlersTable_ = new Hashtable(); - refNameToServiceRefObj_ = new Hashtable(); - -// wsEditModel_ = getWebServiceEditModel(); - - wsServiceRefs_ = getWSServiceRefsFromSelection(); - - if (wsServiceRefs_ != null) { - Iterator wsRefsIter = wsServiceRefs_.iterator(); - for (int i = 0; i < wsServiceRefs_.size(); i++) { - - ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next(); - - List wsHandlers = wsServiceRef.getHandlers(); - HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()]; - for (int k = 0; k < wsHandlers.size(); k++) { - - Handler wsHandler = (Handler) wsHandlers.get(k); - - HandlerTableItem handlerItem = new HandlerTableItem(); - handlerItem.setHandler(wsHandler); - handlerItem.setHandlerName(wsHandler.getHandlerName()); - handlerItem.setHandlerClassName(wsHandler.getHandlerClass().getQualifiedName()); - handlerItem.setWsDescRef(wsServiceRef); - handlerItems[k] = handlerItem; - handlers.add(handlerItem); - } - String wsServiceRefName = wsServiceRef.getServiceRefName(); - wsRefsToHandlersTable_.put(wsServiceRefName, handlerItems); - refNameToServiceRefObj_.put(wsServiceRefName, wsServiceRef); - - } - - handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]); - } - } - catch (Exception e) { - return StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e); - } - return Status.OK_STATUS; - } - - public HandlerTableItem[] getAllHandlers() { - return this.handlers_; - } - - public Hashtable getHandlers() { - return wsRefsToHandlersTable_; - } - - /** - * @return Returns the isGenSkeletonEnabled_. - */ - public boolean getGenSkeletonEnabled() { - return true; - } - - /** - * @return Returns the sourceOutputLocation_. - */ - public IPath[] getSourceOutputLocation() { - IPath[] locations = null; - if (project_==null) - project_ = getProject(); - if (project_ != null) { - locations = ResourceUtils.getAllJavaSourceLocations(project_); - } - - return locations; - } - - /** - * @return Returns the wsEditModel. - */ -// public WebServiceEditModel getWsEditModel() { -// return wsEditModel_; -// } - - public String getServiceRefName() { - return this.serviceRefName_; - } - - public WebServicesResource getWsClientResource() { - return wsClientRes_; - } - - public IProject getClientProject() { - return project_; - } - - private Collection getWSServiceRefsFromSelection() { - - IStructuredSelection initSel = getInitialSelection(); - if (initSel != null && initSel.size() == 1) { - Object obj = initSel.getFirstElement(); - ServiceRef serviceRef = null; - if (obj instanceof ServiceRef) { - // Client ServiceRef - serviceRef = (ServiceRef) obj; - serviceRefName_ = serviceRef.getServiceRefName(); - project_ = ProjectUtilities.getProject(serviceRef); - } - else if (obj instanceof WebServiceNavigatorGroupType) { - WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj; - serviceRef = wsngt.getServiceRef(); - serviceRefName_ = serviceRef.getServiceRefName(); - project_ = ProjectUtilities.getProject(serviceRef); - } - - if (project_==null){ - project_ = getProject(); - } - if (project_==null){ - return null; - } - - List clientWSResourceList = webServicesManager_.get13ServiceRefs(project_); - if (!clientWSResourceList.isEmpty()) - wsClientRes_ = (WebServicesResource)clientWSResourceList.get(0); - - if (J2EEUtils.isWebComponent(project_)) { - WebArtifactEdit webEdit = null; - try { - IVirtualComponent vc = ComponentCore.createComponent(project_); - webEdit = WebArtifactEdit.getWebArtifactEditForRead(vc); - if (webEdit != null) - { - WebApp webApp = (WebApp) webEdit.getDeploymentDescriptorRoot(); - if (webApp != null) { - return webServicesManager_.getServiceRefs(webApp); - } - } - } - finally{ - if(webEdit!=null) - webEdit.dispose(); - } - } - //TODO Remove old Nature refs -// else if (J2EEUtils.isAppClientComponent(project_, componentName_)){ -// ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_); -// if (rt!=null) { -// ApplicationClient appClient = rt.getApplicationClient(); -// if (appClient != null){ -// return webServicesManager_.getServiceRefs(appClient); -// } -// } -// } -// else if (J2EEUtils.isEJBComponent(project_, componentName_)){ -// EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_); -// if(rt!=null){ -// EJBJar ejbJar = rt.getEJBJar(); -// if (ejbJar !=null){ -// return webServicesManager_.getServiceRefs(ejbJar); -// } -// } -// } - - - } - return null; - } - - public Hashtable getRefNameToServiceRef() { - return this.refNameToServiceRefObj_; - } - - public Collection getWsServiceRefs(){ - return this.wsServiceRefs_; - } - -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java deleted file mode 100644 index 93803a43e..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java +++ /dev/null @@ -1,221 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.java.JavaClass; -import org.eclipse.jst.j2ee.webservice.wsclient.Handler; -import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; -import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource; -import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory; -import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientFactoryImpl; -import org.eclipse.jst.ws.internal.common.JavaMOFUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility; -import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel; - -/* - * Provide a way to externalize the edited fields and create new handlers - * - */ -public class ClientHandlersWidgetOutputCommand extends AbstractDataModelOperation -{ - - //private List handlerTableItems_; - private Hashtable oldWSServiceRefsToHandlersTable_; - - private Hashtable newWSServiceRefsToHandlersTable_; - -// private WebServiceEditModel wsEditModel_; - - private Hashtable handlersTable_; - - private IProject project_; - - private Collection wsServiceRefs_; - - private EditModel editModel_; - - private Object accessorKey_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - - try { - - oldWSServiceRefsToHandlersTable_ = new Hashtable(); - newWSServiceRefsToHandlersTable_ = new Hashtable(); - - if (wsServiceRefs_ != null) { - Iterator wsRefsIter = wsServiceRefs_.iterator(); - for (int i = 0; i < wsServiceRefs_.size(); i++) { - - ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next(); - - List wsHandlers = wsServiceRef.getHandlers(); - oldWSServiceRefsToHandlersTable_.put(wsServiceRef, wsHandlers); - newWSServiceRefsToHandlersTable_.put(wsServiceRef, new ArrayList()); - } - - Enumeration e = handlersTable_.keys(); - while (e.hasMoreElements()) { - - String serviceRefName = (String) e.nextElement(); - List handlerTableItems_ = (List) handlersTable_.get(serviceRefName); - if (handlerTableItems_ != null) { - // form Handler tables - for (int i = 0; i < handlerTableItems_.size(); i++) { - - HandlerTableItem hti = (HandlerTableItem) handlerTableItems_.get(i); - Object wsModelRef = hti.getWsDescRef(); - if (wsModelRef != null && wsModelRef instanceof ServiceRef) { - ServiceRef wsRef = (ServiceRef) wsModelRef; - - Object handler = hti.getHandler(); - if (handler != null && handler instanceof Handler) { - // clone it - Handler clonedHandler = (Handler) EtoolsCopyUtility.createCopy((Handler) handler); - ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(clonedHandler); - } - else { - // create it - Webservice_clientFactory wsClientFactory = new Webservice_clientFactoryImpl(); - Handler newHandler = wsClientFactory.createHandler(); - newHandler.setHandlerName(hti.getHandlerName()); - - JavaClass javaClass = JavaMOFUtils.getJavaClass(hti.getHandlerClassName(), project_); - if (javaClass != null) { - newHandler.setHandlerClass(javaClass); - } - - ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(newHandler); - } - - } - - } - } - } - - // add handlers to ports - addHandlersToServiceRefs(); - getJ2EEEditModel(); - - // save the resource - //TODO Remove old Nature refs -// if (J2EEUtils.getJ2EEVersion(project_) == J2EEVersionConstants.J2EE_1_4_ID) { -// editModel_.save(accessorKey_); -// } -// else { -// if (wsClientRes_!=null) -// wsClientRes_.save(new HashMap()); -// } - } - } - catch (Exception e) - { - return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e); - } - finally { - if (editModel_ != null) - editModel_.releaseAccess(accessorKey_); - } - return status; - } - - private void addHandlersToServiceRefs() { - try { - Enumeration refsToHandlers = newWSServiceRefsToHandlersTable_.keys(); - while (refsToHandlers.hasMoreElements()) { - ServiceRef serviceRef = (ServiceRef) refsToHandlers.nextElement(); - if (serviceRef != null) { - - List handlers = (List) newWSServiceRefsToHandlersTable_.get(serviceRef); - List modelHandlers = (List) oldWSServiceRefsToHandlersTable_.get(serviceRef); - modelHandlers.clear(); - modelHandlers.addAll(handlers); - } - } - } - catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * @param handlerTableItems - * The handlerTableItems to set. - */ - // public void setAllHandlersList(List handlerTableItems) { - // this.handlerTableItems_ = handlerTableItems; - // } - public void setHandlersTable(Hashtable handlersTable) { - this.handlersTable_ = handlersTable; - } - - /** - * @param wsEditModel - * The wsEditModel to set. - */ -// public void setWsEditModel(WebServiceEditModel wsEditModel) { -// this.wsEditModel_ = wsEditModel; -// } - - public void setClientProject(IProject project) { - this.project_ = project; - } - - public void setWsClientResource(WebServicesResource wsRes) { - } - - public void setWsServiceRefs(Collection wsRefs) { - this.wsServiceRefs_ = wsRefs; - } - - public void getJ2EEEditModel() { - //TODO Remove old Nature refs -// accessorKey_ = new Object(); -// if (ResourceUtils.isWebProject(project_)) { -// J2EEWebNatureRuntime rt = J2EEWebNatureRuntime.getRuntime(project_); -// if (rt != null) { -// editModel_ = rt.getWebAppEditModelForWrite(accessorKey_); -// } -// } -// else if (ResourceUtils.isAppClientProject(project_)){ -// ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_); -// if (rt!=null) { -// editModel_ = rt.getAppClientEditModelForWrite(accessorKey_); -// } -// } -// else if (ResourceUtils.isEJBProject(project_)){ -// EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_); -// if(rt!=null){ -// editModel_ = rt.getEJBEditModelForWrite(accessorKey_); -// } -// } - } - -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java deleted file mode 100644 index 454730356..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java +++ /dev/null @@ -1,112 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - - -public class ClientWizardWidget extends SimpleWidgetDataContributor -{ - private WebServiceClientTypeWidget clientWidget_; - private PreferencesSelectionWidget preferencesWidget_; - - /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/ - private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013"; - private Button testService_; - - /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the project page*/ - private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWRPR0014"; - private Button monitorService; - - /*CONTEXT_ID PWPR0001 for the Project Page*/ - private String INFOPOP_PWPR_PAGE = "PWPR0001"; - - public WidgetDataEvents addControls( Composite parent, Listener statusListener) - { - String pluginId = "org.eclipse.jst.ws.consumption.ui"; - UIUtils utils = new UIUtils( pluginId ); - - PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PWPR_PAGE ); - - Composite clientComposite = utils.createComposite( parent, 1 ); - - clientWidget_ = new WebServiceClientTypeWidget(); - clientWidget_.addControls(clientComposite, statusListener ); - - - // Create test service check box. - Composite testGroup = utils.createComposite(clientComposite,1); - - testService_ = utils.createCheckbox( testGroup, ConsumptionUIMessages.CHECKBOX_TEST_WEBSERVICE, - ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE, - INFOPOP_PWPR_CHECKBOX_TEST_SERVICE ); - - // Create monitor service check box. - monitorService = utils.createCheckbox(testGroup, ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE, - ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE, - INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE); - - // Create the preferences controls. - preferencesWidget_ = new PreferencesSelectionWidget(); - preferencesWidget_.addControls( clientComposite, statusListener ); - - return this; - } - - public void setResourceContext( ResourceContext context ) - { - preferencesWidget_.setResourceContext( context ); - } - - public ResourceContext getResourceContext() - { - return preferencesWidget_.getResourceContext(); - } - - public void setClientTypeRuntimeServer( TypeRuntimeServer ids ) - { - clientWidget_.setTypeRuntimeServer( ids ); - } - - public TypeRuntimeServer getClientTypeRuntimeServer() - { - return clientWidget_.getTypeRuntimeServer(); - } - - public Boolean getTestService() - { - return new Boolean( testService_.getSelection() ); - } - - public void setTestService( Boolean value ) - { - testService_.setSelection( value.booleanValue() ); - } - - public Boolean getMonitorService() - { - return new Boolean(monitorService.getSelection()); - } - - public void setMonitorService(Boolean value) - { - monitorService.setSelection(value.booleanValue()); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java deleted file mode 100644 index 86154f1ec..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -public class ClientWizardWidgetDefaultingCommand extends AbstractDataModelOperation -{ - public Boolean getTestService() - { - return new Boolean( getScenarioContext().getTestWebService() ); - } - - public Boolean getMonitorService() - { - return new Boolean( getScenarioContext().getMonitorWebService()); - } - - public ResourceContext getResourceContext() - { - return WebServicePlugin.getInstance().getResourceContext(); - } - - // Current ScenarioContext is used to default the first page of the wizard. The - // properties in ScenarioContext are mapped individual. Therefore, ScenarioContext - // should not also be mapped. - protected ScenarioContext getScenarioContext() - { - return WebServicePlugin.getInstance().getScenarioContext(); - } - - // TODO Set client name defaults here. - public TypeRuntimeServer getClientTypeRuntimeServer() - { - // rskreg - //WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance(); - String type = getScenarioContext().getClientWebServiceType(); - //String runtime = registry.getAllClientRuntimes()[0]; - String runtime = WebServiceRuntimeExtensionUtils2.getAllRuntimesForClientSide()[0]; - //String server = registry.getAllClientServerFactoryIds()[0]; - String server = WebServiceRuntimeExtensionUtils2.getAllClientServerFactoryIds()[0]; - TypeRuntimeServer result = new TypeRuntimeServer(); - // rskreg - - result.setTypeId( type ); - result.setRuntimeId( runtime ); - result.setServerId( server ); - - return result; - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java deleted file mode 100644 index c331d46f2..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -public class ClientWizardWidgetOutputCommand extends AbstractDataModelOperation -{ - private boolean testService_; - private boolean monitorService; - private ResourceContext resourceContext_; - private TypeRuntimeServer clientIds_; - - public boolean getTestService() - { - return testService_; - } - - public void setTestService( boolean testService ) - { - testService_ = testService; - } - - public boolean getMonitorService() - { - return monitorService; - } - - public void setMonitorService(boolean monitorService) - { - this.monitorService = monitorService; - } - - public ResourceContext getResourceContext() - { - - return resourceContext_; - } - - public void setResourceContext( ResourceContext context ) - { - resourceContext_ = context; - } - - public TypeRuntimeServer getClientTypeRuntimeServer() - { - return clientIds_; - } - - public void setClientTypeRuntimeServer( TypeRuntimeServer clientIds ) - { - clientIds_ = clientIds; - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java deleted file mode 100644 index 4cf2df28e..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java +++ /dev/null @@ -1,582 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.List; -import java.util.Vector; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.window.Window; -import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - -/** - * ConfigClientHandlersTreeWidget - * - */ -public class ConfigClientHandlersTableWidget extends SimpleWidgetDataContributor { - - private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - - private Composite parent_; - private boolean isGenSkeletonEnabled_; - private String outputLocation_; - private Combo webServiceRefCombo_; - private Table handlersTable_; - private TableViewer tableViewer_; - private Button addButton_; - private Button removeButton_; - private Button genSkeletonRadioButton_; - private Combo sourceLocationCombo_; - - private Hashtable pathsTable_ = new Hashtable(); - private Hashtable wsRefsToHandlers_; - private Hashtable refNameToServiceRef_; - private Vector orderedHandlers_; - //private ServiceRef serviceRef_; - private String serviceRefName_; - private int DEFAULT_COLUMN_WIDTH = 150; - - // ----TOOLTIPS Section---- - /* CONTEXT_ID HDLR0001 for the Handler Config Page */ - private final String INFOPOP_HDLR_WS_HANDLERS = "HDLR0001"; //$NON-NLS-1$ - - /* CONTEXT_ID HDLR0002 for the Handler Config Page */ - private final String INFOPOP_HDLR_GEN_SKELETON = "HDLR0002"; //$NON-NLS-1$ - - /* CONTEXT_ID HDLR0003 for the Handler Config Page */ - private final String INFOPOP_COMBO_SOURCE_LOC = "HDLR0003"; //$NON-NLS-1$ - - /* CONTEXT_ID HDLR0004 for the Handler Config Page */ - private final String INFOPOP_WS_CLIENT_REF = "HDLR0004"; //$NON-NLS-1$ - - // ------------------------ - - public ConfigClientHandlersTableWidget() { - super(); - } - - public WidgetDataEvents addControls(Composite parent, Listener statusListener) { - - UIUtils uiUtils = new UIUtils(pluginId_); - - parent_ = parent; - - // Web service reference combo - Composite webServiceRefComp = uiUtils.createComposite(parent_, 2); - webServiceRefCombo_ = uiUtils.createCombo(webServiceRefComp, ConsumptionUIMessages.LABEL_COMBO_WS_CLIENT_REF, - ConsumptionUIMessages.TOOLTIP_WS_CLIENT_REF, INFOPOP_WS_CLIENT_REF, - SWT.READ_ONLY); - webServiceRefCombo_.addSelectionListener(new SelectionAdapter() { - - public void widgetSelected(SelectionEvent evt) { - handleWebServiceRefCombo(evt); - } - }); - - Composite displayComp = new Composite(parent_, SWT.NONE); - GridLayout gridlayout = new GridLayout(2, false); - displayComp.setLayout(gridlayout); - displayComp.setLayoutData(uiUtils.createFillAll()); - - Composite handlersComp = uiUtils.createComposite(displayComp, 1); - GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING - | GridData.VERTICAL_ALIGN_FILL); - handlersComp.setLayoutData(griddata); - handlersComp.setSize(130, 600); - - Composite buttonsComp = uiUtils.createComposite(displayComp, 1); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - buttonsComp.setLayoutData(griddata); - - Text handlersText = new Text(handlersComp, SWT.READ_ONLY); - handlersText.setText(ConsumptionUIMessages.LABEL_HANDLERS_CONFIG); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - gd.horizontalSpan = 2; - handlersText.setLayoutData(gd); - - handlersTable_ = uiUtils.createTable(handlersComp, ConsumptionUIMessages.TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION); - handlersTable_.setHeaderVisible(true); - handlersTable_.setLinesVisible(true); - - // empty space - Label wsLabel = new Label(buttonsComp, SWT.NONE); - gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - gd.horizontalSpan = 2; - wsLabel.setLayoutData(gd); - - Button moveUpButton = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_MOVE_UP, null, null); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - moveUpButton.setLayoutData(griddata); - moveUpButton.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent event) { - handleMoveUpButtonSelected(event); - } - - public void widgetDefaultSelected(SelectionEvent event) { - } - }); - - Button moveDownButton = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_MOVE_DOWN, null, null); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - moveDownButton.setLayoutData(griddata); - moveDownButton.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent event) { - handleMoveDownButtonSelected(event); - } - - public void widgetDefaultSelected(SelectionEvent event) { - } - }); - - // empty space - wsLabel = new Label(buttonsComp, SWT.NONE); - gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - gd.horizontalSpan = 2; - wsLabel.setLayoutData(gd); - - addButton_ = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_ADD, null, null); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - addButton_.setLayoutData(griddata); - addButton_.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent event) { - handleAddButtonSelected(event); - } - - public void widgetDefaultSelected(SelectionEvent event) { - } - }); - - removeButton_ = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_REMOVE, null, null); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - removeButton_.setLayoutData(griddata); - removeButton_.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent event) { - handleRemoveButtonSelected(event); - } - - public void widgetDefaultSelected(SelectionEvent event) { - } - }); - enableRemove(false); - - // table stuff - String[] columns_ = new String[] { ConsumptionUIMessages.LABEL_HANDLER_NAME, ConsumptionUIMessages.LABLE_HANDLER_CLASS}; - - for (int i = 0; i < columns_.length; i++) { - TableColumn tableColumn = new TableColumn(handlersTable_, i); - tableColumn.setText(columns_[i]); - tableColumn.setAlignment(SWT.LEFT); - tableColumn.setWidth(DEFAULT_COLUMN_WIDTH); - tableColumn.setResizable(true); - } - - tableViewer_ = new TableViewer(handlersTable_); - Control control = tableViewer_.getControl(); - - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - data.verticalAlignment = GridData.FILL; - data.grabExcessVerticalSpace = true; - control.setLayoutData(data); - - tableViewer_.setColumnProperties(columns_); - tableViewer_.setContentProvider(new ListContentProvider()); - tableViewer_.setLabelProvider(new ListLabelProvider()); - tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() { - - public void selectionChanged(SelectionChangedEvent event) { - enableRemove(true); - } - }); - - // gen skeleton check box - genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, ConsumptionUIMessages.LABEL_BUTTON_GEN_SKELETON, ConsumptionUIMessages.TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON); - genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() { - - public void widgetSelected(SelectionEvent evt) { - handleGenSkeletonRadioButton(); - } - }); - - // source location combo - Composite sourceLocationComp = uiUtils.createComposite(parent_, 2); - sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, ConsumptionUIMessages.LABEL_COMBO_SOURCE_LOC, ConsumptionUIMessages.TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC, - SWT.READ_ONLY); - sourceLocationCombo_.addSelectionListener(new SelectionAdapter() { - - public void widgetSelected(SelectionEvent evt) { - handleSourceLocationCombo(evt); - } - }); - - return this; - } - - // Called at start - private void populateHandlersTable() { - try { - - int sizeOfHandlers = wsRefsToHandlers_.size(); - - String[] wsRefNames = (String[]) wsRefsToHandlers_.keySet().toArray(new String[0]); - webServiceRefCombo_.setItems(wsRefNames); - webServiceRefCombo_.select(0); - - if (sizeOfHandlers < 1) { - webServiceRefCombo_.select(0); - webServiceRefCombo_.setEnabled(false); - } - else { - if (serviceRefName_ != null) { - int index = webServiceRefCombo_.indexOf(serviceRefName_); - if (index != -1) webServiceRefCombo_.select(index); - } - else - webServiceRefCombo_.select(0); - } - - // get webServiceRef hint - String wsRef = webServiceRefCombo_.getText(); - - if (wsRefsToHandlers_.get(wsRef) != null) { - orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRef); - tableViewer_.setInput(orderedHandlers_); - tableViewer_.refresh(); - } - } - catch (Exception e) { - e.printStackTrace(); - } - - } - - /** - * @return Returns the handlers. - */ - public List getAllHandlersList() { - // convert to a ArrayList and return as List - List list = new ArrayList(); - if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_); - - return list; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus() - */ - public IStatus getStatus() { - IStatus finalStatus = Status.OK_STATUS; - - return finalStatus; - } - - private void handleAddButtonSelected(SelectionEvent event) { - - AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), true); - dialog.create(); - dialog.getShell().setSize( 500, 200 ); - - int result = dialog.open(); - - if (result == Window.OK) { - String name = dialog.getName(); - String className = dialog.getClassName(); - - HandlerTableItem hi = new HandlerTableItem(); - hi.setHandlerName(name); - hi.setHandlerClassName(className); - String wsRefName = webServiceRefCombo_.getText(); - ServiceRef serviceRef = (ServiceRef) refNameToServiceRef_.get(wsRefName); - hi.setWsDescRef(serviceRef); - - orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName); - orderedHandlers_.add(hi); - - } - - refresh(); - } - - private void handleRemoveButtonSelected(SelectionEvent event) { - handleDeleteKeyPressed(); - } - - private void handleMoveUpButtonSelected(SelectionEvent event) { - - int index = tableViewer_.getTable().getSelectionIndex(); - if (index != -1) { - if (index > 0) { - orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText()); - Object object = orderedHandlers_.remove(index); - orderedHandlers_.insertElementAt(object, index - 1); - tableViewer_.refresh(); - } - } - - } - - private void handleMoveDownButtonSelected(SelectionEvent event) { - - int index = tableViewer_.getTable().getSelectionIndex(); - if (index != -1) { - if (index < orderedHandlers_.size() - 1) { - orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText()); - Object object = orderedHandlers_.remove(index); - orderedHandlers_.insertElementAt(object, index + 1); - tableViewer_.refresh(); - } - } - - } - - public void handleSourceLocationCombo(SelectionEvent event) { - outputLocation_ = sourceLocationCombo_.getText(); - } - - public void handleGenSkeletonRadioButton() { - if (genSkeletonRadioButton_.isEnabled()) { - if (genSkeletonRadioButton_.getSelection()) - this.isGenSkeletonEnabled_ = true; - else - this.isGenSkeletonEnabled_ = false; - } - } - - public void handleWebServiceRefCombo(SelectionEvent event) { - - if (webServiceRefCombo_.isEnabled()) { - String webServiceRefName = webServiceRefCombo_.getText(); - Vector hndlers = (Vector) wsRefsToHandlers_.get(webServiceRefName); - //HandlerTableItem item = (HandlerTableItem)hndlers.get(0); - //serviceRef_ = (ServiceRef)item.getWsDescRef(); - if (hndlers != null) { - tableViewer_.setInput(hndlers); - tableViewer_.refresh(); - } - } - } - - /** - * @return Returns the isGenSkeletonEnabled_. - */ - public boolean isGenSkeletonEnabled_() { - return isGenSkeletonEnabled_; - } - - protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider { - - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - public String getColumnText(Object object, int columnIndex) { - - if (object instanceof HandlerTableItem) { - HandlerTableItem hti = (HandlerTableItem) object; - if (columnIndex == 0) { - - return hti.getHandlerName() != null ? hti.getHandlerName() : ""; - } - else if (columnIndex == 1) { return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : ""; } - } - return null; - } - - } - - private void enableRemove(boolean enabled) { - removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty()); - } - - protected class ListContentProvider implements IStructuredContentProvider { - - public Object[] getElements(Object element) { - if (element instanceof Vector) { return ((Vector) element).toArray(); } - return null; - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object old, Object newobj) { - } - - public boolean isDeleted(Object object) { - return false; - } - } - - private void handleDeleteKeyPressed() { - ISelection selection = tableViewer_.getSelection(); - if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) { - int selectionIndex = handlersTable_.getSelectionIndex(); - - orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText()); - orderedHandlers_.remove(selectionIndex); - refresh(); - } - } - - public void refresh() { - try { - tableViewer_.setInput(null); - if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_); - tableViewer_.refresh(); - } - catch (Exception e) { - e.printStackTrace(); - } - } - - public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) { - this.isGenSkeletonEnabled_ = isGenSkeletonEnabled; - genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled); - - } - - public boolean getGenSkeletonEnabled() { - return this.isGenSkeletonEnabled_; - } - - public void setSourceOutputLocation(IPath[] locations) { - if (locations[0]!=null) - this.outputLocation_ = locations[0].toString(); - else - return; - - String[] paths = new String[locations.length]; - for (int i = 0; i < locations.length; i++) { - paths[i] = locations[i].toString(); - pathsTable_.put(paths[i], locations[i]); - } - sourceLocationCombo_.setItems(paths); - sourceLocationCombo_.select(0); - - } - - public IPath getSourceOutputLocation() { - IPath outputPath = (IPath) pathsTable_.get(outputLocation_); - return outputPath; - } - - /** - * @return Returns the handlerClassNames. - */ - public String[] getHandlerClassNames() { - Vector handlerClasses = new Vector(); - - Enumeration e = wsRefsToHandlers_.keys(); - while (e.hasMoreElements()) { - - String wsRefName = (String) e.nextElement(); - orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName); - - if (orderedHandlers_ != null) { - for (int i = 0; i < orderedHandlers_.size(); i++) { - HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i); - handlerClasses.add(hti.getHandlerClassName()); - } - } - } - return (String[])handlerClasses.toArray(new String[0]); - } - - /** - * @return Returns the wsRefsToHandlers_. - */ - public Hashtable getWsRefsToHandlers() { - return wsRefsToHandlers_; - } - - /** - * @param wsRefsToHandlers_ - * The wsRefsToHandlers_ to set. - */ - public void setWsRefsToHandlers(Hashtable wsRefsToHandlersArray) { - - wsRefsToHandlers_ = new Hashtable(); - try { - - if (wsRefsToHandlersArray != null) { - // store the wsRefs - Enumeration wsRef = wsRefsToHandlersArray.keys(); - while (wsRef.hasMoreElements()) { - String wsRefName = (String) wsRef.nextElement(); - - HandlerTableItem[] handlers = (HandlerTableItem[]) wsRefsToHandlersArray.get(wsRefName); - // process the handlersTable - orderedHandlers_ = new Vector(); - for (int i = 0; i < handlers.length; i++) { - orderedHandlers_.add(handlers[i]); - } - wsRefsToHandlers_.put(wsRefName, orderedHandlers_); - - } - } - populateHandlersTable(); - } - catch (Exception e) { - e.printStackTrace(); - } - - } - - public void setServiceRefName(String wsRefName) { - serviceRefName_ = wsRefName; - } - - public void setRefNameToServiceRef(Hashtable refName2SF) { - this.refNameToServiceRef_ = refName2SF; - } - -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java deleted file mode 100644 index 33f38e4d9..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java +++ /dev/null @@ -1,615 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.List; -import java.util.Vector; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.window.Window; -import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent; -import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - -/** - * ConfigServiceHandlersTreeWidget - * - */ -public class ConfigServiceHandlersTableWidget extends SimpleWidgetDataContributor { - - private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - private Composite parent_; - private boolean isGenSkeletonEnabled_; - private String outputLocation_; - - private Table handlersTable_; - private TableViewer tableViewer_; - private Combo webServiceDescCombo_; - private Button addButton_; - private Button removeButton_; - private Button genSkeletonRadioButton_; - private Combo sourceLocationCombo_; - private Hashtable pathsTable_ = new Hashtable(); - private Hashtable wsDescToHandlers_; - private Hashtable wsDescToPorts_; - private Hashtable serviceDescNameToDescObj_; - private String descriptionName_ = null; - - private Vector orderedHandlers_; - - private int DEFAULT_COLUMN_WIDTH = 90; - - // ----TOOLTIPS Section---- - /* CONTEXT_ID SHLD0001 for the Handler Config Page */ - private final String INFOPOP_HDLR_WS_HANDLERS = "SHDL0001"; //$NON-NLS-1$ - - /* CONTEXT_ID SHDL0002 for the Handler Config Page */ - private final String INFOPOP_HDLR_GEN_SKELETON = "SHDL0002"; //$NON-NLS-1$ - - /* CONTEXT_ID SHDL0003 for the Handler Config Page */ - private final String INFOPOP_COMBO_SOURCE_LOC = "SHDL0003"; //$NON-NLS-1$ - - /* CONTEXT_ID SHDL0004 for the Handler Config Page */ - private final String INFOPOP_WS_SERVICE_DESC = "SHDL0004"; //$NON-NLS-1$ - - // ------------------------ - - public ConfigServiceHandlersTableWidget() { - super(); - } - - public WidgetDataEvents addControls(Composite parent, Listener statusListener) { - UIUtils uiUtils = new UIUtils( pluginId_); - - parent_ = parent; - - // Web service reference combo - Composite webServiceRefComp = uiUtils.createComposite(parent_, 2); - webServiceDescCombo_ = uiUtils.createCombo(webServiceRefComp, ConsumptionUIMessages.LABEL_COMBO_WS_SERVICE_DESC, - ConsumptionUIMessages.TOOLTIP_WS_SERVICE_DESC, INFOPOP_WS_SERVICE_DESC, - SWT.READ_ONLY); - webServiceDescCombo_.addSelectionListener(new SelectionAdapter() { - - public void widgetSelected(SelectionEvent evt) { - handleWebServiceDescCombo(evt); - } - }); - - Composite displayComp = new Composite(parent, SWT.NONE); - - GridLayout gridlayout = new GridLayout(2, false); - displayComp.setLayout(gridlayout); - displayComp.setLayoutData(uiUtils.createFillAll()); - - Composite handlersComp = uiUtils.createComposite(displayComp, 1); - GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING - | GridData.VERTICAL_ALIGN_FILL); - handlersComp.setLayoutData(griddata); - handlersComp.setSize(130, 600); - - Composite buttonsComp = uiUtils.createComposite(displayComp, 1); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - buttonsComp.setLayoutData(griddata); - - Text handlersText = new Text(handlersComp, SWT.READ_ONLY); - handlersText.setText(ConsumptionUIMessages.LABEL_HANDLERS_CONFIG); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - gd.horizontalSpan = 2; - handlersText.setLayoutData(gd); - - handlersTable_ = uiUtils.createTable(handlersComp, ConsumptionUIMessages.TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION); - handlersTable_.setHeaderVisible(true); - handlersTable_.setLinesVisible(true); - - // empty space - Label wsLabel = new Label(buttonsComp, SWT.NONE); - gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - gd.horizontalSpan = 2; - wsLabel.setLayoutData(gd); - - Button moveUpButton = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_MOVE_UP, null, null); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - moveUpButton.setLayoutData(griddata); - moveUpButton.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent event) { - handleMoveUpButtonSelected(event); - } - - public void widgetDefaultSelected(SelectionEvent event) { - } - }); - - Button moveDownButton = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_MOVE_DOWN, null, null); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - moveDownButton.setLayoutData(griddata); - moveDownButton.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent event) { - handleMoveDownButtonSelected(event); - } - - public void widgetDefaultSelected(SelectionEvent event) { - } - }); - - // empty space - wsLabel = new Label(buttonsComp, SWT.NONE); - gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - gd.horizontalSpan = 2; - wsLabel.setLayoutData(gd); - - addButton_ = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_ADD, null, null); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - addButton_.setLayoutData(griddata); - addButton_.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent event) { - handleAddButtonSelected(event); - } - - public void widgetDefaultSelected(SelectionEvent event) { - } - }); - - removeButton_ = uiUtils.createPushButton(buttonsComp, ConsumptionUIMessages.LABEL_BUTTON_REMOVE, null, null); - griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - removeButton_.setLayoutData(griddata); - removeButton_.addSelectionListener(new SelectionListener() { - - public void widgetSelected(SelectionEvent event) { - handleRemoveButtonSelected(event); - } - - public void widgetDefaultSelected(SelectionEvent event) { - } - }); - enableRemove(false); - - // table stuff here - String[] columns_ = new String[] {ConsumptionUIMessages.LABEL_HANDLER_NAME, ConsumptionUIMessages.LABLE_HANDLER_CLASS, - ConsumptionUIMessages.LABEL_HANDLER_PORT}; - - for (int i = 0; i < columns_.length; i++) { - TableColumn tableColumn = new TableColumn(handlersTable_, i); - tableColumn.setText(columns_[i]); - tableColumn.setAlignment(SWT.LEFT); - tableColumn.setWidth(DEFAULT_COLUMN_WIDTH); - tableColumn.setResizable(true); - } - - tableViewer_ = new TableViewer(handlersTable_); - Control control = tableViewer_.getControl(); - - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - data.verticalAlignment = GridData.FILL; - data.grabExcessVerticalSpace = true; - control.setLayoutData(data); - - tableViewer_.setColumnProperties(columns_); - tableViewer_.setContentProvider(new ListContentProvider()); - tableViewer_.setLabelProvider(new ListLabelProvider()); - tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() { - - public void selectionChanged(SelectionChangedEvent event) { - enableRemove(true); - } - }); - - genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, ConsumptionUIMessages.LABEL_BUTTON_GEN_SKELETON, ConsumptionUIMessages.TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON); - genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() { - - public void widgetSelected(SelectionEvent evt) { - handleGenSkeletonRadioButton(); - } - }); - - Composite sourceLocationComp = uiUtils.createComposite(parent_, 2); - sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, ConsumptionUIMessages.LABEL_COMBO_SOURCE_LOC, ConsumptionUIMessages.TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC, - SWT.READ_ONLY); - sourceLocationCombo_.addSelectionListener(new SelectionAdapter() { - - public void widgetSelected(SelectionEvent evt) { - handleSourceLocationCombo(evt); - } - }); - - return this; - } - - // Called at start - private void populateHandlersTable() { - try { - - int sizeOfHandlers = wsDescToHandlers_.size(); - - String[] wsRefNames = (String[]) wsDescToHandlers_.keySet().toArray(new String[0]); - webServiceDescCombo_.setItems(wsRefNames); - - if (sizeOfHandlers < 1) { - webServiceDescCombo_.select(0); - webServiceDescCombo_.setEnabled(false); - } - else { - if (descriptionName_ != null) { - int index = webServiceDescCombo_.indexOf(descriptionName_); - if (index != -1) webServiceDescCombo_.select(index); - } - else - webServiceDescCombo_.select(0); - } - // get webServiceRef hint - String wsRef = webServiceDescCombo_.getText(); - - if (wsDescToHandlers_.get(wsRef) != null) { - orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsRef); - tableViewer_.setInput(orderedHandlers_); - tableViewer_.refresh(); - } - } - catch (Exception e) { - e.printStackTrace(); - } - - } - - /** - * @return Returns the handlers. - */ - public List getHandlersList() { - // convert to a ArrayList and return as List - List list = new ArrayList(); - if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_); - - return list; - } - - public Hashtable getWsDescToHandlers() { - return this.wsDescToHandlers_; - } - - /** - * @param handlers - * The handlers to set. - */ - public void setHandlers(HandlerTableItem[] handlers) { - populateHandlersTable(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus() - */ - public IStatus getStatus() { - IStatus finalStatus = Status.OK_STATUS; - - return finalStatus; - } - - private void handleAddButtonSelected(SelectionEvent event) { - - String descName = webServiceDescCombo_.getText(); - WebServiceDescription serviceDesc = (WebServiceDescription) serviceDescNameToDescObj_.get(descName); - - AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), false); - dialog.create(); - - String[] portNames = getPortComponentNames(serviceDesc); - dialog.setPortNames(portNames); - dialog.getShell().setSize( 500, 200 ); - - int result = dialog.open(); - - if (result == Window.OK) { - String name = dialog.getName(); - String className = dialog.getClassName(); - String port = dialog.getPortName(); - - HandlerTableItem hi = new HandlerTableItem(); - hi.setHandlerName(name); - hi.setHandlerClassName(className); - hi.setPortName(port); - - - hi.setWsDescRef(serviceDesc); - - orderedHandlers_ = (Vector) wsDescToHandlers_.get(descName); - orderedHandlers_.add(hi); - - } - - refresh(); - } - - private String[] getPortComponentNames(WebServiceDescription webServiceDesc) { - - List ports = webServiceDesc.getPortComponents(); - if (ports!=null){ - String[] portNames = new String[ports.size()]; - for(int i=0;i<ports.size();i++){ - PortComponent pc = (PortComponent)ports.get(i); - String pcName = pc.getPortComponentName(); - portNames[i] = pcName; - } - return portNames; - } - return new String[0]; - } - - private void handleRemoveButtonSelected(SelectionEvent event) { - handleDeleteKeyPressed(); - } - - private void handleMoveUpButtonSelected(SelectionEvent event) { - - int index = tableViewer_.getTable().getSelectionIndex(); - if (index != -1) { - if (index > 0) { - orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText()); - Object object = orderedHandlers_.remove(index); - orderedHandlers_.insertElementAt(object, index - 1); - tableViewer_.refresh(); - } - } - - } - - private void handleMoveDownButtonSelected(SelectionEvent event) { - - int index = tableViewer_.getTable().getSelectionIndex(); - if (index != -1) { - if (index < orderedHandlers_.size() - 1) { - orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText()); - Object object = orderedHandlers_.remove(index); - orderedHandlers_.insertElementAt(object, index + 1); - tableViewer_.refresh(); - } - } - - } - - public void handleSourceLocationCombo(SelectionEvent event) { - outputLocation_ = sourceLocationCombo_.getText(); - } - - public void handleGenSkeletonRadioButton() { - if (genSkeletonRadioButton_.isEnabled()) { - if (genSkeletonRadioButton_.getSelection()) - this.isGenSkeletonEnabled_ = true; - else - this.isGenSkeletonEnabled_ = false; - } - } - - public void handleWebServiceDescCombo(SelectionEvent event) { - - if (webServiceDescCombo_.isEnabled()) { - String webServiceRefName = webServiceDescCombo_.getText(); - Vector hndlers = (Vector) wsDescToHandlers_.get(webServiceRefName); - if (hndlers != null) { - tableViewer_.setInput(hndlers); - tableViewer_.refresh(); - } - } - } - - /** - * @return Returns the isGenSkeletonEnabled_. - */ - public boolean isGenSkeletonEnabled_() { - return isGenSkeletonEnabled_; - } - - protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider { - - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - public String getColumnText(Object object, int columnIndex) { - - if (object instanceof HandlerTableItem) { - HandlerTableItem hti = (HandlerTableItem) object; - if (columnIndex == 0) { - return hti.getHandlerName() != null ? hti.getHandlerName() : ""; - } - else if (columnIndex == 1) { - return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : ""; - } - else { - return hti.getPortName() != null ? hti.getPortName() : ""; - } - } - return null; - } - - } - - private void enableRemove(boolean enabled) { - removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty()); - } - - protected class ListContentProvider implements IStructuredContentProvider { - - public Object[] getElements(Object element) { - if (element instanceof Vector) { return ((Vector) element).toArray(); } - return null; - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object old, Object newobj) { - } - - public boolean isDeleted(Object object) { - return false; - } - } - - private void handleDeleteKeyPressed() { - //internalDispose(); - ISelection selection = tableViewer_.getSelection(); - if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) { - int selectionIndex = handlersTable_.getSelectionIndex(); - - orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText()); - orderedHandlers_.remove(selectionIndex); - refresh(); - } - } - - public void refresh() { - try { - tableViewer_.setInput(null); - if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_); - tableViewer_.refresh(); - } - catch (Exception e) { - e.printStackTrace(); - } - } - - public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) { - this.isGenSkeletonEnabled_ = isGenSkeletonEnabled; - genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled); - - } - - public boolean getGenSkeletonEnabled() { - return this.isGenSkeletonEnabled_; - } - - public void setSourceOutputLocation(IPath[] locations) { - this.outputLocation_ = locations[0].toString(); - - String[] paths = new String[locations.length]; - for (int i = 0; i < locations.length; i++) { - paths[i] = locations[i].toString(); - pathsTable_.put(paths[i], locations[i]); - } - sourceLocationCombo_.setItems(paths); - sourceLocationCombo_.select(0); - - } - - public IPath getSourceOutputLocation() { - IPath outputPath = (IPath) pathsTable_.get(outputLocation_); - return outputPath; - } - - /** - * @return Returns the handlerClassNames. - */ - public String[] getHandlerClassNames() { - - Vector handlerClasses = new Vector(); - Enumeration e = wsDescToHandlers_.keys(); - while (e.hasMoreElements()) { - - String wsDescName = (String)e.nextElement(); - orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsDescName); - - if (orderedHandlers_ != null) { - - for (int i = 0; i < orderedHandlers_.size(); i++) { - HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i); - handlerClasses.add(hti.getHandlerClassName()); - } - } - } - return (String[])handlerClasses.toArray(new String[0]); - } - - /** - * @param wsDescToHandlersArray_ - * The wsDescToHandlersArray_ to set. - */ - public void setWsRefsToHandlers(Hashtable wsDescToHandlersArray) { - - wsDescToHandlers_ = new Hashtable(); - wsDescToPorts_ = new Hashtable(); - try { - - if (wsDescToHandlersArray != null) { - // store the wsRefs - Enumeration wsDesc = wsDescToHandlersArray.keys(); - while (wsDesc.hasMoreElements()) { - String wsDescName = (String) wsDesc.nextElement(); - - HandlerTableItem[] handlers = (HandlerTableItem[]) wsDescToHandlersArray.get(wsDescName); - // process the handlersTable - orderedHandlers_ = new Vector(); - HashSet portNameVector = new HashSet(); - - for (int i = 0; i < handlers.length; i++) { - orderedHandlers_.add(handlers[i]); - String portName = handlers[i].getPortName(); - portNameVector.add(new String(portName)); - } - wsDescToHandlers_.put(wsDescName, orderedHandlers_); - wsDescToPorts_.put(wsDescName, (String[]) portNameVector.toArray(new String[0])); - } - } - populateHandlersTable(); - } - catch (Exception e) { - e.printStackTrace(); - } - - } - - public void setDescriptionName(String wsDescName) { - descriptionName_ = wsDescName; - } - - public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) { - this.serviceDescNameToDescObj_ = serviceDescNameToDescObj; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java deleted file mode 100644 index f5b6e148c..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; - - -/** - * HandlersDefaultingCommand - * - * Determine if Handlers belongs to service or client side - */ -public class HandlersDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd -{ - private boolean isClientHandler_ = false; - private boolean isServiceHandler_ = false; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - - IStructuredSelection selection = getInitialSelection(); - if (selection != null && selection.size() == 1) { - Object obj = selection.getFirstElement(); - - if (obj instanceof WebServiceNavigatorGroupType) { - WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj; - if (wsngt.getWsdlService()!=null){ - isServiceHandler_ = true; - } - - if (wsngt.getServiceRef()!=null){ - isClientHandler_ = true; - } - - } - } - else { - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED ); - env.getStatusHandler().reportError(status); - return status; - } - - return status; - - } - - -/** - * @return Returns the isClientHandler_. - */ -public boolean getIsClientHandler() { - return isClientHandler_; -} -/** - * @return Returns the isServiceHandler_. - */ -public boolean getIsServiceHandler() { - return isServiceHandler_; -} -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java deleted file mode 100644 index 7be3001ef..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java +++ /dev/null @@ -1,223 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.emf.common.util.URI; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; -import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.wsil.Arguments; -import org.eclipse.jst.ws.internal.consumption.ui.wsil.TableViewerEditor; -import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser; -import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.TableItem; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.help.IWorkbenchHelpSystem; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand; -import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; - -/** -* Page for importing WSDL references into a WSIL in the workbench. -*/ -public class ImportWSILWidget extends SimpleWidgetDataContributor -{ - /*CONTEXT_ID WSIL0001 for the WSIL Import Page*/ - private final String INFOPOP_WSIL_IMPORT_PAGE = WebServiceConsumptionUIPlugin.ID + ".WSIL0001"; - - /*CONTEXT_ID WSIL0002 for the WSIL text field*/ - private final String INFOPOP_WSIL_TEXT_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0002"; - - /*CONTEXT_ID WSIL0003 for the WSIL browse button*/ - private final String INFOPOP_WSIL_BUTTON_BROWSE_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0003"; - - /*CONTEXT_ID WSIL0004 for the WSDL table*/ - private final String INFOPOP_WSIL_TABLE_WSDL = WebServiceConsumptionUIPlugin.ID + ".WSIL0004"; - - private final String INSPECTION_WSIL = "inspection.wsil"; - - private Text wsil_; - private Button browse_; - private TableViewerEditor wsdls_; - - /** - * Constructs a new page. - */ - public ImportWSILWidget() - { - } - - public WidgetDataEvents addControls(Composite parent, Listener statusListener) - { - IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem(); - - parent.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_IMPORT_PAGE); - helpSystem.setHelp(parent, INFOPOP_WSIL_IMPORT_PAGE); - - Composite composite = new Composite(parent, SWT.NONE); - GridLayout gl = new GridLayout(); - gl.numColumns = 3; - composite.setLayout(gl); - GridData gd = new GridData(GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL); - gd.grabExcessVerticalSpace = true; - gd.grabExcessHorizontalSpace = true; - composite.setLayoutData(gd); - - Label label = new Label(composite, SWT.WRAP); - label.setText(ConsumptionUIMessages.LABEL_WSIL_URI); - label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - - wsil_ = new Text(composite, SWT.WRAP | SWT.SINGLE | SWT.BORDER); - gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); - gd.widthHint = 256; - wsil_.setLayoutData(gd); - wsil_.addListener(SWT.Modify, statusListener); - wsil_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_TEXT_WSIL); - helpSystem.setHelp(wsil_, INFOPOP_WSIL_TEXT_WSIL); - - browse_ = new Button(composite, SWT.PUSH); - browse_.setText(ConsumptionUIMessages.LABEL_BROWSE); - browse_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - browse_.addListener(SWT.Selection, - new Listener() - { - public void handleEvent(Event event) - { - handleBrowseEvent(event); - } - } - ); - browse_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_BUTTON_BROWSE_WSIL); - helpSystem.setHelp(browse_, INFOPOP_WSIL_BUTTON_BROWSE_WSIL); - - Composite wsdlComposite = new Composite(composite, SWT.NONE); - wsdlComposite.setLayout(new GridLayout()); - gd = new GridData(GridData.FILL_BOTH); - gd.horizontalSpan = 3; - wsdlComposite.setLayoutData(gd); - label = new Label(wsdlComposite, SWT.WRAP); - label.setText(ConsumptionUIMessages.LABEL_WSDL); - label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - String[] columns = {ConsumptionUIMessages.LABEL_WSDL_URI}; - wsdls_ = new TableViewerEditor(wsdlComposite, columns, new ArrayList(), "http://"); - wsdls_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_TABLE_WSDL); - wsdls_.setInfopop(INFOPOP_WSIL_TABLE_WSDL); - return this; - } - - public void handleBrowseEvent(Event event) - { - DialogResourceBrowser dialog = new DialogResourceBrowser(browse_.getShell(), null, new FileExtensionFilter(new String[] {"wsil"})); - dialog.open(); - IResource res = dialog.getFirstSelection(); - if (res != null) - { - if (res instanceof IFile) - wsil_.setText(res.getFullPath().toString()); - else - wsil_.setText(res.getFullPath().addTrailingSeparator().append(INSPECTION_WSIL).toString()); - } - } - - public IStatus getStatus() - { - if (!wsil_.getText().endsWith(".wsil")) - return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WSIL_FILE_NAME ); - else - return Status.OK_STATUS; - } - - public void setInitialSelection(IStructuredSelection selection) - { - ArrayList list = new ArrayList(); - if (selection != null && !selection.isEmpty()) - { - for (Iterator it = selection.iterator(); it.hasNext();) - { - Object object = it.next(); - if ((object instanceof IFile) && ((IFile)object).getFileExtension() != null && ((IFile)object).getFileExtension().equals("wsdl")) - list.add(((IFile)object).getFullPath().toString()); - if (object instanceof ServiceImpl) - list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceImpl)(object)))); - if (object instanceof ServiceRef) - list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceRef)(object)))); - if (object instanceof WSDLResourceImpl) - list.add(J2EEActionAdapterFactory.getWSILPath(((WSDLResourceImpl)(object)))); - } - } - wsdls_.setInput(list); - wsdls_.refresh(); - if (list.size() > 0) - { - StringBuffer path = new StringBuffer(list.get(0).toString()); - // change extension from .wsdl to .wsil - int length = path.length(); - path = path.replace(length-4, length, "wsil"); - wsil_.setText(path.toString()); - } - } - - public Arguments getGenWSILArguments() - { - Arguments args = new Arguments(); - String wsilPath = wsil_.getText(); - if (wsilPath.indexOf(':') < 0) - args.add(AddWSDLToWSILCommand.ARG_WSIL, URI.createPlatformResourceURI(wsil_.getText()).toString()); - else - args.add(AddWSDLToWSILCommand.ARG_WSIL, wsilPath); - TableItem[] items = wsdls_.getItems(); - for (int i = 0; i < items.length; i++) - { - String uri = items[i].getText(0); - if (uri.indexOf(':') < 0) - { - IResource res = ResourceUtils.findResource(uri); - if (res != null) - { - try - { - uri = res.getLocation().toFile().toURL().toString(); - } - catch (MalformedURLException murle) - { - murle.getMessage(); - } - } - } - args.add(AddWSDLToWSILCommand.ARG_WSDL, uri); - } - args.add(AddWSDLToWSILCommand.ARG_RESOLVE_WSDL, null); - return args; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java deleted file mode 100644 index 27fc72bbe..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - - -public class PreferencesSelectionWidget extends SimpleWidgetDataContributor -{ - private ResourceContext context_; - - /*CONTEXT_ID PWPR0003 for the Overwrite Files check box of the Project Page*/ - private String INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES = "PWPR0003"; - private Button overwriteFilesCheckbox_; - - /*CONTEXT_ID PWPR0004 for the Create Folders check box of the Project Page*/ - private String INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS = "PWPR0004"; - private Button createFoldersCheckbox_; - - /*CONTEXT_ID PWPR0015 for the Check Out Files check box of the Project Page*/ - private String INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES = "PWPR0015"; - private Button checkoutFilesCheckbox_; - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener) - */ - public WidgetDataEvents addControls( Composite parent, Listener statusListener) - { - String conPluginId = "org.eclipse.jst.ws.consumption.ui"; - UIUtils utils = new UIUtils( conPluginId ); - - Composite resourcesGroup = utils.createComposite( parent, 1 ); - - overwriteFilesCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_OVERWRITE_FILES, - WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES, - INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES ); - - createFoldersCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_CREATE_FOLDERS, - WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS , - INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS ); - - checkoutFilesCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_CHECKOUT_FILES, - WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CHECK_OUT, - INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES ); - - return this; - } - - public void setResourceContext( ResourceContext context ) - { - overwriteFilesCheckbox_.setSelection( context.isOverwriteFilesEnabled() ); - createFoldersCheckbox_.setSelection( context.isCreateFoldersEnabled() ); - checkoutFilesCheckbox_.setSelection( context.isCheckoutFilesEnabled() ); - - context_ = context; - } - - public ResourceContext getResourceContext() - { - context_.setOverwriteFilesEnabled( overwriteFilesCheckbox_.getSelection() ); - context_.setCreateFoldersEnabled( createFoldersCheckbox_.getSelection() ); - context_.setCheckoutFilesEnabled( checkoutFilesCheckbox_.getSelection() ); - - return context_; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java deleted file mode 100644 index 656491948..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java +++ /dev/null @@ -1,101 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; - - -public class PublishToPrivateUDDICommandFragment extends AbstractCommandFragment -{ - private DataMappingRegistry dataMappingRegistry; - private CanFinishRegistry canFinishRegistry; - private WidgetRegistry widgetRegistry; - private boolean publishToPrivateUDDI; - private CommandWidgetBinding privateUDDIBinding; - - public PublishToPrivateUDDICommandFragment() - { - super(null, ""); - privateUDDIBinding = PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().getBinding(); - } - - /** - * Gets the first child fragment for this fragment. - * - * @return returns the first child fragment for this fragment. Returns - * null when there is no first child. - **/ - public CommandFragment getFirstSubFragment() - { - if (privateUDDIBinding != null && publishToPrivateUDDI && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled()) - { - privateUDDIBinding.registerCanFinish(canFinishRegistry); - privateUDDIBinding.registerDataMappings(dataMappingRegistry); - privateUDDIBinding.registerWidgetMappings(widgetRegistry); - return privateUDDIBinding.create().create(); - } - else - return null; - } - - /** - * Gets the next child fragment for this fragment. - * - * @return returns the next child fragment for this fragment. Returns null - * when there is no next child. - **/ - public CommandFragment getNextSubFragment(CommandFragment fragment) - { - return null; - } - - /* - * This method is called to retrieve the data mappings for this command fragment. - */ - public void registerDataMappings(DataMappingRegistry registry) - { - dataMappingRegistry = registry; - } - - public void registerCanFinish(CanFinishRegistry canFinishRegistry) - { - this.canFinishRegistry = canFinishRegistry; - } - - public void registerWidgetMappings(WidgetRegistry widgetRegistry) - { - this.widgetRegistry = widgetRegistry; - } - - /** - * All wizard fragments need to be cloneable. - **/ - public Object clone() - { - PublishToPrivateUDDICommandFragment fragment = new PublishToPrivateUDDICommandFragment(); - fragment.registerDataMappings(dataMappingRegistry); - fragment.registerCanFinish(canFinishRegistry); - fragment.registerWidgetMappings(widgetRegistry); - fragment.setPublishToPrivateUDDI(publishToPrivateUDDI); - return fragment; - } - - public void setPublishToPrivateUDDI(boolean publish) - { - publishToPrivateUDDI = publish; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java deleted file mode 100644 index d044f7ced..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java +++ /dev/null @@ -1,201 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.Vector; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.PublicUDDIRegistryTypeRegistry; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType; -import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.help.IWorkbenchHelpSystem; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.ws.internal.explorer.LaunchOption; -import org.eclipse.wst.ws.internal.explorer.LaunchOptions; - - -public class PublishWSWidget extends SimpleWidgetDataContributor -{ - /* CONTEXT_ID PWPB0001 for the UDDI Publish Page */ - private String INFOPOP_PWPB_PAGE = WebServiceConsumptionUIPlugin.ID + ".PWPB0001"; - /* CONTEXT_ID PWPB0002 for the UDDI Launch check box of the UDDI Publish Page */ - private String INFOPOP_PWPB_CHECKBOX_WS_LAUNCH = WebServiceConsumptionUIPlugin.ID + ".PWPB0002"; - private Button launchUDDICheckbox_; - private Button launchPrivateUDDICheckbox_; - private Label pubilcUDDIRegComboLabel_; - private Combo publicUDDIRegCombo_; - private Listener statusListener; - private Boolean publish; - - public PublishWSWidget(boolean publish) - { - this.publish = new Boolean(publish); - } - - public WidgetDataEvents addControls(Composite parent, Listener statusListener) - { - this.statusListener = statusListener; - Listener selListener = new Listener() - { - public void handleEvent(Event event) - { - handleSelectionEvent(event); - } - }; - parent.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWPB_PAGE); - IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem(); - helpSystem.setHelp(parent, INFOPOP_PWPB_PAGE); - launchPrivateUDDICheckbox_ = new Button(parent, SWT.CHECK); - if (publish.booleanValue()) - launchPrivateUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_PUBLISH_PRIVATE_UDDI); - else - launchPrivateUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_FIND_PRIVATE_UDDI); - launchPrivateUDDICheckbox_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH); - launchPrivateUDDICheckbox_.addListener(SWT.Selection, selListener); - helpSystem.setHelp(launchPrivateUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH); - launchUDDICheckbox_ = new Button(parent, SWT.CHECK); - if (publish.booleanValue()) - launchUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_PUBLISH); - else - launchUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_FIND); - launchUDDICheckbox_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH); - launchUDDICheckbox_.addListener(SWT.Selection, selListener); - helpSystem.setHelp(launchUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH); - Composite c = new Composite(parent, SWT.NONE); - GridLayout gl = new GridLayout(); - gl.numColumns = 3; - gl.marginHeight = 0; - gl.marginWidth = 0; - c.setLayout(gl); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); - c.setLayoutData(gd); - new Label(c, SWT.WRAP); - pubilcUDDIRegComboLabel_ = new Label(c, SWT.WRAP); - pubilcUDDIRegComboLabel_.setText(ConsumptionUIMessages.LABEL_PUBLIC_UDDI_REGISTRIES); - publicUDDIRegCombo_ = new Combo(c, SWT.DROP_DOWN | SWT.READ_ONLY); - publicUDDIRegCombo_.setEnabled(false); - initPublicUDDI(); - initPrivateUDDI(); - return this; - } - - private void initPublicUDDI() - { - PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance(); - PublicUDDIRegistryType[] types = reg.getAllPublicUDDIRegistryTypes(); - for (int i = 0; i < types.length; i++) - { - if (publish.booleanValue()) - { - // Ignore read-only registries. - String publishURL = types[i].getPublishURL(); - if (publishURL == null || publishURL.indexOf("://") == -1) - continue; - } - publicUDDIRegCombo_.add(types[i].getName()); - } - if (types.length > 0) - publicUDDIRegCombo_.setText(publicUDDIRegCombo_.getItem(0)); - } - - private void initPrivateUDDI() - { - if (!publish.booleanValue() && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled()) - launchPrivateUDDICheckbox_.setEnabled(false); - } - - private void handleSelectionEvent(Event event) - { - if (launchUDDICheckbox_ == event.widget) - publicUDDIRegCombo_.setEnabled(launchUDDICheckbox_.getSelection()); - statusListener.handleEvent(event); - } - - public void setPublishToPublicUDDI(boolean publish) - { - launchUDDICheckbox_.setSelection(publish); - publicUDDIRegCombo_.setEnabled(publish); - } - - public void setPublishToPublicUDDI(Boolean publish) - { - setPublishToPublicUDDI(publish.booleanValue()); - } - - public void setPublishToPrivateUDDI(boolean publish) - { - launchPrivateUDDICheckbox_.setSelection(publish); - } - - public void setPublishToPrivateUDDI(Boolean publish) - { - setPublishToPrivateUDDI(publish.booleanValue()); - } - - public boolean getPublishToPublicUDDI() - { - return launchUDDICheckbox_.getSelection(); - } - - public boolean getPublishToPrivateUDDI() - { - return launchPrivateUDDICheckbox_.getSelection(); - } - - public boolean getForceLaunchOutsideIDE() - { - return false; - } - - public LaunchOption[] getLaunchOptions() - { - Vector launchOptionVector = new Vector(); - if (launchUDDICheckbox_.getSelection()) - { - PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance(); - int UDDIRegSelectionIndex = publicUDDIRegCombo_.getSelectionIndex(); - if (UDDIRegSelectionIndex != -1) - { - String name = publicUDDIRegCombo_.getItem(UDDIRegSelectionIndex); - String id = reg.getPublicUDDIRegistryTypeIDByName(name); - PublicUDDIRegistryType type = reg.getPublicUDDIRegistryTypeByID(id); - launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, type.getInquiryURL())); - launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, type.getPublishURL())); - } - } - if (launchPrivateUDDICheckbox_.getSelection()) - { - PrivateUDDIRegistryTypeRegistry privateReg = PrivateUDDIRegistryTypeRegistry.getInstance(); - PrivateUDDIRegistryType privateType = privateReg.getPrivateUDDIRegistryType(); - String[] privateInquiryURL = privateType.getPrivateUDDIRegistryInquiryAPI(); - String[] privatePublishURL = privateType.getPrivateUDDIRegistryPublishAPI(); - for (int i = 0; i < privateInquiryURL.length; i++) - { - launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, privateInquiryURL[i])); - launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, privatePublishURL[i])); - } - } - return (LaunchOption[]) launchOptionVector.toArray(new LaunchOption[0]); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java deleted file mode 100644 index d44843bba..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java +++ /dev/null @@ -1,225 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.Hashtable; -import java.util.List; -import java.util.Vector; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType; -import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager; -import org.eclipse.jst.j2ee.webservice.wsdd.Handler; -import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent; -import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription; -import org.eclipse.jst.j2ee.webservice.wsdd.WebServices; -import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; - -/** - * ServiceHandlersWidgetDefaultingCommand - * - * Initialize and load the handlers data - */ -public class ServiceHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd { - - private HandlerTableItem[] handlers_; - private WebServiceDescription wsDescription_; - private WsddResource wsddResource_; - private WebServicesManager webServicesManager_; - private IProject project_; - private Hashtable wsDescToHandlers_; - private Hashtable serviceDescNameToDescObj_; - private String descriptionName_ = null; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - - webServicesManager_ = new WebServicesManager(); - IStructuredSelection selection = getInitialSelection(); - if (selection == null) { - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED ); - env.getStatusHandler().reportError(status); - return status; - } - - status = processHandlers(env); - return status; - - } - - public IStatus processHandlers(IEnvironment env) { - try { - Vector handlers = new Vector(); - wsDescToHandlers_ = new Hashtable(); - serviceDescNameToDescObj_ = new Hashtable(); - -// WebServiceEditModel wsed = getWebServiceEditModel(); - // if (wsed == null) - wsddResource_ = getWsddResourceFromSelection(); - // else - // wsddResource_ = wsed.getWebServicesXmlResource(); - - if (wsddResource_ == null) { - IStatus status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED ); - env.getStatusHandler().reportError(status); - return status; - } - - WebServices webServices = wsddResource_.getWebServices(); - if (webServices != null) { - List wsDescriptions = wsddResource_.getWebServices().getWebServiceDescriptions(); - for (int i = 0; i < wsDescriptions.size(); i++) { - - wsDescription_ = (WebServiceDescription) wsDescriptions.get(i); - - List wsPortComponents = wsDescription_.getPortComponents(); - for (int j = 0; j < wsPortComponents.size(); j++) { - PortComponent wsPort = (PortComponent) wsPortComponents.get(j); - String portName = wsPort.getPortComponentName(); - List wsHandlers = wsPort.getHandlers(); - HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()]; - for (int k = 0; k < wsHandlers.size(); k++) { - - Handler wsHandler = (Handler) wsHandlers.get(k); - - HandlerTableItem handlerItem = new HandlerTableItem(); - handlerItem.setHandler(wsHandler); - handlerItem.setHandlerName(wsHandler.getHandlerName()); - handlerItem.setHandlerClassName(wsHandler.getHandlerClass()); - handlerItem.setPort(wsPort); - handlerItem.setPortName(portName); - handlerItem.setWsDescRef(wsDescription_); - handlerItems[k] = handlerItem; - - handlers.add(handlerItem); - } - String wsDescName = wsDescription_.getWebServiceDescriptionName(); - wsDescToHandlers_.put(wsDescName, handlerItems); - serviceDescNameToDescObj_.put(wsDescName, wsDescription_); - - } - - } - - handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]); - } - } - catch (Exception e) - { - e.printStackTrace(); - return StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e); - } - return Status.OK_STATUS; - } - - public HandlerTableItem[] getHandlers() { - return this.handlers_; - } - - /** - * @return Returns the isGenSkeletonEnabled_. - */ - public boolean getGenSkeletonEnabled() { - return true; - } - - /** - * @return Returns the sourceOutputLocation_. - */ - public IPath[] getSourceOutputLocation() { - IPath[] locations = null; - IProject project = getProject(); - - if (project != null) { - locations = ResourceUtils.getAllJavaSourceLocations(project); - } - else { - project = project_; - if (project != null) { - locations = ResourceUtils.getAllJavaSourceLocations(project); - } - } - return locations; - } - - public WsddResource getWsddResource() { - return wsddResource_; - } - - private WsddResource getWsddResourceFromSelection() { - IStructuredSelection initSel = getInitialSelection(); - if (initSel != null && initSel.size() == 1) { - Object obj = initSel.getFirstElement(); - if (obj instanceof ServiceImpl) { - // Service object - Service service = (Service) obj; - descriptionName_ = service.getQName().getLocalPart(); - project_ = ProjectUtilities.getProject(service); - return webServicesManager_.getWsddResource(service); - } - else if (obj instanceof WSDLResourceImpl) { - // WSDL resource - WSDLResourceImpl res = (WSDLResourceImpl) obj; - project_ = ProjectUtilities.getProject(res); - List wsdlResources = webServicesManager_.getWSDLServices(res); - return webServicesManager_.getWsddResource((Service) wsdlResources.get(0)); - } - else if (obj instanceof WebServiceNavigatorGroupType) { - WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj; - Service service = (Service)wsngt.getWsdlService(); - descriptionName_ = service.getQName().getLocalPart(); - project_ = ProjectUtilities.getProject(service); - return webServicesManager_.getWsddResource(service); - } - } - - return null; - - } - - /** - * @deprecated - */ - public WebServiceDescription getWsDescription() { - return wsDescription_; - } - - public String getDescriptionName(){ - return descriptionName_; - } - - public Hashtable getWsRefsToHandlers(){ - return wsDescToHandlers_; - } - - public Hashtable getServiceDescNameToDescObj(){ - return this.serviceDescNameToDescObj_; - } - - -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java deleted file mode 100644 index 504f1e5c6..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java +++ /dev/null @@ -1,221 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.List; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.j2ee.webservice.wsdd.Handler; -import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent; -import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription; -import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory; -import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource; -import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddFactoryImpl; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility; - -/* - * Provide a way to externalize the edited fields and create new handlers - * - */ -public class ServiceHandlersWidgetOutputCommand extends AbstractDataModelOperation -{ - - private WsddResource wsddResource_; - private Hashtable wsDescToHandlers_; - private Hashtable serviceDescNameToDescObj_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - try { - Enumeration e = wsDescToHandlers_.keys(); - while (e.hasMoreElements()) { - - Hashtable wsPortsTable = new Hashtable(); - Hashtable wsPortToHandlerTable = new Hashtable(); - - String serviceDescName = (String) e.nextElement(); - // load PortName -> PortComponent table - WebServiceDescription wsDescription_ = (WebServiceDescription) serviceDescNameToDescObj_.get(serviceDescName); - if (wsDescription_ != null) { - - List wsPorts = wsDescription_.getPortComponents(); - for (int k = 0; k < wsPorts.size(); k++) { - PortComponent port = (PortComponent) wsPorts.get(k); - wsPortsTable.put(port.getPortComponentName(), port); - wsPortToHandlerTable.put(port.getPortComponentName(), new ArrayList()); - } - } - - List handlerTableItems = (List) wsDescToHandlers_.get(serviceDescName); - if (handlerTableItems != null) { - - WsddFactory wsddFactory = new WsddFactoryImpl(); - - //form port components tables first - for (int i = 0; i < handlerTableItems.size(); i++) { - - HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i); - PortComponent wsPort = (PortComponent) hti.getPort(); - if (wsPort == null) { - //find it - if (wsPortsTable.get(hti.getPortName()) != null) - wsPort = (PortComponent) wsPortsTable.get(hti.getPortName()); - else { - // create it; should not get into here - wsPort = wsddFactory.createPortComponent(); - wsPort.setPortComponentName(hti.getPortName()); - wsPortsTable.put(wsPort.getPortComponentName(), wsPort); - } - } - wsPortToHandlerTable.put(wsPort.getPortComponentName(), new ArrayList()); - } - - // form Handler and ports table - for (int i = 0; i < handlerTableItems.size(); i++) { - - HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i); - String portName = hti.getPortName(); - - PortComponent port = (PortComponent) wsPortsTable.get(portName); - if (port == null) return status; - - List existingHandlers = port.getHandlers(); - - Object handler = hti.getHandler(); - if (!existingHandlers.contains(handler)) { - // create it - Handler newHandler = wsddFactory.createHandler(); - newHandler.setHandlerName(hti.getHandlerName()); - newHandler.setHandlerClass(hti.getHandlerClassName()); - ((List) wsPortToHandlerTable.get(portName)).add(newHandler); - - } - else if (handler instanceof Handler) { - // clone it - EtoolsCopyUtility copyUtil = new EtoolsCopyUtility(); - copyUtil.setCopyAdapters(true); - Handler clonedHandler = (Handler) copyUtil.copy((Handler) handler); - ((List) wsPortToHandlerTable.get(portName)).add(clonedHandler); - } - } - - } - - // remove existing handlers from ports - removeExistingHandlers(wsPortsTable, wsPortToHandlerTable); - - // add ports to wsDescription - addPortsToDescriptions(wsPortsTable, wsDescription_); - - // add handlers to ports - addHandlersToPorts(wsPortsTable, wsPortToHandlerTable); - } - if (wsddResource_ != null) { - wsddResource_.save(new HashMap()); - } - - } - catch (Exception e) { - //status = new - e.printStackTrace(); - } - return status; - } - - private void removeExistingHandlers(Hashtable portsTable, Hashtable portsToHandlersTable) { - try { - Enumeration ports = portsToHandlersTable.keys(); - while (ports.hasMoreElements()) { - String portName = (String) ports.nextElement(); - Object port = portsTable.get(portName); - if (port != null && port instanceof PortComponent) { - List handlers = ((PortComponent) port).getHandlers(); - handlers.clear(); - } - } - } - catch (Exception e) { - e.printStackTrace(); - } - } - - private void addPortsToDescriptions(Hashtable portsTable, WebServiceDescription wsDescription_) { - try { - Enumeration ports = portsTable.keys(); - while (ports.hasMoreElements()) { - String portName = (String) ports.nextElement(); - // newly edited port - Object port = portsTable.get(portName); - - // existing port - List emfPorts = wsDescription_.getPortComponents(); - if (!emfPorts.contains(port) && port != null && port instanceof PortComponent) { - emfPorts.add((PortComponent) port); - } - } - } - - catch (Exception e) { - e.printStackTrace(); - } - } - - private void addHandlersToPorts(Hashtable portsTable, Hashtable portsToHandlersTable) { - try { - Enumeration ports = portsToHandlersTable.keys(); - while (ports.hasMoreElements()) { - String portName = (String) ports.nextElement(); - Object port = portsTable.get(portName); - if (port != null && port instanceof PortComponent) { - List handlers = (List) portsToHandlersTable.get(portName); - - List modelHandlers = ((PortComponent) port).getHandlers(); - modelHandlers.addAll(handlers); - } - } - } - catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * @param handlerTableItems - * The handlerTableItems to set. - */ - public void setHandlersList(List handlerTableItems) { - } - - public void setWsDescToHandlers(Hashtable wsDescToHandlers) { - this.wsDescToHandlers_ = wsDescToHandlers; - } - -// public void setWsDescription(WebServiceDescription wsDesc) { -// this.wsDescription_ = wsDesc; -// } - - public void setWsddResource(WsddResource wsddRes) { - this.wsddResource_ = wsddRes; - } - - public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) { - this.serviceDescNameToDescObj_ = serviceDescNameToDescObj; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java deleted file mode 100644 index ed902a368..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java +++ /dev/null @@ -1,616 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.common.PropertiesResourceFilter; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.TableEditor; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.events.KeyListener; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.events.TraverseEvent; -import org.eclipse.swt.events.TraverseListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.TableItem; -import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - - -public class TableViewerWidget extends SimpleWidgetDataContributor -{ - private int DEFAULT_TABLE_HEIGHT_HINT = 100; - private int DEFAULT_COLUMN_WIDTH = 80; - - public static byte MAP_ONE_TO_ONE = 3; - public static byte MAP_MANY_TO_ONE = 1; - public static byte MAP_MANY_TO_MANY = 0; - - private String[] columns_; - private TableViewer tableViewer_; - private Table table_; - private TableEditor editor_; - private TableEditorListener tableEditorListener_; - private Text text_; - private Button import_; - private Button add_; - private Button remove_; - - private Composite parent_; - private Listener statusListener_; - - private String message = null; - private byte rescriction = MAP_MANY_TO_MANY; - - private List values_; - private Object defaultValue_; - - private PropertiesResourceFilter filter_ = new PropertiesResourceFilter(); - - public TableViewerWidget(String[] columns, List initValues, Object defaultValue, byte rescriction) - { - columns_ = columns; - values_ = new ArrayList(); - if (initValues != null && initValues.size() > 0) - values_.addAll(initValues); - defaultValue_ = (defaultValue != null) ? defaultValue : new String(""); - this.rescriction = rescriction; - } - - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - parent_ = parent; - statusListener_ = statusListener; - - Composite composite = new Composite(parent, SWT.NONE); - GridLayout gl = new GridLayout(); - - gl.marginHeight = 0; - gl.marginWidth = 0; - composite.setLayout(gl); - composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER); - GridData gd = new GridData(GridData.FILL_BOTH); - gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT; - table_.setLayoutData(gd); - table_.setHeaderVisible(true); - table_.setLinesVisible(true); - TableLayout tableLayout = new TableLayout(); - int maxWidth = DEFAULT_COLUMN_WIDTH; - for (int i = 0; i < columns_.length; i++) - { - TableColumn tableColumn = new TableColumn(table_, SWT.NONE); - tableColumn.setText(columns_[i]); - tableColumn.pack(); - int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth()); - maxWidth = Math.max(maxWidth, tableColumnWidth); - ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true); - tableLayout.addColumnData(columnData); - } - table_.setLayout(tableLayout); - // initialize the table editor - editor_ = new TableEditor(table_); - // The editor must have the same size as the cell and must - // not be any smaller than 50 pixels. - editor_.horizontalAlignment = SWT.LEFT; - editor_.grabHorizontal = true; - editor_.minimumWidth = maxWidth; - tableEditorListener_ = new TableEditorListener(); - table_.addMouseListener(tableEditorListener_); - tableViewer_ = new TableViewer(table_); - tableViewer_.getControl().addKeyListener( - new KeyListener() - { - public void keyPressed(KeyEvent e) - { - int asciiDel = (int)e.character; - // Del - if (asciiDel == 127) - handleDeleteKeyPressed(); - // Enter or space - if (((int)e.character) == 13 || ((int)e.character) == 32) - tableEditorListener_.editSelection(); - } - public void keyReleased(KeyEvent e) - { - } - } - ); - tableViewer_.setContentProvider(new ListContentProvider()); - tableViewer_.setLabelProvider(new ListLabelProvider()); - tableViewer_.setInput(values_); - tableViewer_.addSelectionChangedListener( - new ISelectionChangedListener() - { - public void selectionChanged(SelectionChangedEvent event) - { - enableRemove(true); - } - } - ); - - Composite buttonComposite = new Composite(composite, SWT.NONE); - gl = new GridLayout(); - gl.numColumns = 3; - gl.makeColumnsEqualWidth = true; - buttonComposite.setLayout(gl); - buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING)); - - import_ = new Button(buttonComposite, SWT.PUSH); - import_.setText(ConsumptionUIMessages.LABEL_IMPORT); - import_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - import_.addSelectionListener( - new SelectionListener() - { - public void widgetSelected(SelectionEvent event) - { - handleImportButtonSelected(event); - } - public void widgetDefaultSelected(SelectionEvent event) - { - } - } - ); - - add_ = new Button(buttonComposite, SWT.PUSH); - add_.setText(ConsumptionUIMessages.LABEL_ADD); - add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - add_.addSelectionListener( - new SelectionListener() - { - public void widgetSelected(SelectionEvent event) - { - handleAddButtonSelected(event); - } - public void widgetDefaultSelected(SelectionEvent event) - { - } - } - ); - - - remove_ = new Button(buttonComposite, SWT.PUSH); - remove_.setText(ConsumptionUIMessages.LABEL_REMOVE); - remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - remove_.addSelectionListener( - new SelectionListener() - { - public void widgetSelected(SelectionEvent event) - { - handleRemoveButtonSelected(event); - } - public void widgetDefaultSelected(SelectionEvent event) - { - } - } - ); - enableRemove(false); - - return this; - } - - private void enableRemove(boolean enabled) - { - remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty()); - } - - private void handleImportButtonSelected(SelectionEvent event) - { - IResource resource = DialogUtils.browseResources( - parent_.getShell(), - ResourceUtils.getWorkspaceRoot(), - null, - filter_ - ); - if (resource != null && resource instanceof IFile) - { - try - { - Properties props = new Properties(); - props.load(((IFile)resource).getContents()); - Set set = props.entrySet(); - java.util.List list = new LinkedList(); - Iterator i = set.iterator(); - while (i.hasNext()) - { - Map.Entry me = (Map.Entry)i.next(); - String key = (String)me.getKey(); - String val = (String)me.getValue(); - list.add(new String[] {key,val}); - } - values_.addAll(list); - } - catch (Exception e) - { - // TODO Report some error here. - } - } - refresh(); - } - - private void handleAddButtonSelected(SelectionEvent event) - { - values_.add(defaultValue_); - refresh(); - setSelectionAsObject(values_.get(table_.getItemCount()-1)); - tableEditorListener_.editSelection(); - } - - private void handleRemoveButtonSelected(SelectionEvent event) - { - handleDeleteKeyPressed(); - } - - private void handleDeleteKeyPressed() - { - internalDispose(); - ISelection selection = tableViewer_.getSelection(); - if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) - { - int selectionIndex = table_.getSelectionIndex(); - int selectionCount = table_.getItemCount(); - values_.remove(selectionIndex); - if (selectionIndex < selectionCount-1) - setSelectionAsObject(values_.get(selectionIndex)); - else if (selectionCount -2 >= 0) - setSelectionAsObject(values_.get(selectionCount-2)); - refresh(); - } - } - - private void internalRefresh() - { - // synchronize text field, previously selected table cell and model (inputObject) - if (text_ != null) - { - TableItem oldTableItem = editor_.getItem(); - int oldColumnIndex = editor_.getColumn(); - if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length) - { - String oldText = text_.getText(); - oldTableItem.setText(oldColumnIndex, oldText); - int oldRowIndex = table_.indexOf(oldTableItem); - values_.set(oldRowIndex, new String[] {oldTableItem.getText(0), oldTableItem.getText(1)}); - } - } - checkMappingConstraints(); - statusListener_.handleEvent( null ); - } - - private void checkMappingConstraints() { - - HashMap map = new HashMap(); - - for(int cnt=0; cnt<values_.size(); cnt++){ - String[] value = (String[])values_.get(cnt); - if(map.containsKey(value[0]) && ((rescriction & 1)!=0)){ - message =NLS.bind(ConsumptionUIMessages.MSG_MAPPING_DUPLICATE_ENTRIES, new String[]{columns_[0],columns_[1]}); - return; - } - if(map.containsValue(value[1]) && ((rescriction & 2)!=0)){ - message =NLS.bind(ConsumptionUIMessages.MSG_MAPPING_DUPLICATE_ENTRIES, new String[]{columns_[1],columns_[0]}); - return; - } - map.put(value[0],value[1]); - - } - message = null; - - } - - public IStatus getStatus() - { - return message == null ? Status.OK_STATUS : - StatusUtils.errorStatus( message ); - } - - private void setSelectionAsObject(Object object) - { - tableViewer_.setSelection(new StructuredSelection(object), true); - } - - public void refresh() - { - internalRefresh(); - tableViewer_.refresh(); - } - - public TableItem[] getItems() - { - //internalRefresh(); - return table_.getItems(); - } - - public void setEnabled(boolean enabled) - { - add_.setEnabled(enabled); - enableRemove(enabled); - } - - public void dispose() - { - internalDispose(); - if (editor_ != null) - editor_.dispose(); - if (table_ != null) - table_.dispose(); - if (add_ != null) - add_.dispose(); - if (remove_ != null) - remove_.dispose(); - } - - private void internalDispose() - { - if (text_ != null) - text_.dispose(); - text_ = null; - } - - protected class TableEditorListener implements MouseListener - { - private int currSelectionIndex_; - private int editRow_; - private int editColumn_; - - public TableEditorListener() - { - super(); - currSelectionIndex_ = -1; - editRow_ = -1; - editColumn_ = -1; - } - - public void mouseDoubleClick(MouseEvent e) - { - mouseDown(e); - } - - public void mouseDown(MouseEvent e) - { - // refresh table - internalRefresh(); - // Clean up previous text editor control - internalDispose(); - // update table - if (table_.isFocusControl()) - { - int selectedRowIndex = getSelectedRow(table_, e.y); - if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex) - { - TableItem tableItem = table_.getItem(selectedRowIndex); - int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y); - if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn())) - editSelection(selectedRowIndex, selectedColumnIndex); - } - currSelectionIndex_ = selectedRowIndex; - } - } - - public void mouseUp(MouseEvent e) - { - } - - private int getSelectedRow(Table table, int y) - { - TableItem[] tableItems = table.getItems(); - for (int i = 0; i < tableItems.length; i++) - { - Rectangle rectangle = tableItems[i].getBounds(0); - if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height)) - return i; - } - return -1; - } - - private int getSelectedColumn(TableItem tableItem, int x, int y) - { - for (int i = 0; i < columns_.length; i++) - { - if (tableItem.getBounds(i).contains(x, y)) - return i; - } - return -1; - } - - private void editSelection(int row, int column) - { - editRow_ = row; - editColumn_ = column; - TableItem tableItem = table_.getItem(row); - // Setup adapter for the new selection - text_ = new Text(table_, SWT.NONE); - String text = tableItem.getText(column); - text_.setText((text != null) ? text : ""); - text_.addKeyListener(new KeyListener() - { - public void keyPressed(KeyEvent e) - { - // Esc - if (((int)e.character) == 27) - cancelSelection(); - } - public void keyReleased(KeyEvent e) - { - } - } - ); - text_.addTraverseListener(new TraverseListener() - { - public void keyTraversed(TraverseEvent e) - { - if (e.detail == SWT.TRAVERSE_TAB_NEXT) - traverseTabNext(); - else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS) - traverseTabPrevious(); - } - } - ); - editor_.setEditor(text_, tableItem, column); - text_.setFocus(); - text_.selectAll(); - } - - protected void traverseTabNext() - { - internalRefresh(); - internalDispose(); - if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1)) - { - if (editColumn_ < columns_.length-1) - editColumn_++; - else - { - editColumn_ = 0; - editRow_++; - table_.select(editRow_); - } - editSelection(editRow_, editColumn_); - } - } - - protected void traverseTabPrevious() - { - internalRefresh(); - internalDispose(); - if (!(editRow_ == 0 && editColumn_ == 0)) - { - if (editColumn_ > 0) - editColumn_--; - else - { - editColumn_ = columns_.length-1; - editRow_--; - table_.select(editRow_); - } - editSelection(editRow_, editColumn_); - } - } - - public void cancelSelection() - { - internalDispose(); - internalRefresh(); - } - - public void editSelection() - { - int selectedRowIndex = table_.getSelectionIndex(); - if (selectedRowIndex != -1 && columns_.length > 0) - { - // refresh table - internalRefresh(); - // Clean up any previous editor control - internalDispose(); - editSelection(selectedRowIndex, 0); - } - currSelectionIndex_ = selectedRowIndex; - } - } - - protected class ListContentProvider implements IStructuredContentProvider - { - public void dispose() - { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) - { - tableViewer_.add(getElements(newInput)); - } - - public Object[] getElements(Object inputElement) - { - if (inputElement instanceof List) - { - List list = (List)inputElement; - Object[] objects = new Object[list.size()]; - for (int i = 0; i < objects.length; i++) - objects[i] = list.get(i); - return objects; - } - else - return new Object[0]; - } - } - - protected class ListLabelProvider implements ITableLabelProvider - { - public Image getColumnImage(Object element, int columnIndex) - { - return null; - } - - public String getColumnText(Object element, int columnIndex) - { - return ((String[])element)[columnIndex]; - } - - public void addListener(ILabelProviderListener listener) - { - } - - public void removeListener(ILabelProviderListener listener) - { - } - - public boolean isLabelProperty(Object element, String property) - { - return true; - } - - public void dispose() - { - } - } - } diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java deleted file mode 100644 index ad041c0db..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java +++ /dev/null @@ -1,135 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication; -import org.eclipse.osgi.util.NLS; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; -import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException; -import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - - -public class WSDLSelectionConditionCommand extends AbstractDataModelOperation implements Condition -{ - private WebServicesParser webServicesParser; - private String webServiceURI; - private String httpBasicAuthUsername; - private String httpBasicAuthPassword; - private boolean needWSDLSelectionTreeWidget; - - public WSDLSelectionConditionCommand() - { - } - - public void setWebServicesParser(WebServicesParser webServicesParser) - { - this.webServicesParser = webServicesParser; - } - - public WebServicesParser getWebServicesParser() - { - if (webServicesParser == null) - webServicesParser = new WebServicesParserExt(); - return webServicesParser; - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - needWSDLSelectionTreeWidget = false; - WebServicesParser parser = getWebServicesParser(); - parser.setURI(webServiceURI); - try - { - parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS); - } - catch (WWWAuthenticationException wwwae) - { - DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - dialog.handleWWWAuthentication(wwwae); - String username = dialog.getUsername(); - String password = dialog.getPassword(); - httpBasicAuthUsername = username; - httpBasicAuthPassword = password; - if (username != null && password != null) - { - parser.setHTTPBasicAuthUsername(username); - parser.setHTTPBasicAuthPassword(password); - try - { - parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS); - } - catch (Throwable t) - { - return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_URI_NOT_RESOLVABLE, new Object[] {webServiceURI}), t); - } - finally - { - parser.setHTTPBasicAuthUsername(null); - parser.setHTTPBasicAuthPassword(null); - } - } - } - catch (Throwable t) - { - return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_URI_NOT_RESOLVABLE, new Object[] {webServiceURI}), t); - } - WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(webServiceURI); - if (wsEntity != null) - { - int type = wsEntity.getType(); - if (type != WebServiceEntity.TYPE_WSDL) - needWSDLSelectionTreeWidget = true; - } - return Status.OK_STATUS; - } - - public boolean evaluate() - { - return needWSDLSelectionTreeWidget; - } - - public String getWebServiceURI() - { - return webServiceURI; - } - - public void setWebServiceURI(String webServiceURI) - { - this.webServiceURI = webServiceURI; - } - - public String getWsdlURI() - { - return getWebServiceURI(); - } -/** - * @return Returns the httpBasicAuthPassword. - */ -public String getHttpBasicAuthPassword() { - return httpBasicAuthPassword; -} -/** - * @return Returns the httpBasicAuthUsername. - */ -public String getHttpBasicAuthUsername() { - return httpBasicAuthUsername; -} -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java deleted file mode 100644 index d861819f4..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java +++ /dev/null @@ -1,132 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.Map; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - - -public class WSDLSelectionOutputCommand extends AbstractDataModelOperation -{ - private WebServicesParser webServicesParser; - private String wsdlURI; - private IProject project; - private String componentName; - - private boolean testService; - - - public boolean getTestService() { - return testService; - } - - - public void setTestService(boolean testService) { - this.testService = testService; - } - - /** - * @return Returns the project. - */ - public IProject getProject() - { - return project; - } - - /** - * @param project - * The project to set. - */ - public void setProject(IProject project) - { - this.project = project; - } - - - - public String getComponentName() - { - return componentName; - } - - public void setComponentName(String componentName) - { - this.componentName = componentName; - } - - public String getWsdlURI() - { - return wsdlURI; - } - - public void setWsdlURI(String wsdlURI) - { - this.wsdlURI = wsdlURI; - } - - /** - * @return Returns the webServicesParser. - */ - public WebServicesParser getWebServicesParser() - { - if (webServicesParser != null) - return webServicesParser; - else - return new WebServicesParserExt(); - } - - /** - * @param webServicesParser to set. - */ - public void setWebServicesParser(WebServicesParser webServicesParser) - { - this.webServicesParser = webServicesParser; - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - if (wsdlURI != null && getWebServicesParser().getWSDLDefinition(wsdlURI) != null) { - IStatus status = Status.OK_STATUS; - Map services = getWebServicesParser().getWSDLDefinition(wsdlURI).getServices(); - if (services.isEmpty()){ - if (testService==true){ - testService = false; - status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_WARNING_NO_SERVICE_ELEMENT ); - try{ - env.getStatusHandler().report(status); - }catch(Exception e){ - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_WARNING_NO_SERVICE_ELEMENT ); - } - } - } - return status; - } - else - { - IStatus status = StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL ); - env.getStatusHandler().reportError(status); - return status; - } - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java deleted file mode 100644 index 71c3af8d1..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java +++ /dev/null @@ -1,285 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import java.util.List; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - - -/** -* This wizard page allows the user to select the WSDL URI for consumption -*/ -public class WSDLSelectionTreeWidget extends SimpleWidgetDataContributor -{ - private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - - /*CONTEXT_ID PWWS0001 for the WSDL Selection Page*/ - private final String INFOPOP_PWWS_PAGE = ".PWWS0001"; - - private WebServicesParser webServicesParser; - private String webServiceURI; - - private Listener statusListener; - private TreeViewer treeViewer_; - private TreeContentProvider treeContentProvider; - private Tree tree_; - private int pageWidth_; - - /** - * Default constructor. - */ - public WSDLSelectionTreeWidget() - { - } - - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - this.statusListener = statusListener; - parent.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWWS_PAGE); - PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, pluginId_ + INFOPOP_PWWS_PAGE); - - Label wsdlLabel = new Label(parent, SWT.WRAP); - wsdlLabel.setText(ConsumptionUIMessages.LABEL_SELECT_WSDL); - wsdlLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - - tree_ = new Tree(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); - GridData gd = new GridData(GridData.FILL_BOTH); - gd.heightHint = 200; - tree_.setLayoutData(gd); - pageWidth_ = tree_.getShell().getSize().x; - treeViewer_ = new TreeViewer(tree_); - treeContentProvider = new TreeContentProvider(); - treeViewer_.setContentProvider(treeContentProvider); - treeViewer_.setLabelProvider(new TreeLabelProvider()); - treeViewer_.addSelectionChangedListener( - new ISelectionChangedListener() - { - public void selectionChanged(SelectionChangedEvent event) - { - handleTreeSelectionChangedEvent(event); - } - } - ); - return this; - } - - private void handleTreeSelectionChangedEvent(SelectionChangedEvent event) - { - statusListener.handleEvent(new Event()); - } - - /** - * @return Returns the webServicesParser. - */ - public WebServicesParser getWebServicesParser() - { - return webServicesParser; - } - /** - * @param webServicesParser The webServicesParser to set. - */ - public void setWebServicesParser(WebServicesParser webServicesParser) - { - this.webServicesParser = webServicesParser; - treeViewer_.setInput(this.webServicesParser); - refreshTreeViewer(); - } - - public void setWebServiceURI(String wsURI) - { - webServiceURI = wsURI; - treeContentProvider.setWebServiceURI(webServiceURI); - refreshTreeViewer(); - } - - public void refreshTreeViewer() - { - if (webServicesParser != null && webServiceURI != null) - { - treeViewer_.refresh(); - Control shell = tree_.getShell(); - if (tree_.getSize().x > pageWidth_ || shell.getSize().x > pageWidth_) - { - tree_.setSize(pageWidth_, tree_.getSize().y); - shell.setSize(pageWidth_, shell.getSize().y); - shell.computeSize(SWT.DEFAULT, SWT.DEFAULT); - shell.redraw(); - } - } - } - - public void setEnabled(boolean enabled) - { - tree_.setEnabled(enabled); - } - - public boolean isEnabled() - { - return tree_.isEnabled(); - } - - public String getWsdlURI() - { - WebServiceEntity entity = getSelectionAsWebServiceEntity(); - if (entity != null) - return entity.getURI(); - else - return webServiceURI; - } - - private WebServiceEntity getSelectionAsWebServiceEntity() - { - if (treeViewer_ != null) - { - ISelection sel = treeViewer_.getSelection(); - if (!sel.isEmpty() && (sel instanceof IStructuredSelection)) - { - IStructuredSelection ssel = (IStructuredSelection)sel; - Object object = ssel.getFirstElement(); - if (object instanceof WebServiceEntity) - return (WebServiceEntity)object; - } - } - return null; - } - - public IStatus getStatus() - { - WebServiceEntity wsEntity = getSelectionAsWebServiceEntity(); - if (wsEntity == null || wsEntity.getType() != WebServiceEntity.TYPE_WSDL) - return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL ); - else - return Status.OK_STATUS; - } - - private class TreeContentProvider implements ITreeContentProvider - { - private String webServiceURI; - - public void dispose() - { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) - { - } - - public Object[] getElements(Object inputElement) - { - if (inputElement instanceof WebServicesParser) - { - WebServicesParser parser = (WebServicesParser)inputElement; - Object wsEntity = parser.getWebServiceEntityByURI(webServiceURI); - if (wsEntity != null) - return new Object[] {wsEntity}; - } - return new Object[0]; - } - - public Object[] getChildren(Object parentElement) - { - if (parentElement instanceof WebServiceEntity) - { - List list = ((WebServiceEntity)parentElement).getChildren(); - Object[] objects = new Object[list.size()]; - for (int i = 0; i < objects.length; i++) - objects[i] = list.get(i); - return objects; - } - return new Object[0]; - } - - public Object getParent(Object element) - { - if (element instanceof WebServiceEntity) - return ((WebServiceEntity)element).getParent(); - return new Object[0]; - } - - public boolean hasChildren(Object element) - { - return (getChildren(element).length > 0); - } - - public void setWebServiceURI(String wsURI) - { - webServiceURI = wsURI; - } - } - - private class TreeLabelProvider implements ILabelProvider - { - public Image getImage(Object element) - { - switch (((WebServiceEntity)element).getType()) - { - case WebServiceEntity.TYPE_HTML: - return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/html.gif").createImage(); - case WebServiceEntity.TYPE_WSIL: - return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsil.gif").createImage(); - case WebServiceEntity.TYPE_WSDL: - return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsdl.gif").createImage(); - default: - return null; - } - } - - public String getText(Object element) - { - return ((WebServiceEntity)element).getURI(); - } - - public void addListener(ILabelProviderListener listener) - { - } - - public void removeListener(ILabelProviderListener listener) - { - } - - public boolean isLabelProperty(Object element, String property) - { - return true; - } - - public void dispose() - { - } - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java deleted file mode 100644 index fc40135fe..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java +++ /dev/null @@ -1,158 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; -import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; - -public class WSDLSelectionWidgetDefaultingCommand extends AbstractDataModelOperation -{ - private IStructuredSelection selection_; - - public String getWebServiceURI() - { - if (selection_ != null && !selection_.isEmpty()) - { - Object firstSel = selection_.getFirstElement(); - if (firstSel instanceof IFile) - { - IFile ifile = (IFile)firstSel; - String ext = ifile.getFileExtension(); - if (ext != null && (ext.equals("wsdl") || ext.equals("wsil") || ext.equals("html"))) - { - return ifile.getFullPath().toString(); - } - } - if (firstSel instanceof ServiceImpl) - { - ServiceImpl serviceImpl = (ServiceImpl)firstSel; - return J2EEActionAdapterFactory.getWSDLURI(serviceImpl); - } - if (firstSel instanceof ServiceRef) - { - ServiceRef serviceRef = (ServiceRef)firstSel; - return J2EEActionAdapterFactory.getWSDLURI(serviceRef); - } - if (firstSel instanceof WSDLResourceImpl) - { - WSDLResourceImpl wsdlRI = (WSDLResourceImpl)firstSel; - return J2EEActionAdapterFactory.getWSDLURI(wsdlRI); - } - if (firstSel instanceof String) - return (String)firstSel; - } - return ""; - } - - public void setInitialSelection( IStructuredSelection selection ) - { - selection_ = selection; - } - - public boolean getGenWSIL() - { - return false; - } - - public String getWsilURI() - { - String wsURI = getWebServiceURI(); - if (wsURI != null && wsURI.length() > 0 && wsURI.endsWith("wsdl")) - { - StringBuffer sb = new StringBuffer(wsURI.substring(0, wsURI.length()-4)); - sb.append("wsil"); - return sb.toString(); - } - return ""; - } - - public IProject getProject() - { - IProject p = getProjectFromInitialSelection(selection_); - return p; - } - - public String getComponentName() - { - String cname = getComponentNameFromInitialSelection(selection_); - return cname; - } - - private IProject getProjectFromInitialSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - if (resource==null) - return null; - IProject p = ResourceUtils.getProjectOf(resource.getFullPath()); - return p; - } catch(CoreException e) - { - return null; - } - } - } - return null; - } - - private String getComponentNameFromInitialSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - if (resource==null) - return null; - - IVirtualComponent comp = ResourceUtils.getComponentOf(resource); - if (comp!=null) - { - return comp.getName(); - } - } catch(CoreException e) - { - return null; - } - } - } - return null; - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java deleted file mode 100644 index e05e8fd19..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java +++ /dev/null @@ -1,126 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWrapper; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - -public class WSDLSelectionWidgetWrapper extends SimpleWidgetDataContributor -{ - private WSDLSelectionWidget wsdlSelectionWidget; - private IProject project; - private String componentName; - - public WSDLSelectionWidgetWrapper() - { - } - - public WidgetDataEvents addControls(Composite parent, Listener statusListener) - { - wsdlSelectionWidget = new WSDLSelectionWidget(); - wsdlSelectionWidget.addControls(parent, statusListener); - return this; - } - - public IStatus getStatus() - { - return wsdlSelectionWidget.getStatus(); - } - - public void setWebServiceURI(String wsUri) - { - IStructuredSelection sel; - if (wsUri != null) - sel = new StructuredSelection(wsUri); - else - sel = new StructuredSelection(); - wsdlSelectionWidget.setInitialSelection(sel); - } - - public String getWebServiceURI() - { - IStructuredSelection sel = wsdlSelectionWidget.getObjectSelection(); - Object object = sel.getFirstElement(); - String result = null; - - if (object != null ) - { - if( object instanceof WSDLSelectionWrapper ) - { - // Get at the inner structured selection object. - WSDLSelectionWrapper wrapper = (WSDLSelectionWrapper)object; - IStructuredSelection innerSelection = wrapper.wsdlSelection; - Object innerObject = innerSelection.getFirstElement(); - - result = innerObject == null ? null : innerObject.toString(); - } - else - { - result = object.toString(); - } - } - - return result; - } - - public String getWsdlURI() - { - return getWebServiceURI(); - } - - public WebServicesParser getWebServicesParser() - { - return wsdlSelectionWidget.getWebServicesParser(); - } - - public void setProject(IProject project) - { - this.project = project; - } - - public IProject getProject() - { - IProject p = wsdlSelectionWidget.getProject(); - if (p==null) - { - return project; - } - else - return p; - } - - public String getComponentName() - { - String cname = wsdlSelectionWidget.getComponentName(); - if (cname==null) - { - return componentName; - } - else - return cname; - } - - public void setComponentName(String componentName) - { - this.componentName = componentName; - } - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java deleted file mode 100644 index 16a218c66..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java +++ /dev/null @@ -1,109 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.LabelsAndIds; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - - -public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor -{ - /*CONTEXT_ID PWPR0013 for the Wizard Scenario Client group of the Project Page*/ - private String INFOPOP_PWPR_GROUP_SCENARIO_CLIENT = "PWPR0013"; - - /*CONTEXT_ID PWPR0014 for the Web Service Client Type combo box of the Project Page*/ - private String INFOPOP_PWPR_COMBO_CLIENTTYPE = "PWPR0014"; - private Combo clientTypeCombo_; - - private TypeRuntimeServer ids_; - private LabelsAndIds labelIds_; - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener) - */ - public WidgetDataEvents addControls( Composite parent, Listener statusListener) - { - String pluginId = "org.eclipse.jst.ws.consumption.ui"; - UIUtils utils = new UIUtils( pluginId ); - - Group clientGroup = utils.createGroup( parent, - ConsumptionUIMessages.GROUP_SCENARIO_CLIENT, - ConsumptionUIMessages.TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT, - INFOPOP_PWPR_GROUP_SCENARIO_CLIENT, - 2, 10, 10 ); - - - int comboStyle = SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY; - clientTypeCombo_ = utils.createCombo( clientGroup, - ConsumptionUIMessages.LABEL_WEBSERVICECLIENTTYPE, - ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_CLIENTTYPE, - INFOPOP_PWPR_COMBO_CLIENTTYPE, - comboStyle ); - - - - return this; - } - - public void enableWidget( boolean enable ) - { - clientTypeCombo_.setEnabled( enable ); - } - - public void setTypeRuntimeServer( TypeRuntimeServer ids ) - { - // rskreg - //WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance(); - //LabelsAndIds labelIds = registry.getClientTypeLabels(); - LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2.getClientTypeLabels(); - int selection = 0; - String[] clientIds = labelIds.getIds_(); - String selectedId = ids.getTypeId(); - - // rskreg - clientTypeCombo_.setItems( labelIds.getLabels_() ); - - // Now find the selected one. - for( int index = 0; index < clientIds.length; index++ ) - { - if( selectedId.equals( clientIds[index ]) ) - { - selection = index; - break; - } - } - - clientTypeCombo_.select( selection ); - ids_ = ids; - labelIds_ = labelIds; - } - - public TypeRuntimeServer getTypeRuntimeServer() - { - int selectionIndex = clientTypeCombo_.getSelectionIndex(); - - ids_.setTypeId( labelIds_.getIds_()[selectionIndex] ); - - return ids_; - } - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java deleted file mode 100644 index 1505785e3..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java +++ /dev/null @@ -1,409 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.binding; - -import org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand; -import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.command.CheckForServiceProjectCommand; -import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer; -import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment; -import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment; -import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.CheckWSDLValidationCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetWrapper; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; -import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment; -import org.eclipse.wst.ws.internal.extensions.DeployClientFragment; -import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment; -import org.eclipse.wst.ws.internal.extensions.InstallClientFragment; -import org.eclipse.wst.ws.internal.extensions.RunClientFragment; - - -public class ClientWidgetBinding implements CommandWidgetBinding -{ - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create() - */ - public CommandFragmentFactory create() - { - return new CommandFragmentFactory() - { - public CommandFragment create() - { - return new ClientRootCommandFragment(); - } - }; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) - { - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - // Before ClientWizardWidget - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class); - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidget.class ); - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidget.class); - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidget.class ); - - // After ClientWizardWidget - dataRegistry.addMapping(ClientWizardWidget.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ClientWizardWidget.class, "TestService", ClientWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ClientWizardWidget.class, "MonitorService", ClientWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ClientWizardWidget.class, "ResourceContext", ClientWizardWidgetOutputCommand.class); - - // Before ClientRuntimeSelectionWidget - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidget.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientRuntimeSelectionWidget.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientRuntimeSelectionWidget.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientRuntimeSelectionWidget.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientRuntimeSelectionWidget.class, "J2EEVersion", null); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientRuntimeSelectionWidget.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientRuntimeSelectionWidget.class,"NeedEAR",null); - - // After ClientRuntimeSelectionWidget - dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "J2EEVersion", ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", null); - //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class); - - // The ClientRuntimeSelectionWidget can control what client extension comes up. - dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class); - - // Before WSDLSelectionWidgetWrapper - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionWidgetWrapper.class ); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionWidgetWrapper.class ); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionWidgetWrapper.class ); - - // After WSDLSelectionWidgetWrapper - dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WsdlURI", WSDLSelectionOutputCommand.class); - dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WebServicesParser", WSDLSelectionOutputCommand.class); - dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "Project", WSDLSelectionOutputCommand.class); - dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "ComponentName", WSDLSelectionOutputCommand.class); - - // Before Client Test widget. - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class ); - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class ); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class ); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class ); - dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class); - - // After the client test widget - dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "SampleMethods",ClientTestDelegateCommand.class); - - dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class); - dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class); - dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) - { - - widgetRegistry.add( "ClientWizardWidget", - ConsumptionUIMessages.PAGE_TITLE_WS_PROJECT, - ConsumptionUIMessages.PAGE_DESC_WS_PROJECT, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ClientWizardWidget(); - } - } ); - - widgetRegistry.add( "ClientRuntimeSelectionWidget", - ConsumptionUIMessages.PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION, - ConsumptionUIMessages.PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ClientRuntimeSelectionWidget(); - } - } ); - - widgetRegistry.add( "WSDLSelectionWidgetWrapper", - ConsumptionUIMessages.PAGE_TITLE_WS_SELECTION, - ConsumptionUIMessages.PAGE_DESC_WS_SELECTION, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new WSDLSelectionWidgetWrapper(); - } - } ); - - widgetRegistry.add( "ClientTestWidget", - ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE, - ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ClientTestWidget(); - } - }); - } - - private class ClientRootCommandFragment extends SequenceFragment - { - public ClientRootCommandFragment() - { - add( new SimpleFragment( new ScenarioCleanupCommand(), "" )); - - //add( new SimpleFragment( new CheckForMissingFiles(), "" ) ); - add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) ); - add( new SimpleFragment( "ClientWizardWidget" ) ); - //add( new TestCommandFactoryFragment() ); - add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" )); - add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), "")); - add( new SimpleFragment( "WSDLSelectionWidgetWrapper" ) ); - add( new SimpleFragment( new WSDLSelectionOutputCommand(), "")); - add( new SimpleFragment( new CheckWSDLValidationCommand(), "")); - add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), "")); - //add( new TestCommandFactoryFragment2() ); - add( new SimpleFragment( "ClientRuntimeSelectionWidget" ) ); - //add( new SimpleFragment( new CheckForServiceProjectCommand(), "")); - add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), "")); - //add(new SimpleFragment(new ClientServerDeployableConfigCommand(false), "")); //Note: added here for client - //add( new ClientExtensionFragment() ); - add( new ClientRootFragment() ); - add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) ); - add( new SimpleFragment(new GetMonitorCommand(), "")); - add( new SimpleFragment(new TestDefaultingFragment(),"")); - add( new ClientTestFragment( "ClientTestWidget") ); - add(new FinishFragment()); - - add( new SimpleFragment( new ScenarioCleanupCommand(), "" )); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - //Map SelectionCommand - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "InitialInitialSelection", null); - - // Map ClientWizardWidgetDefaultingCommand command. - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class); - - // Map ClientWizardWidgetOutputCommand command. - dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", WSDLSelectionOutputCommand.class); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "MonitorService", GetMonitorCommand.class); - - // Map ClientRuntimeSelectionWidgetDefaultingCommand command - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", CheckForServiceProjectCommand.class); - - // Map WSDLSelectionWidgetDefaultingCommand command. - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class ); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionOutputCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer()); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionOutputCommand.class); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionOutputCommand.class); - - // WSDLSelectionOutputCommand - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", GetMonitorCommand.class); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", GetMonitorCommand.class); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class); - //dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "ComponentName", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class); - dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class); - - // Setup the PreClientDevelopCommand. - // - dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class); - dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class); - // - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null ); - dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class ); - - dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null ); - - // Map ClientExtensionDefaultingCommand command. - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class); - - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class); - - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class ); - - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class,"ClientEarComponentName", null); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class); - - // Map ClientExtensionOutputCommand command. - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class); - - - // GetMonitorCommand - dataRegistry.addMapping(GetMonitorCommand.class, "Endpoints", ClientTestDelegateCommand.class); - - // MAP post server config call - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null); - - // Map WebServiceClientTestArrivalCommand command. - dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "TestFacility",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class); - - - //Mappings to enable peek-ahead for Page 3 of the client wizard - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DevelopClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DevelopClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DevelopClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DevelopClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Project", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Module", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "EarProject", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "Ear", null ); - - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", AssembleClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", AssembleClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", AssembleClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", AssembleClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Project", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Module", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "EarProject", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "Ear", null ); - - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DeployClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DeployClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DeployClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DeployClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Project", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Module", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "EarProject", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "Ear", null ); - - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", InstallClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", InstallClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", InstallClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", InstallClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Project", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Module", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "EarProject", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "Ear", null ); - - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", RunClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", RunClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", RunClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", RunClientFragment.class ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Project", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Module", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "EarProject", null ); - dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "Ear", null ); - } - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java deleted file mode 100644 index 47f60da7a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java +++ /dev/null @@ -1,136 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.binding; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand; -import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; - - -/** - * - * Handler Configuration Window - Preferences - Java - Code Generation - Code - * and Comments - */ -public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding -{ - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) { - - widgetRegistry.add("ConfigClientHandlersTableWidget", - ConsumptionUIMessages.PAGE_TITLE_CLIENT_HDLR_CONFIG, - ConsumptionUIMessages.PAGE_DESC_CLIENT_HDLR_CONFIG, - new WidgetContributorFactory() { - - public WidgetContributor create() { - return new ConfigClientHandlersTableWidget(); - } - }); - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) { - - -// dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"AllHandlers", ConfigClientHandlersTableWidget.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"Handlers", ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", null); - - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigClientHandlersTableWidget.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"RefNameToServiceRef", ConfigClientHandlersTableWidget.class); - - //dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"AllHandlersList", ClientHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class,"HandlersTable",null); - - dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null); - dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null); - dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class); - - dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class); - dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class); - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) { - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create() - */ - public CommandFragmentFactory create() { - return new CommandFragmentFactory() { - - public CommandFragment create() { - - return new ClientHandlersConfigCommandFragment(); - } - }; - } - - private class ClientHandlersConfigCommandFragment extends SequenceFragment{ - - public ClientHandlersConfigCommandFragment() - { - add( new SimpleFragment( new ClientHandlersWidgetDefaultingCommand(), "" )); - add( new SimpleFragment( "ConfigClientHandlersTableWidget" ) ); - add( new SimpleFragment( new ClientHandlersWidgetOutputCommand(), "" )); - add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), "")); - add( new SimpleFragment( new OpenJavaEditorCommand(), "")); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class); - - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class); - } - - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java deleted file mode 100644 index 94654e13c..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java +++ /dev/null @@ -1,136 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.binding; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand; -import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; - - -/** - * - * Handler Configuration Window - Preferences - Java - Code Generation - Code - * and Comments - */ -public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding { - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) { - - widgetRegistry.add("ConfigServiceHandlersTableWidget", - ConsumptionUIMessages.PAGE_TITLE_SERVICE_HDLR_CONFIG, - ConsumptionUIMessages.PAGE_DESC_SERVICE_HDLR_CONFIG, - new WidgetContributorFactory() { - - public WidgetContributor create() { - return new ConfigServiceHandlersTableWidget(); - } - }); - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) { - - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"WsRefsToHandlers", ConfigServiceHandlersTableWidget.class); - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class); - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigServiceHandlersTableWidget.class); - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class); - - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class); - - - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlersList", ServiceHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class); - - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null); - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null); - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class); - - dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class); - dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class); - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) { - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create() - */ - public CommandFragmentFactory create() { - return new CommandFragmentFactory() { - - public CommandFragment create() { - - return new ServiceHandlersConfigCommandFragment(); - } - }; - } - - private class ServiceHandlersConfigCommandFragment extends SequenceFragment{ - - public ServiceHandlersConfigCommandFragment() - { - add( new SimpleFragment( new ServiceHandlersWidgetDefaultingCommand(), "" )); - add( new SimpleFragment( "ConfigServiceHandlersTableWidget" ) ); - add( new SimpleFragment( new ServiceHandlersWidgetOutputCommand(), "" )); - add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), "")); - add( new SimpleFragment( new OpenJavaEditorCommand(), "")); - - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class); - - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class); - - - } - - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java deleted file mode 100644 index d3f1dea5a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java +++ /dev/null @@ -1,243 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.binding; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.HandlersDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand; -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; - - -public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding { - - - public ConfigureHandlersWidgetBinding() { - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create() - */ - public CommandFragmentFactory create() { - return new CommandFragmentFactory() { - - public CommandFragment create() { - return new HandlersCommandFragment(); - } - }; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) { - } - - /* - * (non-Javadoc), - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) { - - // Map client-side widgets to commands - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "Handlers", ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", null); - - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigClientHandlersTableWidget.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigClientHandlersTableWidget.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ServiceRefName", ConfigClientHandlersTableWidget.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "RefNameToServiceRef", ConfigClientHandlersTableWidget.class); - - dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class, "HandlersTable", null); - - dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null); - dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null); - dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class); - - // Map service-side widgets to commands - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsRefsToHandlers", ConfigServiceHandlersTableWidget.class); - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class); - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigServiceHandlersTableWidget.class); - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class); - - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "DescriptionName", ConfigServiceHandlersTableWidget.class); - - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlersList", ServiceHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class); - - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null); - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null); - dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class); - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) { - - widgetRegistry.add("ConfigServiceHandlersTableWidget", ConsumptionUIMessages.PAGE_TITLE_SERVICE_HDLR_CONFIG, - ConsumptionUIMessages.PAGE_DESC_SERVICE_HDLR_CONFIG, new WidgetContributorFactory() { - - public WidgetContributor create() { - return new ConfigServiceHandlersTableWidget(); - } - }); - - widgetRegistry.add("ConfigClientHandlersTableWidget", ConsumptionUIMessages.PAGE_TITLE_CLIENT_HDLR_CONFIG, - ConsumptionUIMessages.PAGE_DESC_CLIENT_HDLR_CONFIG, new WidgetContributorFactory() { - - public WidgetContributor create() { - return new ConfigClientHandlersTableWidget(); - } - }); - - } - - private class HandlersCommandFragment extends SequenceFragment { - - public HandlersCommandFragment() { - - add(new SimpleFragment(new HandlersDefaultingCommand(), "")); - - add(new ServiceHandlersFragment()); - add(new ClientHandlersFragment()); - } - - public void registerDataMappings(DataMappingRegistry dataRegistry) { - - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", HandlersDefaultingCommand.class); - - dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsClientHandler", ClientHandlersFragment.class, "ClientHandlersEnabled", null); - dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsServiceHandler", ServiceHandlersFragment.class, "ServiceHandlersEnabled", null); - - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class); - - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class); - - } - - public void registerCanFinish(CanFinishRegistry canFinishRegistry) { - } - } - - private class ClientHandlersFragment extends BooleanFragment { - - boolean isClient_ = false; - - public ClientHandlersFragment() { - setCondition(new Condition() { - - public boolean evaluate() { - return isClient_; - } - }); - - SequenceFragment clientHandlersRootFragment = new SequenceFragment(); - - clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetDefaultingCommand(), "")); - - clientHandlersRootFragment.add(new SimpleFragment("ConfigClientHandlersTableWidget")); - clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetOutputCommand(), "")); - clientHandlersRootFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), "")); - - setTrueFragment(clientHandlersRootFragment); - } - - public void setClientHandlersEnabled(boolean isClient) { - isClient_ = isClient; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) { - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class); - - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "WsClientResource", ClientHandlersWidgetOutputCommand.class); - dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ClientProject", ClientHandlersWidgetOutputCommand.class); - - } - - } - - private class ServiceHandlersFragment extends BooleanFragment { - - boolean isService_ = false; - - public ServiceHandlersFragment() { - setCondition(new Condition() { - - public boolean evaluate() { - return isService_; - } - }); - - SequenceFragment serviceHandlersRootFragment = new SequenceFragment(); - serviceHandlersRootFragment.add(new SimpleFragment(new ServiceHandlersWidgetDefaultingCommand(), "")); - - SequenceFragment serviceHandlersFragment = new SequenceFragment(); - serviceHandlersFragment.add(new SimpleFragment("ConfigServiceHandlersTableWidget")); - serviceHandlersFragment.add(new SimpleFragment(new ServiceHandlersWidgetOutputCommand(), "")); - serviceHandlersFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), "")); - - serviceHandlersRootFragment.add(serviceHandlersFragment); - - setTrueFragment(serviceHandlersRootFragment); - } - - public void setServiceHandlersEnabled(boolean isService) { - isService_ = isService; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) { - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class); - - dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class); - - } - - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java deleted file mode 100644 index 0b27abde7..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java +++ /dev/null @@ -1,395 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.binding; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer; -import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer; -import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestWebServiceClient; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.data.Transformer; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; -import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; -import org.eclipse.wst.ws.internal.wsrt.WebServiceState; - - -public class GenSampleWidgetBinding implements CommandWidgetBinding -{ - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create() - */ - public CommandFragmentFactory create() - { - return new CommandFragmentFactory() - { - public CommandFragment create() - { - return new GenSampleRootCommandFragment(); - } - }; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) - { - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - // Before Client Test widget. - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class ); - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class ); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class ); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class ); - dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class); - - // After the client test widget - dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "SampleMethods",ClientTestDelegateCommand.class); - - dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class); - dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class); - dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) - { - - widgetRegistry.add( "ClientTestWidget", - ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE, - ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ClientTestWidget(); - } - }); - } - - private class InitializeProxyCommand extends AbstractDataModelOperation - { - private IStructuredSelection selection_; - private TypeRuntimeServer typeRuntimeServer_; - private String project_; - private String module_; - private String earProject_; - private String ear_; - private IWebServiceClient webServiceClient_; - private String wsdlURI_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - - // Split up the project and module - int index = module_.indexOf("/"); - if (index!=-1){ - project_ = module_.substring(0,index); - module_ = module_.substring(index+1); - } - - if (ear_!=null && ear_.length()>0) - { - int earIndex = ear_.indexOf("/"); - if (earIndex!=-1) { - earProject_ = ear_.substring(0,earIndex); - ear_ = ear_.substring(earIndex+1); - } - } - - WebServiceClientInfo clientInfo = new WebServiceClientInfo(); - clientInfo.setImplURL(getProxyBean()); - //clientInfo.setJ2eeLevel(j2eeLevel_); - clientInfo.setServerFactoryId(typeRuntimeServer_.getServerId()); - clientInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId()); - clientInfo.setState(WebServiceState.UNKNOWN_LITERAL); - clientInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId()); - clientInfo.setWsdlURL(wsdlURI_); - if (clientInfo.getServerInstanceId()==null) - { - CreateServerCommand createServerCommand = new CreateServerCommand(); - createServerCommand.setServerFactoryid(clientInfo.getServerFactoryId()); - createServerCommand.setEnvironment( env ); - IStatus createServerStatus = createServerCommand.execute( null, null ); - if (createServerStatus.getSeverity()==Status.OK){ - clientInfo.setServerInstanceId(createServerCommand.getServerInstanceId()); - } - else if (createServerStatus.getSeverity()==Status.ERROR){ - env.getStatusHandler().reportError( createServerStatus ); - } - - } - - AddModuleToServerCommand command = new AddModuleToServerCommand(); - command.setServerInstanceId(clientInfo.getServerInstanceId()); - if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0) - { - command.setProject(earProject_); - command.setModule(ear_); - } - else - { - command.setProject(project_); - command.setModule(module_); - } - - command.setEnvironment( env ); - status = command.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - } - - webServiceClient_ = new TestWebServiceClient(clientInfo); - return status; - } - - public String getProxyBean() - { - String proxyBean = ""; - - try - { - IResource resource = ResourceUtils.getResourceFromSelection( selection_.getFirstElement() ); - String beanPackage = ResourceUtils.getJavaResourcePackageName( resource.getFullPath() ); - - if( beanPackage==null ) - beanPackage = ""; - else - beanPackage = beanPackage + "."; - - proxyBean = beanPackage + resource.getName(); - - if( proxyBean.toLowerCase().endsWith(".java") || proxyBean.toLowerCase().endsWith(".class")) - { - proxyBean = proxyBean.substring(0,proxyBean.lastIndexOf('.')); - } - } - catch( CoreException exc ) - { - } - - return proxyBean; - } - - public IWebServiceClient getWebServiceClient() - { - return webServiceClient_; - } - - public boolean getGenerateProxy() - { - return true; - } - - public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer ) - { - typeRuntimeServer_ = typeRuntimeServer; - } - - public void setModule( String module ) - { - module_ = module; - } - - public void setModuleType( String moduleType) - { - } - - public void setResourceContext( ResourceContext resourceContext ) - { - } - - public void setInitialSelection( IStructuredSelection selection ) - { - selection_ = selection; - } - } - - private class GenSampleRootCommandFragment extends SequenceFragment - { - public GenSampleRootCommandFragment() - { - add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) ); - add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" )); - add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), "")); - add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), "")); - add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), "")); - add( new SimpleFragment( new InitializeProxyCommand(), "" )); - add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) ); - add( new SimpleFragment( new TestDefaultingFragment(),"")); - add( new ClientTestFragment( "ClientTestWidget") ); - add( new FinishFragment() ); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - //Map SelectionCommand - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null); - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", InitializeProxyCommand.class ); - - // Map ClientWizardWidgetDefaultingCommand command. - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class, "TestService", new ForceTrue() ); - dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class); - - // Map ClientWizardWidgetOutputCommand command. - dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class); - - // Map ClientRuntimeSelectionWidgetDefaultingCommand command - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class); - - // Map WSDLSelectionWidgetDefaultingCommand command. - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class ); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientExtensionDefaultingCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer()); - - // Map ClientExtensionDefaultingCommand command. - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class); - - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class); - - - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class ); - - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class,"ClientEarComponentName",null); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ServiceServerInstanceId", FinishDefaultCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class); - - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", InitializeProxyCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", InitializeProxyCommand.class); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", InitializeProxyCommand.class, "Module", null ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", InitializeProxyCommand.class, "ModuleType", null); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", InitializeProxyCommand.class, "Ear", null ); - dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", InitializeProxyCommand.class); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", InitializeProxyCommand.class ); - - - - - // Map InitializeProxyCommand command. - dataRegistry.addMapping(InitializeProxyCommand.class, "WebServiceClient", ClientExtensionOutputCommand.class); - dataRegistry.addMapping(InitializeProxyCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class); - - // Map ClientExtensionOutputCommand command. - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class); - - // MAP post server config call - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EARProjectName", new StringToIProjectTransformer()); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null); - - - // Map WebServiceClientTestArrivalCommand command. - dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "TestFacility",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class); - - - } - } - - private class ForceTrue implements Transformer - { - public Object transform(Object value) - { - return new Boolean(true); - } - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java deleted file mode 100644 index fc1c3122a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.binding; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ImportWSILWidget; -import org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; - - -public class ImportWSILWidgetBinding implements CommandWidgetBinding -{ - public ImportWSILWidgetBinding() - { - } - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create() - */ - public CommandFragmentFactory create() - { - return new CommandFragmentFactory() - { - public CommandFragment create() - { - SequenceFragment root = new SequenceFragment(); - root.add(new SimpleFragment("ImportWSILWidget")); - root.add(new SimpleFragment(new AddWSDLToWSILWrapperCommand(), "")); - return root; - } - }; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) - { - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - // ImportWSILWidget - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ImportWSILWidget.class); - - // AddWSDLToWSILWrapperCommand - dataRegistry.addMapping(ImportWSILWidget.class, "GenWSILArguments", AddWSDLToWSILWrapperCommand.class, "Args", null); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) - { - - widgetRegistry.add("ImportWSILWidget", - ConsumptionUIMessages.TITLE_WSIL_IMPORT, - ConsumptionUIMessages.DESC_WSIL_IMPORT, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ImportWSILWidget(); - } - } - ); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java deleted file mode 100644 index c041a00fa..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.binding; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; -import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; - - -public class ImportWSWidgetBinding implements CommandWidgetBinding -{ - private CanFinishRegistry canFinishRegistry; - private WidgetRegistry widgetRegistry; - private DataMappingRegistry dataMappingRegistry; - private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag; - - public ImportWSWidgetBinding() - { - publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment(); - } - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create() - */ - public CommandFragmentFactory create() - { - return new CommandFragmentFactory() - { - public CommandFragment create() - { - SequenceFragment root = new SequenceFragment(); - root.add(new SimpleFragment("WSImport")); - root.add(publishToPrivateUDDICmdFrag); - root.add(new SimpleFragment(new WSExplorerLauncherCommand(), "")); - return root; - } - }; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) - { - this.canFinishRegistry = canFinishRegistry; - publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - this.dataMappingRegistry = dataRegistry; - publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry); - - // PublishToPrivateUDDICommandFragment - dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class); - - // LaunchWebServicesExplorerCommand - dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class); - dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) - { - this.widgetRegistry = widgetRegistry; - publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry); - - widgetRegistry.add("WSImport", - ConsumptionUIMessages.PAGE_TITLE_WS_FIND, - ConsumptionUIMessages.PAGE_DESC_WS_FIND, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new PublishWSWidget(false); - } - } - ); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java deleted file mode 100644 index 818385057..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java +++ /dev/null @@ -1,442 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.extensions; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - - -public class ClientExtensionDefaultingCommand extends AbstractDataModelOperation -{ - // ClientWizardWidget - private TypeRuntimeServer clientIds_; - private String clientRuntimeId_; - private Boolean testService; - private ResourceContext resourceContext; - - // ClientRuntimeSelectionWidget - //private SelectionListChoices clientChoices_; - private String clientProjectName_; - private String clientEarProjectName_; - //private String clientComponentName_; - //private String clientEarComponentName_; - private String clientComponentType_; - //private String j2eeVersion; - private boolean clientNeedEAR_; - - private String serviceServerFactoryId_; - private String serviceServerInstanceId_; - - // WSDLSelectionWidget - private boolean genWSIL; - private String wsilURI; - - // WSDLSelectionConditionCommand - private WebServicesParser webServicesParser; - - // WSDLSelectionTreeWidget - private String wsdlURI; - - private boolean isClientScenario_; - private boolean genProxy_ = true; - private String launchedServiceTestName; - - //ServerDeployableConfigurationCommand - private String serverInstId_; - - public ClientExtensionDefaultingCommand( boolean isClientScenario ) - { - isClientScenario_ = isClientScenario; - } - - /** - * - * @return returns true if this command is running in the client wizard and - * false if this command is running in the create web service wizard. - */ - public boolean getIsClientScenario() - { - return isClientScenario_; - } - - /* - public void setRuntime2ClientTypes( SelectionListChoices choices ) - { - clientChoices_ = choices; - } - - - public SelectionListChoices getRuntime2ClientTypes() - { - return clientChoices_; - } - */ - - public void setClientTypeRuntimeServer(TypeRuntimeServer ids) - { - clientIds_ = ids; - } - - public TypeRuntimeServer getClientTypeRuntimeServer() - { - if (clientIds_.getServerInstanceId()==null || clientIds_.getServerInstanceId().length()==0) - { - //Set the instance id from the service side if the factory ids match - if (serviceServerInstanceId_!=null && serviceServerInstanceId_.length()>0) - { - if (serviceServerFactoryId_!=null && serviceServerFactoryId_.length()>0) - { - if (serviceServerFactoryId_.equals(clientIds_.getServerId())) - { - clientIds_.setServerInstanceId(serviceServerInstanceId_); - } - } - } - } - return clientIds_; - } - - public void setClientRuntimeId(String id) - { - clientRuntimeId_ = id; - } - - public String getClientRuntimeId() - { - return clientRuntimeId_; - } - - public void setServiceExistingServerInstId(String serverInstId) { - this.serverInstId_ = serverInstId; - } - - public String getServiceExistingServerInstId(){ - return this.serverInstId_; - } - - /** - * @return Returns the clientIsExistingServer. - */ - public boolean isClientIsExistingServer() - { - return clientIds_.getServerInstanceId() != null; - } - - /** - * @return Returns the clientProject. - */ - public String getClientProject() - { - //return clientProjectName_ + "/" + clientComponentName_; - return clientProjectName_ + "/" + clientProjectName_; - } - - /** - * @return Returns the clientProjectEAR. - */ - public String getClientProjectEAR() - { - if (clientEarProjectName_!=null && clientEarProjectName_.length()>0) - { - //return clientEarProjectName_ + "/" + clientEarComponentName_; - return clientEarProjectName_ + "/" + clientEarProjectName_; - } - else - { - return ""; - } - } - - /* - private String getModuleProjectName( String projectName ) - { - String result = ""; - - if( projectName != null && !projectName.equals("") ) - { - IPath projectPath = new Path( projectName ); - IProject project = (IProject)ResourceUtils.findResource( projectPath ); - String moduleName = J2EEUtils.getFirstWebModuleName( project ); - - result = projectName + "/" + moduleName; - } - - return result; - } - */ - /** - * @return Returns the clientProjectType. - */ - - public String getClientProjectType() - { - //return clientChoices_.getChoice().getList().getSelection(); - return clientComponentType_; - } - - /** - * @return Returns the clientRuntime. - */ - public String getClientRuntime() - { - return clientIds_.getRuntimeId(); - } - - /** - * @return Returns the clientServer. - */ - public String getClientServer() - { - return clientIds_.getServerId(); - } - - public String getClientServerInstance() - { - return clientIds_.getServerInstanceId(); - } - - public void setClientExistingServerInstanceId(String serverInstId){ - - if (clientIds_.getServerInstanceId()==null) - clientIds_.setServerInstanceId(serverInstId); - } - - /** - * @return Returns the genWSIL. - */ - public boolean isGenWSIL() - { - return genWSIL; - } - - /** - * @param genWSIL - * The genWSIL to set. - */ - public void setGenWSIL(boolean genWSIL) - { - this.genWSIL = genWSIL; - } - - /** - * @return Returns the resourceContext. - */ - public ResourceContext getResourceContext() - { - return resourceContext; - } - - /** - * @param resourceContext - * The resourceContext to set. - */ - public void setResourceContext(ResourceContext resourceContext) - { - this.resourceContext = resourceContext; - } - - /** - * @return Returns the testProxySelected. - */ - public Boolean getTestService() - { - return testService; - } - - /** - * @param testProxySelected - * The testProxySelected to set. - */ - public void setTestService(Boolean testService) - { - this.testService = testService; - } - - /** - * @return Returns the wsdlURI. - */ - public String getWsdlURI() - { - return wsdlURI; - } - - /** - * @param wsdlURI - * The wsdlURI to set. - */ - public void setWsdlURI(String wsdlURI) - { - this.wsdlURI = wsdlURI; - } - - /** - * @return Returns the wsilURI. - */ - public String getWsilURI() - { - return wsilURI; - } - - /** - * @param wsilURI - * The wsilURI to set. - */ - public void setWsilURI(String wsilURI) - { - this.wsilURI = wsilURI; - } - - /** - * @return Returns the webServicesParser. - */ - public WebServicesParser getWebServicesParser() - { - if (webServicesParser != null) - return webServicesParser; - else - return new WebServicesParserExt(); - } - - /** - * @param webServicesParser - * The webServicesParser to set. - */ - public void setWebServicesParser(WebServicesParser webServicesParser) - { - this.webServicesParser = webServicesParser; - } - - /** - * @return Returns the j2eeVersion. - */ - public String getClientJ2EEVersion() - { - return "14"; //rm j2ee - } - - /** - * @param version The j2eeVersion to set. - */ - /* - public void setClientJ2EEVersion(String version) - { - j2eeVersion = version; - } - */ - /** - * - * @return returns true if a proxy should be generated and false otherwise. - */ - public boolean getGenerateProxy() - { - return genProxy_; - } - - public void setGenerateProxy( boolean genProxy ) - { - genProxy_ = genProxy; - } - - public void setLaunchedServiceTestName(String launchedServiceTestName) - { - this.launchedServiceTestName = launchedServiceTestName; - } - - /** - * - * @return returns the name of the test facility to launch. - */ - public String getLaunchedServiceTestName() - { - return launchedServiceTestName; - } - - /** - * - * @return returns true if the client project needs an EAR project. - */ - public boolean getClientNeedEAR() - { - return clientNeedEAR_; - } - - public void setClientNeedEAR(boolean clientNeedEAR) - { - clientNeedEAR_ = clientNeedEAR; - } - - - public void setClientComponentType(String clientComponentType) - { - this.clientComponentType_ = clientComponentType; - } - - public void setClientProjectName(String clientProjectName) - { - this.clientProjectName_ = clientProjectName; - } - - /* - public void setClientComponentName(String clientComponentName) - { - this.clientComponentName_ = clientComponentName; - } - */ - - public void setClientEarProjectName(String clientEarProjectName) - { - this.clientEarProjectName_ = clientEarProjectName; - } - - /* - public void setClientEarComponentName(String clientEarComponentName) - { - this.clientEarComponentName_ = clientEarComponentName; - } - */ - - public String getClientEarProjectName() - { - return clientEarProjectName_; - } - - /* - public String getClientEarComponentName() - { - return clientEarComponentName_; - } - */ - - public void setServiceServerFactoryId(String id) - { - serviceServerFactoryId_ = id; - } - - public void setServiceServerInstanceId(String id) - { - serviceServerInstanceId_ = id; - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } - - -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java deleted file mode 100644 index 7fcd8b265..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.extensions; - -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment; - - -public class ClientExtensionFragment extends ExtensionFragment -{ - public ClientExtensionFragment() - { - } - - protected ClientExtensionFragment( ClientExtensionFragment fragment ) - { - super( fragment ); - } - - public void setClientTypeRuntimeServer( TypeRuntimeServer ids ) - { - setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } ); - } - - /* (non-Javadoc) - * @see java.lang.Object#clone() - */ - public Object clone() - { - return new ClientExtensionFragment( this ); - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java deleted file mode 100644 index 5923a9f98..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.extensions; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; - -public class ClientExtensionOutputCommand extends AbstractDataModelOperation -{ - private IWebServiceClient webServiceClient_; - - /** - * @return Returns the proxyBean. - */ - - public String getProxyBean() - { - return webServiceClient_.getWebServiceClientInfo().getImplURL(); - } - - public boolean getGenerateProxy() - { - return true; - } - - /** - * @return Returns the setEndpointMethod. - */ - public String getSetEndpointMethod() - { - return "setEndpoint"; - } - - public void setWebServiceClient(IWebServiceClient wsc) - { - webServiceClient_ = wsc; - } - - public String getServerInstanceId() - { - return webServiceClient_.getWebServiceClientInfo().getServerInstanceId(); - } - - public String getServerFactoryId() - { - return webServiceClient_.getWebServiceClientInfo().getServerFactoryId(); - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java deleted file mode 100644 index e4c064189..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java +++ /dev/null @@ -1,268 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.extensions; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - - -public class ServerExtensionDefaultingCommand extends AbstractDataModelOperation -{ - private Boolean startService; - private Boolean testService; - private Boolean publishService; - private TypeRuntimeServer serviceIds_; - private String serviceRuntimeId_; - //private SelectionListChoices serviceChoices_; - private String serviceProjectName_; - private String serviceEarProjectName_; - private String serviceComponentType_; - //private String serviceComponentName_; - //private String serviceEarComponentName_; - //private String j2eeVersion; - private boolean serviceNeedEAR_; - private WebServicesParser wsdlParser_; - - - - public void setServiceTypeRuntimeServer(TypeRuntimeServer ids) - { - serviceIds_ = ids; - } - - public void setServiceExistingServerInstanceId(String serverInstId){ - - if (serviceIds_.getServerInstanceId()==null) - serviceIds_.setServerInstanceId(serverInstId); - } - - /** - * - * @return returns the TypeRuntimeService object that the user has selected on - * page 3 of the wizard. - */ - public TypeRuntimeServer getServiceTypeRuntimeServer() - { - return serviceIds_; - } - - public void setServiceRuntimeId(String id) - { - serviceRuntimeId_ = id; - } - - public String getServiceRuntimeId() - { - return serviceRuntimeId_; - } - - /* - public void setServiceProject2EARProject(SelectionListChoices choices) - { - serviceChoices_ = choices; - } - */ - - /** - * @return Returns the publishService. - */ - public Boolean getPublishService() - { - return publishService; - } - - /** - * @param publishService - * The publishService to set. - */ - public void setPublishService(Boolean publishService) - { - this.publishService = publishService; - } - - /** - * @return Returns the serverIsExistingServer. - */ - public boolean getServerIsExistingServer() - { - return serviceIds_.getServerInstanceId() != null; - } - - /** - - * @return Returns the serverInstanceId - */ - public String getServiceServerInstanceId() - { - return serviceIds_.getServerInstanceId(); - } - - /** - * @return Returns the serverProject. - */ - public String getServerProject() - { - return serviceProjectName_ + "/" + serviceProjectName_; - } - - /** - * @return Returns the serverProjectEAR. - */ - public String getServerProjectEAR() - { - if (serviceEarProjectName_!=null && serviceEarProjectName_.length()>0) - { - return serviceEarProjectName_ + "/" + serviceEarProjectName_; - } - else - { - return ""; - } - } - - /** - * @return Returns the serverRuntime. - */ - public String getServerRuntime() - { - return serviceIds_.getRuntimeId(); - } - - /** - * @return Returns the serverServer. - */ - public String getServerServer() - { - return serviceIds_.getServerId(); - } - - /** - * @return Returns the serviceScenarioId. - */ - public String getServiceScenarioId() - { - return serviceIds_.getTypeId(); - } - - /** - * @return Returns the startService. - */ - public Boolean getStartService() - { - return startService; - } - - /** - * @param startService - * The startService to set. - */ - public void setStartService(Boolean startService) - { - this.startService = startService; - } - - /** - * @return Returns the testService. - */ - public Boolean getTestService() - { - return testService; - } - - /** - * @param testService - * The testService to set. - */ - public void setTestService(Boolean testService) - { - this.testService = testService; - } - - public Boolean getPublish() - { - return new Boolean(true); - } - - /** - * @return Returns the j2eeVersion. - */ - public String getServiceJ2EEVersion() - { - return "14"; //rm j2ee - } - - /** - * - * @return returns true if the web service project needs to be in an EAR project. - */ - public boolean getServiceNeedEAR() - { - return serviceNeedEAR_; - } - - public void setServiceNeedEAR(boolean serviceNeedEAR) - { - serviceNeedEAR_ = serviceNeedEAR; - } - - /** - * @return Returns the wsdlParser_. - */ - public WebServicesParser getWebServicesParser() - { - if( wsdlParser_ == null ) - { - wsdlParser_ = new WebServicesParserExt(); - } - - return wsdlParser_; - } - /** - * @param wsdlParser_ The wsdlParser_ to set. - */ - public void setWebServicesParser(WebServicesParser wsdlParser ) - { - wsdlParser_ = wsdlParser; - } - - - public void setServiceProjectName(String serviceProjectName) - { - this.serviceProjectName_ = serviceProjectName; - } - - public void setServiceEarProjectName(String serviceEarProjectName) - { - this.serviceEarProjectName_ = serviceEarProjectName; - } - - public void setServiceComponentType(String type) - { - this.serviceComponentType_ = type; - } - - public String getServiceComponentType() - { - return serviceComponentType_; - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java deleted file mode 100644 index 101cddece..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.extensions; - -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment; - - -public class ServerExtensionFragment extends ExtensionFragment -{ - public ServerExtensionFragment() - { - - } - - protected ServerExtensionFragment( ServerExtensionFragment fragment ) - { - super( fragment ); - } - - public void setServiceTypeRuntimeServer( TypeRuntimeServer ids ) - { - setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } ); - } - - /* (non-Javadoc) - * @see java.lang.Object#clone() - */ - public Object clone() - { - return new ServerExtensionFragment( this ); - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java deleted file mode 100644 index 1d84f039a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java +++ /dev/null @@ -1,115 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.extensions; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.wsrt.IWebService; - -public class ServerExtensionOutputCommand extends AbstractDataModelOperation -{ - //private String wsdlURI_; - private WebServicesParser wsdlParser_; - private IWebService webService_; - - private boolean isWebProjectStartupRequested_ = false; - - - /** - * @return Returns the wsdlURI. - */ - public String getWsdlURI() - { - return webService_.getWebServiceInfo().getWsdlURL(); - } - - /** - * @param wsdlURI - * The wsdlURI to set. - */ - /* - public void setWsdlURI(String wsdlURI) - { - wsdlURI_ = wsdlURI; - } - */ - - public void setWebService(IWebService ws) - { - webService_ = ws; - } - - /** - * @return Returns the wsdlParser_. - */ - public WebServicesParser getWebServicesParser() - { - if( wsdlParser_ == null ) - { - wsdlParser_ = new WebServicesParserExt(); - } - - return wsdlParser_; - } - /** - * @param wsdlParser_ The wsdlParser_ to set. - */ - public void setWebServicesParser(WebServicesParser wsdlParser_) - { - this.wsdlParser_ = wsdlParser_; - } -/** - * @param earProjectName The earProjectName to set. - */ -public void setEarProjectName(String earProjectName) { -} -/** - * @param existingServerId The existingServerId to set. - */ -public void setExistingServerId(String existingServerId) { -} - -/** - * @return Returns the isRestartProjectNeeded. - */ -public boolean getIsWebProjectStartupRequested() { - return isWebProjectStartupRequested_; -} -/** - * @param isRestartProjectNeeded The isRestartProjectNeeded to set. - */ -public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) { - this.isWebProjectStartupRequested_ = isRestartProjectNeeded; -} - -public String getServiceServerFactoryId() -{ - return webService_.getWebServiceInfo().getServerFactoryId(); -} - -public String getServiceServerInstanceId() -{ - return webService_.getWebServiceInfo().getServerInstanceId(); -} - -public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException -{ - return Status.OK_STATUS; -} -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java deleted file mode 100644 index cdb6e3b1f..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; - - -public abstract class AbstractObjectSelectionWidget extends SimpleWidgetDataContributor implements IObjectSelectionWidget -{ - public void setInitialSelection(IStructuredSelection initialSelection) - { - // subclass should override this method - } - - public IStructuredSelection getObjectSelection() - { - // subclass should override this method - return new StructuredSelection(); - } - - public IStatus validateSelection(IStructuredSelection objectSelection) - { - // subclass should override this method - return Status.OK_STATUS; - } - - public IProject getProject() - { - // subclass should override this method - return null; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java deleted file mode 100644 index f6c35a6b0..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.j2ee.ejb.EnterpriseBean; -import org.eclipse.wst.command.internal.env.core.data.Transformer; - -public class EJBSelectionTransformer implements Transformer -{ - - public Object transform(Object value) - { - if (value instanceof IStructuredSelection) - { - Object sel = ((IStructuredSelection)value).getFirstElement(); - if (sel instanceof EnterpriseBean) - { - return new StructuredSelection(((EnterpriseBean)sel).getName()); - } - } - return value; - } - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java deleted file mode 100644 index 058f2d8b9..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java +++ /dev/null @@ -1,393 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import java.util.Collections; -import java.util.Iterator; -import java.util.Vector; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.j2ee.ejb.EJBJar; -import org.eclipse.jst.j2ee.ejb.EJBResource; -import org.eclipse.jst.j2ee.ejb.Session; -import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Table; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget -{ - - private Combo earList; - private EJBTableViewer beanList; - private IVirtualComponent[] earComponents; - //rskejb private EARNatureRuntime[] earProjects; - private Integer selectedBeanIndex = null; - private Vector ejbBeanNames; - private Vector ejbComponentNames; - private Vector ejbComponentProjectNames; - //rskejb private Vector ejbProjectNames; - private Listener statusListener_; - /* CONTEXT_ID PEBD0001 for the EAR Projects drop-down box */ - private String INFOPOP_PEBD_EAR_PROJECTS = "org.eclipse.jst.ws.consumption.ui.PEBD0001"; - /* CONTEXT_ID PEBD0002 for the table containing all of the bean names */ - private String INFOPOP_PEBD_TABLE_BEAN_NAMES = "org.eclipse.jst.ws.consumption.ui.PEBD0002"; - - public EJBSelectionWidget() - { - earComponents = J2EEUtils.getAllEARComponents(); - /* rskejb - IProject[] projects = J2EEUtils.getEARProjects(); - - - Vector earVector = new Vector(); - for (int i = 0; i < projects.length; i++) - { - try - { - earVector.add(projects[i].getNature(IEARNatureConstants.NATURE_ID)); - } - catch (CoreException ce) - { - } - } - earProjects = (EARNatureRuntime[]) earVector.toArray(new EARNatureRuntime[0]); - rskejb */ - } - - public String getSelectedBean() - { - if (selectedBeanIndex != null) - { - return (String) (ejbBeanNames.elementAt(selectedBeanIndex.intValue())); - } - return null; - } - - public String getSelectedProject() - { - if (selectedBeanIndex != null) - { - return (String) (ejbComponentProjectNames.elementAt(selectedBeanIndex.intValue())); - } - return null; - } - - public WidgetDataEvents addControls(Composite parent, Listener statusListener) - { - statusListener_ = statusListener; - Composite composite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.marginHeight = 0; - layout.marginWidth = 0; - GridData gd = new GridData(GridData.FILL_BOTH); - composite.setLayout(layout); - composite.setLayoutData(gd); - Composite projectComposite = new Composite(composite, SWT.NONE); - layout = new GridLayout(); - layout.numColumns = 2; - projectComposite.setLayout(layout); - projectComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL)); - new Label(projectComposite, SWT.NULL).setText(ConsumptionUIMessages.LABEL_EAR_PROJECTS); - earList = new Combo(projectComposite, SWT.DROP_DOWN | SWT.READ_ONLY); - earList.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - earList.addSelectionListener(new SelectionAdapter() - { - public void widgetSelected(SelectionEvent evt) - { - Combo widget = (Combo) (evt.widget); - setBeanList(earComponents[widget.getSelectionIndex()]); - selectedBeanIndex = null; - statusListener_.handleEvent(null); - } - }); - addEARNamesToList(); - earList.setToolTipText(ConsumptionUIMessages.TOOLTIP_EAR_PROJECTS); - PlatformUI.getWorkbench().getHelpSystem().setHelp(earList, INFOPOP_PEBD_EAR_PROJECTS); - Group beanComposite = new Group(composite, SWT.NONE); - layout = new GridLayout(); - beanComposite.setLayout(layout); - beanComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL)); - beanComposite.setText(ConsumptionUIMessages.LABEL_EJB_BEAN_NAME); - beanList = new EJBTableViewer(beanComposite); - Table beanTable = beanList.getTable(); - gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL); - gd.heightHint = 100; - beanTable.setLayoutData(gd); - beanTable.addSelectionListener(new SelectionAdapter() - { - public void widgetSelected(SelectionEvent evt) - { - Table table = (Table) (evt.widget); - selectedBeanIndex = new Integer(table.getSelectionIndex()); - statusListener_.handleEvent(null); - } - }); - beanTable.setToolTipText(ConsumptionUIMessages.TOOLTIP_TABLE_BEAN_NAMES); - PlatformUI.getWorkbench().getHelpSystem().setHelp(beanTable, INFOPOP_PEBD_TABLE_BEAN_NAMES); - if (earComponents != null && earComponents.length > 0) - { - setBeanList(earComponents[0]); - } - beanTable.getColumn(0).pack(); - beanTable.getColumn(1).pack(); - // This is a dummy label that forces the status label into the second - // column. - new Label(composite, SWT.NULL).setText(""); - return this; - } - - private void addEARNamesToList() - { - if (earComponents != null && earComponents.length > 0) - { - for (int index = 0; index < earComponents.length; index++) - { - earList.add(earComponents[index].getName()); - } - earList.setText(earList.getItem(0)); - } - } - - private void setBeanList(IVirtualComponent earComponent) - { - IVirtualComponent[] ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject()); - Table beanTable = beanList.getTable(); - beanTable.removeAll(); - ejbBeanNames = new Vector(); - ejbComponentNames = new Vector(); - ejbComponentProjectNames = new Vector(); - for (int index = 0; index < ejbComponentsArray.length; index++) - { - EJBArtifactEdit ejbEdit = null; - try { - ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponentsArray[index]); - EJBResource ejbRes = ejbEdit.getEJBJarXmiResource(); - EJBJar jar = ejbRes.getEJBJar(); - Vector beans = J2EEUtils.getBeanNames(jar); - String componentName = ejbComponentsArray[index].getName(); - String projectName = ejbComponentsArray[index].getProject().getName(); - ejbBeanNames.addAll(beans); - ejbComponentNames.addAll(Collections.nCopies(beans.size(), componentName)); - ejbComponentProjectNames.addAll(Collections.nCopies(beans.size(), projectName)); - } - finally { - if (ejbEdit!=null) - ejbEdit.dispose(); - } - } - beanList.setData(ejbBeanNames, ejbComponentNames); - beanList.setInput(ejbBeanNames); - - } - - /* - * @deprecated - */ - /* - private void setBeanList(EARNatureRuntime earProject) - { - Vector ejbProjects = J2EEUtils.getEJBProjects(earProject); - Table beanTable = beanList.getTable(); - beanTable.removeAll(); - ejbBeanNames = new Vector(); - //rskejb ejbProjectNames = new Vector(); - ejbComponentNames = new Vector(); - ejbComponents = new Vector(); - for (int index = 0; index < ejbProjects.size(); index++) - { - EJBNatureRuntime ejbNature = (EJBNatureRuntime) (ejbProjects.elementAt(index)); - EJBProjectResources ejbResource = new EJBProjectResources(ejbNature.getProject()); - EJBJar jar = ejbResource.getEJBJar(); - Vector beans = J2EEUtils.getBeanNames(jar); - String projectName = ejbNature.getProject().getName(); - ejbBeanNames.addAll(beans); - ejbProjectNames.addAll(Collections.nCopies(beans.size(), projectName)); - ejbResource.cleanup(); - } - beanList.setData(ejbBeanNames, ejbProjectNames); - beanList.setInput(ejbBeanNames); - } - */ - - public void setInitialSelection(IStructuredSelection initialSelection) - { - if (initialSelection != null && !initialSelection.isEmpty()) - { - Object object = initialSelection.getFirstElement(); - if (object instanceof Session) - { - Session session = (Session) object; - EJBJar jar = session.getEjbJar(); - if (jar != null) - { - for (int i = 0; i < earComponents.length; i++) - { - IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject()); - for (int j=0; j <ejbComponents.length; j++) - { - EJBArtifactEdit ejbEdit = null; - try { - ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[j]); - EJBResource ejbRes = ejbEdit.getEJBJarXmiResource(); - if (ejbRes.getEJBJar() == jar) - { - earList.setText(earComponents[i].getName()); - setBeanList(earComponents[i]); - beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))})); - selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName())); - return; - } - - } - finally { - if (ejbEdit!=null) - ejbEdit.dispose(); - } - - } - /* rskejb - Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[i]); - for (Iterator it = ejbProjects.iterator(); it.hasNext();) - { - EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject()); - if (ejbResource.getEJBJar() == jar) - { - earList.setText(earProjects[i].getProject().getName()); - setBeanList(earProjects[i]); - beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))})); - selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName())); - ejbResource.cleanup(); - return; - } - ejbResource.cleanup(); - } - rskejb */ - } - } - } - } - } - - public IStructuredSelection getObjectSelection() - { - IStructuredSelection sel = (IStructuredSelection) beanList.getSelection(); - if (sel != null && !sel.isEmpty()) - { - Object object = sel.getFirstElement(); - if (object instanceof Integer) - { - String selEJBName = (String) ejbBeanNames.get(((Integer) object).intValue()); - if (selEJBName != null) - { - IProject project = earComponents[earList.getSelectionIndex()].getProject(); - IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(project); - for (int i=0; i<ejbComponents.length; i++) - { - EJBArtifactEdit ejbEdit = null; - try - { - ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[i]); - EJBResource ejbRes = ejbEdit.getEJBJarXmiResource(); - EJBJar jar = ejbRes.getEJBJar(); - java.util.List sessions = jar.getSessionBeans(); - for (Iterator it2 = sessions.iterator(); it2.hasNext();) - { - Session session = (Session) it2.next(); - if (selEJBName.equals(session.getName())) - { - return new StructuredSelection(new Session[]{session}); - } - } - } - finally { - if (ejbEdit!=null) - ejbEdit.dispose(); - } - } - /* rskejb - Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[earList.getSelectionIndex()]); - for (Iterator it = ejbProjects.iterator(); it.hasNext();) - { - EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject()); - EJBJar jar = ejbResource.getEJBJar(); - java.util.List sessions = jar.getSessionBeans(); - for (Iterator it2 = sessions.iterator(); it2.hasNext();) - { - Session session = (Session) it2.next(); - if (selEJBName.equals(session.getName())) - { - ejbResource.cleanup(); - return new StructuredSelection(new Session[]{session}); - } - } - ejbResource.cleanup(); - } - rskejb */ - } - } - } - return new StructuredSelection(new Object[0]); - } - - public IProject getProject() - { - String projectName = getSelectedProject(); - if (projectName != null && projectName.length() > 0) - return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - else - return null; - } - - public String getComponentName() - { - if (selectedBeanIndex != null) - { - return (String) (ejbComponentNames.elementAt(selectedBeanIndex.intValue())); - } - return null; - } - - public IStatus validateSelection(IStructuredSelection objectSelection) - { - return Status.OK_STATUS; - } - - public IStatus getStatus() - { - if (selectedBeanIndex == null) - { - return StatusUtils.errorStatus( "" ); - } - - return Status.OK_STATUS; - } - -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java deleted file mode 100644 index 9d17a46e7..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java +++ /dev/null @@ -1,115 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import java.util.Vector; - -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; - -public class EJBTableViewer extends TableViewer -{ - private Vector beanNames; - private Vector projectNames; - - public EJBTableViewer(Composite parent) - { - super(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION); - String columnProperties[] = {ConsumptionUIMessages.TABLE_TITLE_EJB_BEAN_NAMES, ConsumptionUIMessages.TABLE_TITLE_EJB_PROJECT_NAME}; - Table table = getTable(); - table.setHeaderVisible(true); - table.setLinesVisible(true); - TableLayout layout = new TableLayout(); - for (int i = 0; i < columnProperties.length; i++) - { - TableColumn column = new TableColumn(table, i); - column.setText(columnProperties[i]); - column.setAlignment(SWT.LEFT); - layout.addColumnData(new ColumnWeightData(50, 80, true)); - } - table.setLayout(layout); - setColumnProperties(columnProperties); - setContentProvider(new EJBContentProvider()); - setLabelProvider(new EJBLabelProvider()); - } - - public void setData(Vector beanNames, Vector projectNames) - { - this.beanNames = beanNames; - this.projectNames = projectNames; - } - private class EJBLabelProvider extends LabelProvider implements ITableLabelProvider - { - public String getColumnText(Object object, int columnIndex) - { - String result = null; - if (object instanceof Integer) - { - int index = ((Integer) object).intValue(); - if (columnIndex == 0) - { - return (String) (beanNames.elementAt(index)); - } - else if (columnIndex == 1) - { - return (String) (projectNames.elementAt(index)); - } - } - return result; - } - - public Image getColumnImage(Object object, int columnIndex) - { - return null; - } - } - public class EJBContentProvider implements IStructuredContentProvider - { - public Object[] getElements(Object element) - { - if (beanNames != null) - { - int size = beanNames.size(); - Object[] result = new Object[size]; - for (int index = 0; index < size; index++) - { - result[index] = new Integer(index); - } - return result; - } - return null; - } - - public void dispose() - { - } - - public void inputChanged(Viewer viewer, Object old, Object newobj) - { - } - - public boolean isDeleted(Object object) - { - return false; - } - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java deleted file mode 100644 index a7be6f437..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent; - - - -public class HandlerTableItem { - - private String handlerClassName; - private String handlerName; - private String portName; - private int index; - - private PortComponent port; - private Object handler; - private Object wsDescRef; - - /** - * @return Returns the handlerClassName. - */ - public String getHandlerClassName() { - return handlerClassName; - } - /** - * @param handlerClassName The handlerClassName to set. - */ - public void setHandlerClassName(String handlerClassName) { - this.handlerClassName = handlerClassName; - } - /** - * @return Returns the handlerName. - */ - public String getHandlerName() { - return handlerName; - } - /** - * @param handlerName The handlerName to set. - */ - public void setHandlerName(String handlerName) { - this.handlerName = handlerName; - } - /** - * @return Returns the port. - */ - public PortComponent getPort() { - return port; - } - /** - * @param port The port to set. - */ - public void setPort(PortComponent port) { - this.port = port; - } - /** - * @return Returns the handler. - */ - public Object getHandler() { - return handler; - } - /** - * @param handler The handler to set. - */ - public void setHandler(Object handler) { - this.handler = handler; - } - /** - * @return Returns the portName. - */ - public String getPortName() { - return portName; - } - /** - * @param portName The portName to set. - */ - public void setPortName(String portName) { - this.portName = portName; - } - - /** - * @return Returns the index. - */ - public int getIndex() { - return index; - } - /** - * @param index The index to set. - */ - public void setIndex(int index) { - this.index = index; - } - /** - * @return Returns the wsDescRef. - */ - public Object getWsDescRef() { - return wsDescRef; - } - /** - * @param wsDescRef The wsDescRef to set. - */ - public void setWsDescRef(Object wsDescRef) { - this.wsDescRef = wsDescRef; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java deleted file mode 100644 index 1383a1781..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor; - -/** - * This interface defines extra methods that Object Selection Widgets - * need to implement. Object Selection Widgets are displayed on page 2 - * of the Web services wizard. - */ -public interface IObjectSelectionWidget extends WidgetDataContributor -{ - /** - * The framework will call this method to set the initial selection - * value that the user has specified. - * - * @param initialSelection the initial selection the user specified. - */ - public void setInitialSelection(IStructuredSelection initialSelection); - - /** - * The intent of the Object Selection Widget is that the user has - * the opportunity change/find the object that they want to turn into - * a Web service. - * - * @return returns the an IStructuredSelection object that the user - * want to turn into a Web service. This object may be different than - * the initialSelection passed in by the setInitialSelection method. - */ - public IStructuredSelection getObjectSelection(); - - /** - * Validates whether the objectSelection parameter is valid for - * this Object selection widget. An error status should be returned - * if this object is not value. Otherwise, and ok status should be - * returned - * - * @param objectSelection the object to be validated. - * @return the status of the validation. - */ - public IStatus validateSelection(IStructuredSelection objectSelection); - - /** - * - * @return returns the IProject that contains the selection - * object that the user has chosen with this widget. The value can be - * null if there is no IProject for this object. - */ - public IProject getProject(); - - /** - * - * @return returns the name of the IVirtualComponent that contains the selection - * object that the user has chosen with this widget. The value can be - * null if there is no IVirtualComponent for this object - */ - public String getComponentName(); -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java deleted file mode 100644 index 7a9335831..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.wst.command.internal.env.core.data.Transformer; - -public class JavaBeanSelectionTransformer implements Transformer -{ - public Object transform(Object value) - { - if (value instanceof IStructuredSelection) - { - Object sel = ((IStructuredSelection)value).getFirstElement(); - if (sel instanceof IFile) - { - return new StructuredSelection(computeFullyQualifiedJavaName((IFile)sel)); - } - else if (sel instanceof ICompilationUnit) - { - IResource res = ((ICompilationUnit)sel).getResource(); - if (res instanceof IFile) - return new StructuredSelection(computeFullyQualifiedJavaName((IFile)res)); - } - } - return value; - } - - private String computeFullyQualifiedJavaName(IFile resource) - { - IPath path = resource.getFullPath(); - String basename = path.lastSegment(); - String beanClass = ""; - if (basename != null && basename.length() > 0) - { - String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path); - beanClass = (beanPackage == null || beanPackage.length() == 0 ? basename : (beanPackage + "." + basename)); - if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) - beanClass = beanClass.substring(0, beanClass.lastIndexOf('.')); - } - return beanClass; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java deleted file mode 100644 index 22fb63d5f..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java +++ /dev/null @@ -1,276 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink; -import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl; -import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -public class JavaBeanSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget -{ - private IProject serverProject_ = null; - private String serverComponentName_ = null; - private Composite parent_ = null; - private JavaResourceFilter filter_ = new JavaResourceFilter(); - private IResource initialResource_ = null; - private Listener statusListener; - - /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/ - private String INFOPOP_PBCL_PAGE = "PBCL0001"; - - private Text beanClassText_; - /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/ - private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002"; - - private Button beanClassBrowseButton_; - /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/ - private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003"; - - private Button beanResourceBrowseButton_; - /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/ - private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004"; - - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - this.statusListener = statusListener; - UIUtils uiUtils = new UIUtils( pluginId_ ); - - parent_ = parent; - - Composite group = uiUtils.createComposite( parent, 4 ); - - group.setToolTipText( ConsumptionUIMessages.TOOLTIP_PBCL_PAGE ); - PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE ); - - beanClassText_ = uiUtils.createText( group, ConsumptionUIMessages.LABEL_BEAN_CLASS_NAME, - ConsumptionUIMessages.TOOLTIP_PBCL_TEXT_BEAN_CLASS, - INFOPOP_PBCL_TEXT_BEAN_CLASS, - SWT.SINGLE | SWT.BORDER); - beanClassText_.addModifyListener( - new ModifyListener() - { - public void modifyText(ModifyEvent e) - { - handleModifyBeanClassText(); - } - } - ); - - beanClassBrowseButton_ = uiUtils.createPushButton( group, ConsumptionUIMessages.BUTTON_BROWSE_CLASSES, - ConsumptionUIMessages.TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE, - INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE ); - beanClassBrowseButton_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleBrowseClasses(); - } - } ); - - beanResourceBrowseButton_ = uiUtils.createPushButton( group, ConsumptionUIMessages.BUTTON_BROWSE_FILES, - ConsumptionUIMessages.TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE, - INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE ); - beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleBrowseFiles(); - } - } ); - return this; - } - - private void handleModifyBeanClassText() - { - statusListener.handleEvent(null); - serverProject_ = null; - serverComponentName_ = null; - } - - private void handleBrowseClasses() - { - Shell shell = parent_.getShell(); - IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell)); - if (itype != null) - { - beanClassText_.setText(itype.getFullyQualifiedName()); - try - { - IResource res = itype.getCorrespondingResource(); - if (res != null) - { - serverProject_ = res.getProject(); - IVirtualComponent comp = ResourceUtils.getComponentOf(res); - if (comp!=null) - { - serverComponentName_ = comp.getName(); - } - } - else - { - serverProject_ = null; - serverComponentName_ = null; - } - } - catch (JavaModelException jme) - { - serverProject_ = null; - serverComponentName_ = null; - } - } - } - - private void handleBrowseFiles() - { - IResource topResource = ResourceUtils.getWorkspaceRoot(); - IResource resource = DialogUtils.browseResources( parent_.getShell(), topResource, initialResource_, filter_ ); - setBeanClass(resource); - } - - private void setBeanClass(IResource resource) - { - if( resource != null && resource instanceof IFile ) - { - IPath path = resource.getFullPath(); - String basename = path.lastSegment(); - - if( basename != null && basename.length() > 0 ) - { - String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path); - String beanClass = (beanPackage == null || beanPackage.length() == 0 ? basename : (beanPackage + "." + basename)); - - if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) ) - { - beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') ); - } - - beanClassText_.setText(beanClass); - serverProject_ = ResourceUtils.getProjectOf(path); - IVirtualComponent comp = ResourceUtils.getComponentOf(resource); - - if (comp!=null) - { - serverComponentName_ = comp.getName(); - } - - } - } - } - - private void setBeanClass(ServiceImplBeanImpl serviceImpl) - { - if( serviceImpl != null ) - { - EObject eObject = serviceImpl.eContainer(); - if(eObject instanceof PortComponentImpl){ - PortComponentImpl pci = (PortComponentImpl)eObject; - String beanClass = pci.getServiceEndpointInterface(); - beanClassText_.setText(beanClass); - } - } - } - - private void setBeanClass(BeanLink serviceImpl) - { - if( serviceImpl != null ) - { - EObject eObject = serviceImpl.eContainer(); - if(eObject instanceof ServiceImplBeanImpl){ - setBeanClass((ServiceImplBeanImpl)eObject); - } - } - } - - public void setInitialSelection(IStructuredSelection initialSelection) - { - if (initialSelection != null && !initialSelection.isEmpty()) - { - Object object = initialSelection.getFirstElement(); - if (object instanceof IFile) - { - IFile iFile = (IFile)object; - String fileExt = iFile.getFileExtension().toLowerCase(); - if (fileExt.equals("java") || fileExt.equals("class")) - setBeanClass(iFile); - } - else if (object instanceof ICompilationUnit) - setBeanClass(((ICompilationUnit)object).getResource()); - else if (object instanceof ServiceImplBeanImpl) - setBeanClass((ServiceImplBeanImpl)object); - else if(object instanceof BeanLink) - setBeanClass((BeanLink)object); - } - } - - public IStructuredSelection getObjectSelection() - { - return new StructuredSelection(beanClassText_.getText()); - } - - public IProject getProject() - { - return serverProject_; - } - - public String getComponentName() - { - return serverComponentName_; - } - - public IStatus getStatus() - { - String beanClassName = beanClassText_.getText().trim(); - if (beanClassName == null || beanClassName.length() <= 0) - { - return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_BEAN_CANNOT_BE_EMPTY); - } - return Status.OK_STATUS; - } - - public IStatus validateSelection(IStructuredSelection objectSelection) - { - return Status.OK_STATUS; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java deleted file mode 100644 index a889d944a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - - -public class ObjectSelectionFragment extends SequenceFragment implements Condition -{ - private TypeRuntimeServer typeRuntimeServer; - private boolean hasObjectSelectionWidget; - - public ObjectSelectionFragment() - { - super(); - BooleanFragment boolFragment = new BooleanFragment(new SimpleFragment("ObjectSelectionWidget"), new SimpleFragment(""), this); - add(boolFragment); - add(new SimpleFragment(new ObjectSelectionOutputCommand(), "")); - hasObjectSelectionWidget = false; - } - - /** - * This method is called retrieve the data mappings for this command fragment. - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionWidget.class ); - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null); - dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionWidget.class); - dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionOutputCommand.class); - - dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", ObjectSelectionOutputCommand.class); - dataRegistry.addMapping(ObjectSelectionWidget.class, "Project", ObjectSelectionOutputCommand.class); - dataRegistry.addMapping(ObjectSelectionWidget.class, "ComponentName", ObjectSelectionOutputCommand.class); - } - - public boolean evaluate() - { - return hasObjectSelectionWidget; - } - - public TypeRuntimeServer getTypeRuntimeServer() - { - return typeRuntimeServer; - } - - /** - * @param typeRuntimeServer The typeRuntimeServer to set. - */ - public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) - { - this.typeRuntimeServer = typeRuntimeServer; - if (typeRuntimeServer != null) - { - String wst = typeRuntimeServer.getTypeId(); - - int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst); - String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst); - if (scenario == WebServiceScenario.TOPDOWN) - { - //Must have WSDL object selection. No choice. - hasObjectSelectionWidget=true; - } - else - { - WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId); - if (wsimpl!=null) - { - String objectSelectionWidgetId = wsimpl.getObjectSelectionWidget(); - hasObjectSelectionWidget = objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0; - } - } - } - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java deleted file mode 100644 index 3899686a6..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java +++ /dev/null @@ -1,270 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.data.Transformer; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.StatusException; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - - -public class ObjectSelectionOutputCommand extends AbstractDataModelOperation -{ - private String objectSelectionWidgetId_; - private IStructuredSelection objectSelection_; - private IObjectSelectionWidget objectSelectionWidget_; - private IProject project_; - private String componentName_; - private WebServicesParser parser_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - // Transformation - if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0) - { - IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements(); - for (int i = 0; i < elements.length; i++) - { - if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id"))) - { - String transformerId = elements[i].getAttribute("transformer"); - if (transformerId != null && transformerId.length() > 0) - { - try - { - Object transformer = elements[i].createExecutableExtension("transformer"); - if (transformer instanceof Transformer) - { - Object transformedSelection = ((Transformer)transformer).transform(objectSelection_); - if (transformedSelection instanceof IStructuredSelection) - objectSelection_ = (IStructuredSelection)transformedSelection; - } - } - catch (CoreException ce) - { - } - } - } - } - } - - // Validation - IStatus status = (objectSelectionWidget_ != null) ? objectSelectionWidget_.validateSelection(getObjectSelection()) : Status.OK_STATUS; - if (status.getSeverity() != Status.OK) - { - try - { - env.getStatusHandler().report(status); - } - catch (StatusException se) - { - } - } - - return status; - } - - /** - * @param typeRuntimeServer The typeRuntimeServer to set. - */ - public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) - { - if (typeRuntimeServer != null) - { - String wst = typeRuntimeServer.getTypeId(); - - int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst); - String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst); - - WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId); - //IWebServiceType wst = WebServiceRuntimeExtensionUtils2.getWebServiceTypeById(typeRuntimeServer.getTypeId()); - - if (wsimpl != null) - { - String objectSelectionWidgetId = null; - if (scenario == WebServiceScenario.TOPDOWN) - { - objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"; - } - else - { - objectSelectionWidgetId = wsimpl.getObjectSelectionWidget(); - } - - objectSelectionWidgetId_ = objectSelectionWidgetId; - - if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0) - { - IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements(); - for (int i = 0; i < elements.length; i++) - { - if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id"))) - { - try - { - Object object = elements[i].createExecutableExtension("class"); - if (object instanceof IObjectSelectionWidget) - { - objectSelectionWidget_ = (IObjectSelectionWidget)object; - return; - } - } - catch (CoreException ce) - { - } - } - } - } - } - } - } - - /** - * @return Returns the selection. - */ - public IStructuredSelection getObjectSelection() - { - return objectSelection_; - } - /** - * @param selection The selection to set. - */ - public void setObjectSelection(IStructuredSelection objectSelection) - { - objectSelection_ = objectSelection; - - //Set the project if you can - if (project_==null) - { - project_ = getProjectFromObjectSelection(objectSelection); - } - - //Set the componentName if you can - if (componentName_ == null) - { - componentName_ = getComponentNameFromObjectSelection(objectSelection); - } - - // Check if this is a WSDL selection object. If it is we need - // to unwrap it. - if( objectSelection != null && !objectSelection.isEmpty() ) - { - Object object = objectSelection.getFirstElement(); - - if( object instanceof WSDLSelectionWrapper ) - { - WSDLSelectionWrapper wsdlWrapper = (WSDLSelectionWrapper)object; - - objectSelection_ = wsdlWrapper.wsdlSelection; - parser_ = wsdlWrapper.parser; - } - } - } - - public IProject getProject() - { - return project_; - } - - public void setProject(IProject project) - { - this.project_ = project; - } - - public String getComponentName() - { - return componentName_; - } - - public void setComponentName(String componentName) - { - this.componentName_ = componentName; - } - - /** - * @return Returns the parser_. - */ - public WebServicesParser getWebServicesParser() - { - return parser_; - } - - private IProject getProjectFromObjectSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - if (resource==null) - return null; - IProject p = ResourceUtils.getProjectOf(resource.getFullPath()); - return p; - } catch(CoreException e) - { - e.printStackTrace(); - return null; - } - } - } - return null; - } - - private String getComponentNameFromObjectSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - if (resource==null) - return null; - - IVirtualComponent comp = ResourceUtils.getComponentOf(resource); - - if (comp!=null) - { - return comp.getName(); - } - } catch(CoreException e) - { - e.printStackTrace(); - return null; - } - } - } - return null; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java deleted file mode 100644 index 8cdbd641b..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.Platform; - -public class ObjectSelectionRegistry -{ - private static ObjectSelectionRegistry instance; - private static IConfigurationElement[] elements; - - private ObjectSelectionRegistry() - { - elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "objectSelectionWidget"); - } - - public static ObjectSelectionRegistry getInstance() - { - if (instance == null) - instance = new ObjectSelectionRegistry(); - return instance; - } - - public IConfigurationElement[] getConfigurationElements() - { - return elements; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java deleted file mode 100644 index 25a07a015..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java +++ /dev/null @@ -1,233 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - - -public class ObjectSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget -{ - private IConfigurationElement[] elements; - private Composite parent; - private Listener statusListener; - private Composite composite; - private IStructuredSelection initialSelection; - private IProject project; - private String componentName; - private IObjectSelectionWidget child; - - public WidgetDataEvents addControls(Composite parentComposite, Listener statListener) - { - elements = ObjectSelectionRegistry.getInstance().getConfigurationElements(); - this.parent = parentComposite; - this.statusListener = statListener; - composite = null; - return this; - } - - /** - * @param typeRuntimeServer The typeRuntimeServer to set. - */ - public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) - { - if (composite != null) - { - composite.dispose(); - child = null; - } - if (typeRuntimeServer != null) - { - String wst = typeRuntimeServer.getTypeId(); - int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst); - String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst); - WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId); - - //IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId()); - if (wsimpl != null) - { - String objectSelectionWidgetId = null; - if (scenario == WebServiceScenario.TOPDOWN) - { - objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"; - } - else - { - objectSelectionWidgetId = wsimpl.getObjectSelectionWidget(); - } - - if (objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0) - { - for (int i = 0; i < elements.length; i++) - { - if (objectSelectionWidgetId.equals(elements[i].getAttribute("id"))) - { - try - { - Object object = elements[i].createExecutableExtension("class"); - if (object instanceof IObjectSelectionWidget) - { - Control shell = parent.getShell(); - int x = shell.getSize().x; - composite = new Composite(parent, SWT.NONE); - GridLayout gl = new GridLayout(); - gl.marginHeight = 0; - gl.marginWidth = 0; - GridData gd = new GridData(GridData.FILL_BOTH); - composite.setLayout(gl); - composite.setLayoutData(gd); - child = (IObjectSelectionWidget)object; - child.addControls(composite, statusListener); - child.setInitialSelection(initialSelection); - composite.setSize(x-20, composite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y); - parent.setSize(x-10, parent.computeSize(SWT.DEFAULT, SWT.DEFAULT).y); - shell.setSize(x, shell.computeSize(SWT.DEFAULT, SWT.DEFAULT).y); - shell.setRedraw(true); - shell.redraw(); - shell.update(); - return; - } - } - catch (CoreException ce) - { - } - } - } - } - } - } - } - - public IStatus getStatus() - { - return (child != null) ? child.getStatus() : Status.OK_STATUS; - } - - public void setInitialSelection(IStructuredSelection initialSelection) - { - this.initialSelection = initialSelection; - project = getProjectFromInitialSelection(initialSelection); - componentName = getComponentNameFromInitialSelection(initialSelection); - if (child != null) - child.setInitialSelection(initialSelection); - } - - public IStructuredSelection getObjectSelection() - { - return (child != null) ? child.getObjectSelection() : null; - } - - public IStatus validateSelection(IStructuredSelection objectSelection) - { - return (child != null) ? child.validateSelection(objectSelection) : Status.OK_STATUS; - } - - public IProject getProject() - { - if (child != null) - { - IProject p = child.getProject(); - if (p != null) - return p; - else - return project; - } - else - { - return null; - } - } - - public String getComponentName() - { - if (child != null) - { - String cname = child.getComponentName(); - if (cname != null && cname.length()>0) - return cname; - else - return componentName; - } - else - { - return null; - } - - } - - private IProject getProjectFromInitialSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - if (resource==null) - return null; - IProject p = ResourceUtils.getProjectOf(resource.getFullPath()); - return p; - } catch(CoreException e) - { - return null; - } - } - } - return null; - } - - private String getComponentNameFromInitialSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - if (resource==null) - return null; - - IVirtualComponent comp = ResourceUtils.getComponentOf(resource); - if (comp != null) - { - return comp.getName(); - } - } catch(CoreException e) - { - return null; - } - } - } - return null; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java deleted file mode 100644 index 4db0a341c..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import java.util.Calendar; -import org.eclipse.swt.widgets.Display; - -public class Timer extends Thread -{ - private static Timer instance = null; - private final long ONE_SECOND = 1000; - private long refreshTime; - private Display display; - private Runnable runnable; - - private Timer(Display display, Runnable runnable) - { - this.display = display; - this.runnable = runnable; - } - - public synchronized static Timer newInstance(Display display, Runnable runnable) - { - if (instance == null) - instance = new Timer(display, runnable); - return instance; - } - - public synchronized static boolean isRunning() - { - return instance != null; - } - - public synchronized void startTimer() - { - refreshTime = getCurrentTime() + ONE_SECOND; - if (!isAlive()) - this.start(); - } - - private long getCurrentTime() - { - return Calendar.getInstance().getTime().getTime(); - } - - public void run() - { - long currTime = getCurrentTime(); - while (currTime < refreshTime) - { - try - { - sleep(refreshTime - currTime); - } - catch (InterruptedException ie) - { - } - currTime = getCurrentTime(); - } - instance = null; - display.syncExec(runnable); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java deleted file mode 100644 index e27ee08da..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java +++ /dev/null @@ -1,88 +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 - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.ui.widgets.object; - -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.wst.wsdl.validation.internal.IValidationMessage; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLValidator; - - - -public class ValidateWSDLJob extends Job { - - final public static String VALIDATE_WSDL_JOB_FAMILY = "ValidateWSDLJobJamily"; - - private String wsdlURI_ = null; - private IValidationMessage[] validationMessages_ = null; - private int validationMessageSeverity_ = -1; // default value - - public ValidateWSDLJob(String wsdlURI) { - super("ValidateWSDLJob"); - wsdlURI_ = wsdlURI; - } - - protected IStatus run(IProgressMonitor monitor) { - WSDLValidator wsdlValidator = WSDLValidator.getInstance(); - IValidationReport valReport = wsdlValidator.validate(wsdlURI_); - validationMessages_ = valReport.getValidationMessages(); - reportSummary(); - return Status.OK_STATUS; - } - - // calculate the higher severity for all the validation messages - private void reportSummary() { - int i; - int severity; - int errorCount = 0; - int warningCount = 0; - for (i=0; i<validationMessages_.length && errorCount == 0; i++) { - severity = validationMessages_[i].getSeverity(); - switch (severity) { - case IValidationMessage.SEV_ERROR: - errorCount++; - break; - case IValidationMessage.SEV_WARNING: - warningCount++; - break; - default: - break; - } - } - if (errorCount > 0) { - validationMessageSeverity_ = IValidationMessage.SEV_ERROR; - } else if (warningCount > 0) { - validationMessageSeverity_ = IValidationMessage.SEV_WARNING; - } - - } - - public boolean belongsTo(Object family) - { - return family == VALIDATE_WSDL_JOB_FAMILY; - } - - public IValidationMessage[] getValidationMessages() { - return validationMessages_; - } - - public int getValidationMessageSeverity() { - return validationMessageSeverity_; - } - - public String getWsdlURI() { - return wsdlURI_; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java deleted file mode 100644 index 221645b89..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java +++ /dev/null @@ -1,235 +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 - *******************************************************************************/ -package org.eclipse.jst.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.IContentProvider; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.TableItem; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; - - -public class ValidationMessageViewerWidget extends SimpleWidgetDataContributor -{ - private int DEFAULT_TABLE_HEIGHT_HINT = 100; - private TableViewer tableViewer_; - private Table table_; - private String message = null; - static final String columns_[] = {"severity", "line", "column", "message"}; - static final int columnsWidth_[] = {10, 10, 10, 60}; - - - - public ValidationMessageViewerWidget() - { - } - - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - - Composite composite = new Composite(parent, SWT.NONE); - GridLayout gl = new GridLayout(); - - gl.marginHeight = 0; - gl.marginWidth = 0; - composite.setLayout(gl); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - - Label messageLabel = new Label( composite, SWT.WRAP); - messageLabel.setText( ConsumptionUIMessages.LABEL_VALIDATE_MESSAGES); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - messageLabel.setLayoutData(gd); - messageLabel.setToolTipText( ConsumptionUIMessages.TOOLTIP_VALIDATE_TEXT_MESSAGE ); - - table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER); - gd = new GridData(GridData.FILL_BOTH); - gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT; - table_.setLayoutData(gd); - table_.setHeaderVisible(true); - table_.setLinesVisible(true); - table_.setToolTipText(ConsumptionUIMessages.TOOLTIP_TABLE_VALIDATE_MESSAGE ); - TableLayout tableLayout = new TableLayout(); - for (int i = 0; i < columns_.length; i++) - { - TableColumn tableColumn = new TableColumn(table_, SWT.NONE); - tableColumn.setText(columns_[i]); - tableColumn.pack(); - ColumnWeightData columnData = new ColumnWeightData(columnsWidth_[i], columnsWidth_[i], true); - tableLayout.addColumnData(columnData); - } - table_.setLayout(tableLayout); - - tableViewer_ = new TableViewer(table_); - - tableViewer_.setContentProvider(new ListContentProvider()); - tableViewer_.setLabelProvider(new ListLabelProvider()); - - return this; - } - - public void setInput(IValidationMessage[] messages) - { - tableViewer_.setInput(messages); - tableViewer_.refresh(); - } - - public void clearInput() - { - IValidationMessage emptyMessages[] = {}; - this.setInput(emptyMessages); - } - - public IContentProvider getContentProvider() - { - return tableViewer_.getContentProvider(); - } - - public IStatus getStatus() - { - return message == null ? Status.OK_STATUS : - StatusUtils.errorStatus(message ); - } - - public void refresh() - { - tableViewer_.refresh(); - } - - public TableItem[] getItems() - { - //internalRefresh(); - return table_.getItems(); - } - - public void setEnabled(boolean enabled) - { - } - - public void dispose() - { - if (table_ != null) - table_.dispose(); - } - - protected class ListContentProvider implements IStructuredContentProvider - { - public void dispose() - { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) - { - tableViewer_.add(getElements(newInput)); - } - - public Object[] getElements(Object inputElement) - { - if (inputElement instanceof IValidationMessage[]) - { - IValidationMessage[] valMessages = (IValidationMessage[]) inputElement; - return valMessages; - } - else - return new Object[0]; - } - } - - protected class ListLabelProvider implements ITableLabelProvider - { - public Image getColumnImage(Object element, int columnIndex) - { - if (element instanceof IValidationMessage) - { - IValidationMessage msg = (IValidationMessage) element; - - if (columnIndex == 0) - { - int severity = msg.getSeverity(); - if (severity == 0) { - return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK); - } else if (severity == 1) { - return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK); - } else if (severity == 2) { - return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK); - } - } - } - return null; - } - - public String getColumnText(Object element, int columnIndex) - { - String text = ""; - if (element instanceof IValidationMessage) - { - IValidationMessage msg = (IValidationMessage) element; - - switch (columnIndex) { - case 0: - // no text to display, only display severity as image - break; - case 1: - text = (new Integer(msg.getLine())).toString(); - break; - case 2: - text = (new Integer(msg.getColumn())).toString(); - break; - case 3: - text = msg.getMessage(); - break; - - default: - break; - } - } - return text; - } - - public void addListener(ILabelProviderListener listener) - { - } - - public void removeListener(ILabelProviderListener listener) - { - } - - public boolean isLabelProperty(Object element, String property) - { - return true; - } - - public void dispose() - { - } - } - } diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java deleted file mode 100644 index 2e2a8093a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import java.net.MalformedURLException; -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl; -import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory; -import org.eclipse.wst.command.internal.env.core.data.Transformer; -import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; - -public class WSDLSelectionTransformer implements Transformer -{ - public Object transform(Object value) - { - if (value instanceof IStructuredSelection) - { - Object sel = ((IStructuredSelection)value).getFirstElement(); - if (sel instanceof IResource) - { - try - { - return new StructuredSelection(((IResource)sel).getLocation().toFile().toURL().toString()); - } - catch (MalformedURLException murle) - { - } - } - else if (sel instanceof ServiceImpl) - { - return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)sel)); - } - else if (sel instanceof ServiceRefImpl) - { - return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceRefImpl)sel)); - } - else if (sel instanceof WSDLResourceImpl) - { - return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)sel)); - } - } - return value; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java deleted file mode 100644 index 2b369c44c..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java +++ /dev/null @@ -1,548 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.object; - -import java.io.File; -import java.net.MalformedURLException; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.IJobChangeEvent; -import org.eclipse.core.runtime.jobs.IJobManager; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.core.runtime.jobs.JobChangeAdapter; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; -import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionConditionCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionTreeWidget; -import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser; -import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext; -import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; -import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; - -public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget, Runnable -{ - private String pluginId_; - private FileExtensionFilter wsFilter_; - private WebServicesParser webServicesParser; - - private Composite parent_; - private Listener statusListener_; - private WSDLSelectionTreeWidget tree; - private ValidationMessageViewerWidget msgViewer_; - - /*CONTEXT_ID PCON0001 for the WSDL Selection Page*/ - private final String INFOPOP_PCON_PAGE = "PCON0001"; - - /*CONTEXT_ID PCON0002 for the WSDL Document text field of the WSDL Selection Page*/ - private final String INFOPOP_PCON_TEXT_WSDL = "PCON0002"; - private Text webServiceURI; - - /*CONTEXT_ID PCON0003 for the WSDL Resource Browse button of the WSDL Selection Page*/ - private final String INFOPOP_PCON_BUTTON_BROWSE_WSDL = "PCON0003"; - private Button wsBrowseButton_; - - private ValidateWSDLJob validateWSDLJob_; - private JobChangeAdapter jobChangeAdapter_; - private Text validationSummaryText_; - private Text validationSummaryText2_; - - - public WSDLSelectionWidget() - { - pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - wsFilter_ = new FileExtensionFilter(new String[] {"wsdl", "wsil", "html"}); - webServicesParser = WSDLParserFactory.getWSDLParser(); - - final Runnable handleValidationMessages = new Runnable() - { - public void run() - { - msgViewer_.setInput(validateWSDLJob_.getValidationMessages()); - updateValidationSummary(validateWSDLJob_.getValidationMessageSeverity()); - } - }; - - jobChangeAdapter_ = new JobChangeAdapter() - { - public void done(IJobChangeEvent event) - { - if (msgViewer_!= null && msgViewer_.getContentProvider() != null) { - Display.getDefault().asyncExec( handleValidationMessages ); - } - } - }; - } - - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - UIUtils uiUtils = new UIUtils( pluginId_ ); - parent_ = parent; - statusListener_ = statusListener; - - parent.setToolTipText( ConsumptionUIMessages.TOOLTIP_PCON_PAGE ); - PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PCON_PAGE ); - - Composite wsdlGroup = uiUtils.createComposite( parent, 2, 5, 0 ); - - Label wsLabel = new Label( wsdlGroup, SWT.WRAP); - wsLabel.setText( ConsumptionUIMessages.LABEL_WS_SELECTION); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - gd.horizontalSpan = 2; - wsLabel.setLayoutData(gd); - wsLabel.setToolTipText( ConsumptionUIMessages.TOOLTIP_PCON_TEXT_WS ); - - webServiceURI = uiUtils.createText( wsdlGroup, null, - ConsumptionUIMessages.TOOLTIP_PCON_TEXT_WS, - INFOPOP_PCON_TEXT_WSDL, SWT.SINGLE | SWT.BORDER ); - webServiceURI.addModifyListener( - new ModifyListener() - { - public void modifyText(ModifyEvent event) - { - handleWebServiceURIModifyEvent(); - } - }); -// webServiceURI.addListener( SWT.Modify, statusListener ); - - wsBrowseButton_ = uiUtils.createPushButton( wsdlGroup, ConsumptionUIMessages.BUTTON_BROWSE, - ConsumptionUIMessages.TOOLTIP_PCON_BUTTON_BROWSE_WS, - INFOPOP_PCON_BUTTON_BROWSE_WSDL ); - wsBrowseButton_.addSelectionListener( - new SelectionListener() - { - public void widgetDefaultSelected(SelectionEvent event) - { - handleWSDLButton(); - } - - public void widgetSelected(SelectionEvent event) - { - handleWSDLButton(); - } - }); - - tree = new WSDLSelectionTreeWidget(); - tree.addControls(parent, statusListener); - tree.setWebServicesParser(webServicesParser); - - msgViewer_ = new ValidationMessageViewerWidget(); - msgViewer_.addControls(parent, statusListener); - - validationSummaryText_ = new Text( parent, SWT.WRAP); - validationSummaryText_.setEditable(false); - GridData gd1 = new GridData(GridData.FILL_BOTH); - validationSummaryText_.setLayoutData(gd1); - validationSummaryText_.setToolTipText( ConsumptionUIMessages.TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY ); - - validationSummaryText2_ = new Text( parent, SWT.WRAP); - validationSummaryText2_.setEditable(false); - validationSummaryText2_.setLayoutData(gd1); - - setMessageSummary(); - return this; - } - - private void setMessageSummary() { - String validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_NO_WSDL; - PersistentWSDLValidationContext wsdlValidationContext = WSPlugin.getInstance().getWSDLValidationContext(); - String validationSelection = wsdlValidationContext.getPersistentWSDLValidation(); - if (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection)) { - validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_REMOTE_WSDL; - } else if (PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) { - validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_ALL_WSDL; - } - validationSummaryText_.setText( validationMessageSummary ); - validationSummaryText2_.setText(" "); - } - - private void handleWebServiceURIModifyEvent() - { - if (webServiceURI.getText().indexOf(':') > 0) - Timer.newInstance(Display.getCurrent(), this).startTimer(); - else - handleWebServiceURI(); - statusListener_.handleEvent(null); - } - - private void handleWebServiceURI() - { - String wsURI = webServiceURI.getText(); - if (wsURI.indexOf(':') < 0) - { - IFile file = uri2IFile(wsURI); - if (file != null) - wsURI = iFile2URI(file); - } - if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null) - { - WSDLSelectionConditionCommand cmd = new WSDLSelectionConditionCommand(); - cmd.setWebServicesParser(webServicesParser); - cmd.setWebServiceURI(wsURI); - cmd.execute(null, null); - } - WebServiceEntity entity = webServicesParser.getWebServiceEntityByURI(wsURI); - if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSDL) - tree.setEnabled(false); - else - tree.setEnabled(true); - tree.setWebServiceURI(wsURI); - tree.refreshTreeViewer(); - } - - public void run() - { - handleWebServiceURI(); - statusListener_.handleEvent(null); - } - - private void handleWSDLButton() - { - DialogResourceBrowser dialog = new DialogResourceBrowser( parent_.getShell(), null, wsFilter_); - dialog.open(); - IResource res = dialog.getFirstSelection(); - if( res != null ) webServiceURI.setText( res.getFullPath().toString() ); - statusListener_.handleEvent(null); - } - - public IStatus getStatus() - { - // Timer validation - /* - * Commenting out because we don't want to block fast typers from hitting Next/Finish - if (Timer.isRunning()) - return new SimpleStatus("", ConsumptionUIMessages.PAGE_MSG_LOADING_WEB_SERVICE_URI, Status.ERROR); - */ - - // Validate the String representation of the Web service URI - // For example, is it pointing to an existing resource in the workspace? - String wsPath = webServiceURI.getText(); - if( wsPath == null || wsPath.length() <= 0 ) - return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WEB_SERVICE_URI ); - else if( wsPath.indexOf(':') < 0 ) - { - IResource res = ResourceUtils.findResource(wsPath); - if( res == null ) { - msgViewer_.clearInput(); - return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.PAGE_MSG_NO_SUCH_FILE, new Object[] {wsPath}) ); - } - else if( res.getType() != IResource.FILE ) { - msgViewer_.clearInput(); - return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WEB_SERVICE_URI ); - } - } - - - // Validate the content of the Web service URI - // For example, is selection a WSDL URI? - if (!Timer.isRunning() && tree.isEnabled()) - { - IStatus status = tree.getStatus(); - if (status != null) - { - int severity = status.getSeverity(); - if (severity == Status.ERROR || severity == Status.WARNING) { - msgViewer_.clearInput(); - return status; - } - } - } - else - { - if( wsPath.indexOf(':') < 0 ) - { - String wsdlURI = iFile2URI((IFile)ResourceUtils.findResource(wsPath)); - if (webServicesParser.getWSDLDefinition(wsdlURI) == null) { - msgViewer_.clearInput(); - return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL ); - } - } - } - - - if (!Timer.isRunning()) { - String wsdlURI1 = wsPath; - boolean isRemote = true; - if (tree.isEnabled()) { // is wsil - wsdlURI1 = tree.getWsdlURI(); - if (wsdlURI1.startsWith("file:")) { - isRemote = false; - } - } else { // is wsil - - if( wsPath.indexOf(':') < 0 ) - { // not remote - isRemote = false; - wsdlURI1 = iFile2URI((IFile)ResourceUtils.findResource(wsPath)); - } - } - - setMessageSummary(); - validateWSDL(wsdlURI1, isRemote); - } - - - // OK status - return Status.OK_STATUS; - } - - private void validateWSDL (String wsdlURI, boolean isRemote) { - - String validationSelection = WSPlugin.getInstance().getWSDLValidationContext().getPersistentWSDLValidation();; - if ((PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) || - (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection) && isRemote)) { - - IJobManager jobManager = Platform.getJobManager(); - Job[] jobs = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY ); - ValidateWSDLJob existingValidateWSDLJob = null; - - boolean startWSDLValidation = true; - validationSummaryText_.setText( ConsumptionUIMessages.MESSAGE_VALIDATE_IN_PROGRESS ); - validationSummaryText2_.setText(" "); - if( jobs.length > 0 ) - { - for (int i=0; i<jobs.length; i++) { - existingValidateWSDLJob = (ValidateWSDLJob)jobs[i]; - - if (existingValidateWSDLJob.getState() != Job.NONE) { - // Job running or to be run - // If the job is validating the same wsdlURI, let it finish running and ignore this one. - // It is not for the same wsdlURI, cancel the job and schedule this one. - - if (!wsdlURI.equals(existingValidateWSDLJob.getWsdlURI())) { - existingValidateWSDLJob.cancel(); - } else { - startWSDLValidation = false; - } - } - } - } - - if (startWSDLValidation) { - startWSDLValidationJob(wsdlURI); - } - } - return; - } - - private void startWSDLValidationJob (String wsdlURI) { - validateWSDLJob_ = new ValidateWSDLJob(wsdlURI); - validateWSDLJob_.addJobChangeListener( jobChangeAdapter_ ); - validateWSDLJob_.schedule(); - } - - public void updateValidationSummary(int messageSeverity) - { - - switch (messageSeverity) { - case IValidationMessage.SEV_ERROR: - validationSummaryText_.setText(ConsumptionUIMessages.ERROR_MESSAGES_IN_VALIDATION); - validationSummaryText2_.setText(ConsumptionUIMessages.WARNING_IF_CONTINUE); - break; - case IValidationMessage.SEV_WARNING: - validationSummaryText_.setText(ConsumptionUIMessages.WARNING_MESSAGES_IN_VALIDATION); - validationSummaryText2_.setText(ConsumptionUIMessages.WARNING_IF_CONTINUE); - break; - default: - validationSummaryText_.setText(ConsumptionUIMessages.VALIDATION_COMPLETED); - validationSummaryText2_.setText(" "); - break; - } - } - - private IFile uri2IFile(String uri) - { - IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(uri); - if (res instanceof IFile) - return (IFile)res; - else - return null; - } - - private String iFile2URI(IFile file) - { - File f = file.getLocation().toFile(); - try - { - return f.toURL().toString(); - } - catch (MalformedURLException murle) - { - } - return f.toString(); - } - - public void setInitialSelection(IStructuredSelection initialSelection) - { - if (initialSelection != null && !initialSelection.isEmpty()) - { - Object object = initialSelection.getFirstElement(); - String wsdlURI = toWsdlURI(object); - if (wsdlURI != null) - { - webServiceURI.setText(wsdlURI); - handleWebServiceURI(); - } - } - } - - private String toWsdlURI(Object object) - { - if (object instanceof ServiceImpl) - return J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)object); - else if (object instanceof WSDLResourceImpl) - return J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)object); - else if (object instanceof ServiceRef) - return J2EEActionAdapterFactory.getWSDLURI((ServiceRef)object); - else if (object instanceof IFile) - return ((IFile)object).getFullPath().toString(); - else if (object instanceof String) - return (String)object; - else - return null; - } - - public IStructuredSelection getObjectSelection() - { - return new StructuredSelection( - new WSDLSelectionWrapper( webServicesParser, - new StructuredSelection(tree.getWsdlURI()) ) ); - } - - public WebServicesParser getWebServicesParser() - { - return webServicesParser; - } - - public IStatus validateSelection(IStructuredSelection objectSelection) - { - return Status.OK_STATUS; - } - - public IProject getProject() - { - String wsdlURI = tree.getWsdlURI(); - if (wsdlURI != null) - { - IProject p = getProjectFromURI(wsdlURI); - if (p!=null && p.exists()) - return p; - - String wsRelPath = webServiceURI.getText(); - IResource wsRes = ResourceUtils.findResource(wsRelPath); - if (wsRes!=null && wsRes instanceof IFile) - { - IProject p2 = ((IFile)wsRes).getProject(); - return p2; - } - - } - return null; - } - - public String getComponentName() - { - String wsdlURI = tree.getWsdlURI(); - if (wsdlURI != null) - { - String cname = getComponentNameFromURI(wsdlURI); - if (cname!=null && cname.length()>0) - return cname; - - String wsRelPath = webServiceURI.getText(); - IResource wsRes = ResourceUtils.findResource(wsRelPath); - if (wsRes!=null && wsRes instanceof IFile) - { - IVirtualComponent comp = ResourceUtils.getComponentOf(wsRes); - if (comp!=null) - { - return comp.getName(); - } - } - - } - return null; - } - - private IProject getProjectFromURI(String uri) - { - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - String wkspcRootLoc = root.getLocation().toString(); - int idx = uri.indexOf(wkspcRootLoc); - if (idx != -1) - { - String relPath = uri.substring(wkspcRootLoc.length()+idx); - IResource res = root.findMember(new Path(relPath)); - if (res instanceof IFile) - { - IProject p = ((IFile)res).getProject(); - return p; - } - } - return null; - } - - private String getComponentNameFromURI(String uri) - { - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - String wkspcRootLoc = root.getLocation().toString(); - int idx = uri.indexOf(wkspcRootLoc); - if (idx != -1) - { - String relPath = uri.substring(wkspcRootLoc.length()+idx); - IResource res = root.findMember(new Path(relPath)); - if (res instanceof IFile) - { - IVirtualComponent comp = ResourceUtils.getComponentOf(res); - if (comp!=null) - { - return comp.getName(); - } - } - } - return null; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java deleted file mode 100644 index 80a6c1823..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 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.ws.internal.consumption.ui.widgets.object; - -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - -/** - * This class is a very simple wrapper that binds a WSDL parser with - * a wsdlSelection object. - */ -public class WSDLSelectionWrapper -{ - public WebServicesParser parser; - public IStructuredSelection wsdlSelection; - - public WSDLSelectionWrapper( WebServicesParser parser, - IStructuredSelection selection ) - { - this.parser = parser; - this.wsdlSelection = selection; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java deleted file mode 100644 index 070494cc5..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java +++ /dev/null @@ -1,251 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.runtime; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - - -public class ClientRuntimeSelectionWidget extends SimpleWidgetDataContributor -{ - private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - - /* CONTEXT_ID PWRS0003 for the Wizard Scenario Client configuration of the Runtime Selection Page */ - private String INFOPOP_PWRS_GROUP_CLIENT = pluginId_ + ".PWRS0003"; - - private Group clientGroup_; - private RuntimeServerSelectionWidget runtimeWidget_; - private ProjectSelectionWidget projectWidget_; - private boolean isVisible_; - - - public WidgetDataEvents addControls( Composite parent, final Listener statusListener ) - { - UIUtils uiUtils = new UIUtils( pluginId_ ); - - clientGroup_ = uiUtils.createGroup( parent, ConsumptionUIMessages.LABEL_CLIENT_SELECTION_VIEW_TITLE, - null, INFOPOP_PWRS_GROUP_CLIENT, 2, 5, 5 ); - - runtimeWidget_ = new RuntimeServerSelectionWidget( true ); - runtimeWidget_.addControls( clientGroup_, statusListener ); - - - runtimeWidget_.addModifyListener( new ModifyListener() - { - public void modifyText(ModifyEvent e) - { - //handleRuntime2ClientTypesEvent(); - handleUpdateProjectWidget(); - } - }); - - - projectWidget_ = new ProjectSelectionWidget(true); - projectWidget_.addControls( clientGroup_, statusListener ); - - return this; - } - - // This method is called by the creator of this widget to control - // whether it is visible or not. - public void setVisible( boolean value ) - { - clientGroup_.setVisible( value ); - isVisible_ = value; - } - - public boolean isVisible(){ - return this.isVisible_; - } - - public void setClientTypeRuntimeServer( TypeRuntimeServer ids ) - { - runtimeWidget_.setTypeRuntimeServer( ids ); - projectWidget_.setTypeRuntimeServer(ids); - } - - public TypeRuntimeServer getClientTypeRuntimeServer() - { - return runtimeWidget_.getTypeRuntimeServer(); - } - - public String getClientRuntimeId() - { - //calculate the most appropriate clientRuntimeId based on current settings. - String projectName = projectWidget_.getProjectName(); - String templateId = projectWidget_.getComponentType(); - - //Find the client runtime that fits this profile best. - return WebServiceRuntimeExtensionUtils2.getClientRuntimeId(runtimeWidget_.getTypeRuntimeServer(), projectName, templateId); - } - - public boolean getClientNeedEAR() - { - return projectWidget_.getNeedEAR(); - } - - public void setClientNeedEAR(boolean b) - { - projectWidget_.setNeedEAR(b); - } - - public String getClientProjectName() - { - return projectWidget_.getProjectName(); - } - - public void setClientProjectName( String name ) - { - projectWidget_.setProjectName( name ); - } - - public String getClientEarProjectName() - { - return projectWidget_.getEarProjectName(); - } - - public void setClientEarProjectName( String name ) - { - projectWidget_.setEarProjectName( name ); - } - - public String getClientComponentType() - { - return projectWidget_.getComponentType(); - } - - public void setClientComponentType( String type ) - { - projectWidget_.setComponentType( type ); - } - - private void handleUpdateProjectWidget() - { - projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer()); - - //Update the list of projects shown to the user. - projectWidget_.refreshProjectItems(); - } - - public ProjectSelectionWidget getProjectSelectionWidget() { - return this.projectWidget_; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus() - */ - public IStatus getStatus() - { - //MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this ); - ValidationUtils valUtils = new ValidationUtils(); - //Return OK all the time for now. - IStatus finalStatus = Status.OK_STATUS; - - - IStatus projectStatus = projectWidget_.getStatus(); - IStatus runtimeStatus = runtimeWidget_.getStatus(); - - if( runtimeStatus.getSeverity() == Status.ERROR ) - { - finalStatus = runtimeStatus; - } - else if( projectStatus.getSeverity() == Status.ERROR ) - { - finalStatus = projectStatus; - } - else - { - String projectName = projectWidget_.getProjectName(); - if (projectName != null && projectName.length()>0) - { - //If the project exists, ensure that it is suitable for the selected runtime - //and server. - - IProject project = ProjectUtilities.getProject(projectName); - String typeId = getClientTypeRuntimeServer().getTypeId(); - String runtimeId = getClientTypeRuntimeServer().getRuntimeId(); - String serverFactoryId = getClientTypeRuntimeServer().getServerId(); - - if (project.exists()) - { - //Check if the runtime supports it. - if (!WebServiceRuntimeExtensionUtils2.doesClientTypeAndRuntimeSupportProject(typeId, runtimeId, projectName)) - { - String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId); - finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_PROJECT, new String[]{runtimeLabel, projectName})); - } - - //Check if the server supports it. - - if (serverFactoryId!=null && serverFactoryId.length()>0) - { - if (!valUtils.doesServerSupportProject(serverFactoryId, projectName)) - { - String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId); - finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT, new String[]{serverLabel, projectName})); - } - } - } - else - { - //Look at the project type to ensure that it is suitable for the selected runtime - //and server. - - String templateId = getClientComponentType(); - - if (templateId != null && templateId.length()>0) - { - //Check if the runtime supports it. - if (!WebServiceRuntimeExtensionUtils2.doesClientTypeAndRuntimeSupportTemplate(typeId, runtimeId, templateId)) - { - String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId); - String templateLabel = FacetUtils.getTemplateLabelById(templateId); - finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE, new String[]{runtimeLabel, templateLabel})); - } - - //Check if the server supports it. - if (serverFactoryId!=null && serverFactoryId.length()>0) - { - if (!valUtils.doesServerSupportTemplate(serverFactoryId, templateId)) - { - String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId); - String templateLabel = FacetUtils.getTemplateLabelById(templateId); - finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_TEMPLATE, new String[]{serverLabel, templateLabel})); - } - } - } - - - - } - } - } - - return finalStatus; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java deleted file mode 100644 index 36bc5273b..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java +++ /dev/null @@ -1,1005 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.runtime; - -import java.util.Iterator; -import java.util.Set; -import java.util.Vector; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.server.core.FacetUtil; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.core.selection.SelectionList; -import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerType; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.ISelection; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; -import org.eclipse.wst.ws.internal.wsrt.SimpleContext; -import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; -import org.eclipse.wst.ws.internal.wsrt.WebServiceState; - -public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataModelOperation -{ - - private TypeRuntimeServer clientIds_; - private String clientRuntimeId_; - private String clientProjectName_; - private String clientEarProjectName_; - protected boolean clientNeedEAR_ = true; - private String clientComponentType_; - private FacetMatcher clientFacetMatcher_; - - private IContext context_; - private ISelection selection_; - private IWebServiceClient webServiceClient_; - private ResourceContext resourceContext_; - private boolean test_; - - //A note on initialSelections ... - //The difference between clientInitialProject/Component_ and initialInitialSelection is that - //clientInitialProject/Component_ comes from the ObjectSelectionOutputCommand while initialInitialSelection - //is the actual thing that was selected before the wizard was launched. In the runtime/j2ee/project - //defaulting algorithm, clientInitialSelection will be given first priority. If, however, it is - //deemed that clientInitialProject is not a valid initial selection, initialInitialSelection - //will be given second priority. Things that could make an initialSelection invalid include - //1. The containing project contains the Web service for which we are trying to create a client - //2. The containing project has a J2EE level, server target, and project type combination which - // is not supported by any of the registered Web service runtimes. - private IProject clientInitialProject_; - private String wsdlURI_; - - public ClientRuntimeSelectionWidgetDefaultingCommand() - { - super(); - } - - public void setClientTypeRuntimeServer( TypeRuntimeServer ids ) - { - clientIds_ = ids; - } - - public TypeRuntimeServer getClientTypeRuntimeServer() - { - return clientIds_; - } - - public String getClientRuntimeId() - { - return clientRuntimeId_; - } - - public String getClientProjectName() - { - return clientProjectName_; - } - - public String getClientEarProjectName() - { - return clientEarProjectName_; - } - - public void setClientEarProjectName(String name) - { - clientEarProjectName_ = name; - } - - public String getClientComponentType() - { - return clientComponentType_; - } - - public IWebServiceClient getWebService() - { - return webServiceClient_; - } - - public IContext getContext() - { - return context_; - } - - public ISelection getSelection() - { - return selection_; - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) - { - - IEnvironment env = getEnvironment(); - - try - { - // Set the runtime based on the initial selection - clientRuntimeId_ = getDefaultClientRuntime(clientInitialProject_); - if (clientRuntimeId_ == null) - { - // return and error. - } - clientIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRuntime() - .getId()); - - // Set the project - if (clientProjectName_ == null) - { - // Project name did not get set when the runtime was set, so set it now - clientProjectName_ = getDefaultClientProjectName(); - } - - IProject clientProject = ProjectUtilities.getProject(clientProjectName_); - if (!clientProject.exists()) - { - // Set the project template - clientComponentType_ = getDefaultClientProjectTemplate(); - } - else - { - //Set it to an empty String - clientComponentType_ = ""; - } - - - // Set the server - IStatus serverStatus = setClientDefaultServer(); - if (serverStatus.getSeverity() == Status.ERROR) - { - env.getStatusHandler().reportError(serverStatus); - return serverStatus; - } - - setDefaultClientEarProject(); - // Calculate default IWebServiceClient - setDefaultsForExtension(env); - - return Status.OK_STATUS; - - } catch (Exception e) - { - // Catch all Exceptions in order to give some feedback to the user - IStatus errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, - new String[] { e.getMessage() }), e); - env.getStatusHandler().reportError(errorStatus); - return errorStatus; - } - } - - private void setDefaultClientEarProject() - { - - //Determine if an ear selection is needed based on the server type. - boolean clientNeedEAR_ = true; - String serverId = clientIds_.getServerId(); - if (serverId != null) - { - //Use the server type - String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId); - if (serverTargetId!=null && serverTargetId.length()>0) - { - if (!ServerUtils.isTargetValidForEAR(serverTargetId,"13")) - { - //Default the EAR selection to be empty - clientNeedEAR_ = false; - } - } - } - - if (clientNeedEAR_) - { - clientEarProjectName_ = getDefaultClientEarProjectName(); - } - else - { - clientEarProjectName_ = ""; - } - } - - private IStatus setClientDefaultServer() - { - //Choose an existing server the module is already associated with if possible - IProject clientProject = ProjectUtilities.getProject(clientProjectName_); - IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(clientProject), null); - - if (configuredServers!=null && configuredServers.length>0) - { - clientIds_.setServerId(configuredServers[0].getServerType().getId()); - clientIds_.setServerInstanceId(configuredServers[0].getId()); - return Status.OK_STATUS; - } - - //If the project exists, choose a suitable server or server type based on the existing project's runtime or facets - if (clientProject.exists()) - { - IServer server = getServerFromProject(clientProjectName_, clientFacetMatcher_); - if (server != null) - { - clientIds_.setServerId(server.getServerType().getId()); - clientIds_.setServerInstanceId(server.getId()); - return Status.OK_STATUS; - } - else - { - IServerType serverType = getServerTypeFromProject(clientProjectName_, clientFacetMatcher_); - if (serverType != null) - { - clientIds_.setServerId(serverType.getId()); - return Status.OK_STATUS; - } - } - } - - //Haven't picked a server/server type on the basis of the project. Pick a server/server type - //that is compatible with the clientRuntimeId. - IServer server = getServerFromClientRuntimeId(); - if (server!=null) - { - clientIds_.setServerId(server.getServerType().getId()); - clientIds_.setServerInstanceId(server.getId()); - return Status.OK_STATUS; - } - - IServerType serverType = getServerTypeFromClientRuntimeId(); - if (serverType != null) - { - clientIds_.setServerId(serverType.getId()); - return Status.OK_STATUS; - } - - //No suitable server was found. Popup an error. - String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(clientIds_.getRuntimeId()); - String serverLabels = getServerLabels(clientRuntimeId_); - IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[]{runtimeLabel, serverLabels}) ); - return status; - } - - private IServer getServerFromClientRuntimeId() - { - IServer[] servers = ServerCore.getServers(); - if (servers != null && servers.length > 0) { - for (int i = 0; i < servers.length; i++) - { - String serverFactoryId = servers[i].getServerType().getId(); - if (WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportServer(clientRuntimeId_, serverFactoryId)) - { - return servers[i]; - } - } - } - return null; - } - - private IServerType getServerTypeFromClientRuntimeId() - { - String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByClientRuntime(clientRuntimeId_); - if (serverTypes!=null && serverTypes.length>0) - { - //Return the preferred one if it is in the list - PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext(); - String preferredServerFactoryId = context.getServerFactoryId(); - for (int i=0; i<serverTypes.length; i++) - { - if (serverTypes[i].equals(preferredServerFactoryId)) - { - return ServerCore.findServerType(serverTypes[i]); - } - } - - return ServerCore.findServerType(serverTypes[0]); - } - - return null; - } - - protected IServer getServerFromProject(String projectName, FacetMatcher facetMatcher) - { - IServer server = null; - - IProject project = ProjectUtilities.getProject(projectName); - IServer[] servers = ServerCore.getServers(); - - if (servers.length > 0) - { - // Get the runtime. - org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null; - IFacetedProject fProject = null; - - if (project != null && project.exists()) - { - try - { - fProject = ProjectFacetsManager.create(project); - fRuntime = fProject.getRuntime(); - } catch (CoreException ce) - { - - } - } - - if (fRuntime != null) - { - // Get an existing server that has the same runtime. - IRuntime sRuntime = FacetUtil.getRuntime(fRuntime); - for (int i = 0; i < servers.length; i++) - { - IServer thisServer = servers[i]; - if (thisServer.getRuntime().getId().equals(sRuntime.getId())) - { - server = thisServer; - break; - } - } - } - - // If an existing server could not be chosen on the basis of the project's - // runtime, - // try to find an existing server using the project's facets and the - // facetsToAdd. - if (server == null) - { - if (fProject != null) // We have a faceted project!! - { - Set facets = fProject.getProjectFacets(); - if (facetMatcher.getFacetsToAdd() != null) - { - Iterator itr = facetMatcher.getFacetsToAdd().iterator(); - while (itr.hasNext()) - { - facets.add(itr.next()); - } - } - server = getServerFromFacets(facets); - } else - { - // TODO handle this for the Java project case. - } - } - } - return server; - } - - protected IServer getServerFromFacets(Set facets) - { - IServer server = null; - Set runtimes = FacetUtils.getRuntimes(new Set[]{facets}); - Iterator itr = runtimes.iterator(); - IServer[] servers = ServerCore.getServers(); - - outer: - while(itr.hasNext()) - { - org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)itr.next(); - IRuntime sRuntime = FacetUtil.getRuntime(fRuntime); - for (int i=0; i<servers.length; i++) - { - IServer thisServer = servers[i]; - if (thisServer.getRuntime().getId().equals(sRuntime.getId())) - { - server = thisServer; - break outer; - } - } - } - - return server; - } - - protected IServerType getServerTypeFromProject(String projectName, FacetMatcher facetMatcher) - { - IServerType serverType = null; - - IProject project = ProjectUtilities.getProject(projectName); - IServerType[] serverTypes = ServerCore.getServerTypes(); - - //Get the runtime. - org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null; - IFacetedProject fProject = null; - - if (project != null && project.exists()) - { - try - { - fProject = ProjectFacetsManager.create(project); - fRuntime = fProject.getRuntime(); - } catch (CoreException ce) - { - - } - } - - if (fRuntime != null) - { - //Get a server type that has the same runtime type. - IRuntime sRuntime = FacetUtil.getRuntime(fRuntime); - for (int i=0; i<serverTypes.length; i++) - { - IServerType thisServerType = serverTypes[i]; - if (thisServerType.getRuntimeType().getId().equals(sRuntime.getRuntimeType().getId())) - { - serverType = thisServerType; - break; - } - } - } - - //If a server type could not be chosen on the basis of the project's runtime, - //try to find a server type using the project's facets and the facetsToAdd. - if (serverType == null) - { - if (fProject != null) //We have a faceted project!! - { - Set facets = fProject.getProjectFacets(); - if (facetMatcher.getFacetsToAdd() != null) - { - Iterator itr = facetMatcher.getFacetsToAdd().iterator(); - while (itr.hasNext()) - { - facets.add(itr.next()); - } - } - serverType = getServerTypeFromFacets(facets); - } - else - { - //TODO handle this for the Java project case. - } - } - - return serverType; - } - - protected IServerType getServerTypeFromFacets(Set facets) - { - IServerType serverType = null; - Set runtimes = FacetUtils.getRuntimes(new Set[]{facets}); - Iterator itr = runtimes.iterator(); - IServerType[] serverTypes = ServerCore.getServerTypes(); - - outer: - while(itr.hasNext()) - { - org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)itr.next(); - IRuntime sRuntime = FacetUtil.getRuntime(fRuntime); - for (int i=0; i<serverTypes.length; i++) - { - IServerType thisServerType = serverTypes[i]; - if (thisServerType.getRuntimeType().getId().equals(sRuntime.getRuntimeType().getId())) - { - serverType = thisServerType; - break outer; - } - } - } - - return serverType; - } - - protected IServer getServerFromProjectType(String templateId, FacetMatcher facetMatcher) - { - IServer server = null; - Set facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId); - if (facetMatcher.getFacetsToAdd() != null) - { - Iterator itr = facetMatcher.getFacetsToAdd().iterator(); - while (itr.hasNext()) - { - facets.add(itr.next()); - } - } - server = getServerFromFacets(facets); - return server; - } - - protected IServerType getServerTypeFromProjectType(String templateId, FacetMatcher facetMatcher) - { - IServerType serverType = null; - Set facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId); - if (facetMatcher.getFacetsToAdd() != null) - { - Iterator itr = facetMatcher.getFacetsToAdd().iterator(); - while (itr.hasNext()) - { - facets.add(itr.next()); - } - } - //TODO Instead of passing in a single set of facets, pass in multiple sets, if the - //jst.java facet is one of them and the clientRuntimeId allows newer. - serverType = getServerTypeFromFacets(facets); - return serverType; - } - - private String getDefaultClientProjectTemplate() - { - String[] templates = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(clientIds_.getTypeId(), clientIds_.getRuntimeId()); - RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRequiredFacetVersions(); - - //Pick the Web one if it's there, otherwise pick the first one. - for (int i=0; i<templates.length; i++) - { - String templateId = templates[i]; - if (templateId.indexOf("web") != -1) - { - //Calculate the facet matcher for the template so that we know - //what to create and what to add during module creation. - - Set facetVersions = FacetUtils.getInitialFacetVersionsFromTemplate(templateId); - FacetMatcher fm = FacetUtils.match(rfv, facetVersions); - if (fm.isMatch()) - { - clientFacetMatcher_ = fm; - return templates[i]; - } - - } - } - - //Didn't find a "web" type. Return the first one that is a match. Calculate the facet matcher for the template - //so that we know what to create and what to add during module creation. - for (int j = 0; j < templates.length; j++) - { - String templateId = templates[j]; - Set facetVersions = FacetUtils.getInitialFacetVersionsFromTemplate(templateId); - FacetMatcher fm = FacetUtils.match(rfv, facetVersions); - if (fm.isMatch()) - { - clientFacetMatcher_ = fm; - return templates[j]; - } - } - - //Still nothing, return the first one if available. - if (templates.length > 0) - return templates[0]; - - return ""; - } - - private String getDefaultClientProjectName() - { - IProject[] projects = FacetUtils.getAllProjects(); - ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_); - RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions(); - - //Check each project for compatibility with the clientRuntime - for (int i=0; i<projects.length; i++) - { - try - { - IFacetedProject fproject = ProjectFacetsManager.create(projects[i]); - if (fproject != null) - { - Set facetVersions = fproject.getProjectFacets(); - FacetMatcher fm = FacetUtils.match(rfvs, facetVersions); - if (fm.isMatch()) - { - clientFacetMatcher_ = fm; - return projects[i].getName(); - } - } - else - { - //TODO Handle the plain-old Java projects - } - } catch (CoreException ce) - { - - } - } - - //No project was suitable, return a new project name - return ResourceUtils.getDefaultWebProjectName(); - - } - - private String getDefaultClientRuntime(IProject project) - { - - - String[] clientRuntimes = WebServiceRuntimeExtensionUtils2.getClientRuntimesByType(clientIds_.getTypeId()); - - //Check if the preferred Web service runtime works with the initially selected project. - PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext(); - String runtimeId = context.getRuntimeId(); - String preferredClientRuntimeId = null; - for (int k=0; k<clientRuntimes.length; k++ ) - { - ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimes[k]); - if (desc.getRuntime().getId().equals(runtimeId)) - { - preferredClientRuntimeId = desc.getId(); - break; - } - } - - if (preferredClientRuntimeId != null) - { - if (project != null && project.exists()) - { - RequiredFacetVersion[] prfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(preferredClientRuntimeId) - .getRequiredFacetVersions(); - try - { - IFacetedProject fproject = ProjectFacetsManager.create(project); - if (fproject != null) - { - Set facetVersions = fproject.getProjectFacets(); - FacetMatcher fm = FacetUtils.match(prfv, facetVersions); - if (fm.isMatch()) - { - clientFacetMatcher_ = fm; - clientProjectName_ = project.getName(); - return preferredClientRuntimeId; - } - } else - { - // TODO Handle the plain-old Java projects - } - } catch (CoreException ce) - { - - } - } - } - - //Either there was no initially selected project or the preferred - //runtime did not work with the initially selected project. - //If possible, pick a Web service runtime that works with the initially selected project. - //If the initially selected project does not work with any of the Web service runtimes, pick the - //preferred Web service runtime. - - - if (project != null && project.exists()) - { - for (int i=0; i<clientRuntimes.length; i++) - { - RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimes[i]).getRequiredFacetVersions(); - try - { - IFacetedProject fproject = ProjectFacetsManager.create(project); - if (fproject != null) - { - Set facetVersions = fproject.getProjectFacets(); - FacetMatcher fm = FacetUtils.match(rfv, facetVersions); - if (fm.isMatch()) - { - clientFacetMatcher_ = fm; - clientProjectName_ = project.getName(); - return clientRuntimes[i]; - } - } - else - { - //TODO Handle the plain-old Java projects - } - } catch (CoreException ce) - { - - } - } - } - - //Haven't returned yet so this means that the intitially selected project cannot be used - //to influence the selection of the runtime. Pick the preferred Web service runtime if it is - //not null. - if (preferredClientRuntimeId != null) - { - return preferredClientRuntimeId; - } - - - if (clientRuntimes.length > 0) - return WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimes[0]).getId(); - else - return null; - } - - /** - * - * @param project - * @return - */ - protected SelectionListChoices getProjectEARChoice(IProject project) - { - String[] flexProjects = getAllFlexibleProjects(); - SelectionList list = new SelectionList(flexProjects, 0); - return new SelectionListChoices(list, null); - } - - protected SelectionList getEARProjects() - { - String[] flexProjects = getAllFlexibleProjects(); - return new SelectionList(flexProjects, 0); - } - - protected IResource getResourceFromInitialSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - return resource; - } catch(CoreException e) - { - return null; - } - } - } - return null; - } - - - protected String getDefaultClientEarProjectName() - { - IProject clientProject = ProjectUtilities.getProject(clientProjectName_); - IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(clientProject); - if (earComps.length>0) - { - //Pick the first one - return earComps[0].getName(); - } - - //Either project does not exist or component is not associated with any EARs, so pick the first EAR you see with the correct J2EE version. - IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents(); - if (allEarComps.length>0) - { - //TODO Choose an existing EAR that can be added to the server and who's J2EE level in consistent with - //that of the selected project, if applicable. Picking the first one for now. - return allEarComps[0].getName(); - } - else - { - //there are no Ears. - return ResourceUtils.getDefaultClientEARProjectName(); - } - } - - - private String getServerLabels(String clientRuntimeId) - { - String[] validServerFactoryIds = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByClientRuntime(clientRuntimeId); - //String[] validServerLabels = new String[validServerFactoryIds.length]; - StringBuffer validServerLabels = new StringBuffer(); - for (int i=0; i<validServerFactoryIds.length; i++) - { - if (i>0) - { - validServerLabels.append(", "); - } - validServerLabels.append(WebServiceRuntimeExtensionUtils.getServerLabelById(validServerFactoryIds[i])); - - } - return validServerLabels.toString(); - } - - - protected void updateClientProject(String projectName, String serviceTypeId) - { - boolean isEJB = false; - String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(serviceTypeId); - isEJB = (implId.equals("org.eclipse.jst.ws.wsImpl.ejb")); - String[] updatedNames = ResourceUtils.getClientProjectComponentName(projectName, projectName, isEJB); - clientProjectName_ = updatedNames[0]; - clientComponentType_ = getDefaultClientProjectTemplate(); - - } - - - private void setDefaultsForExtension(IEnvironment env) - { - IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2.getClientRuntime(clientRuntimeId_); - if (wsrt != null) - { - WebServiceClientInfo wsInfo = new WebServiceClientInfo(); - wsInfo.setServerFactoryId(clientIds_.getServerId()); - wsInfo.setServerInstanceId(clientIds_.getServerInstanceId()); - wsInfo.setState(WebServiceState.UNKNOWN_LITERAL); - wsInfo.setWebServiceRuntimeId(clientIds_.getRuntimeId()); - wsInfo.setWsdlURL(wsdlURI_); - - webServiceClient_ = wsrt.getWebServiceClient(wsInfo); - WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL; - if (resourceContext_ != null) - { - context_ = new SimpleContext(true, true, true, true, true, true, test_, false, scenario, resourceContext_.isOverwriteFilesEnabled(), resourceContext_ - .isCreateFoldersEnabled(), resourceContext_.isCheckoutFilesEnabled()); - } - } - - } - - public void setClientInitialSelection(IStructuredSelection selection) - { - if (clientInitialProject_ == null) - { - clientInitialProject_ = getProjectFromInitialSelection(selection); - } - } - - public void setClientInitialProject(IProject clientInitialProject) - { - clientInitialProject_ = clientInitialProject; - } - - /** - * @param initialInitialSelection_ The initialInitialSelection_ to set. - */ - public void setInitialInitialSelection(IStructuredSelection initialInitialSelection) - { - // TODO Delete this method and corresponding mappings - // if no longer required. - } - - public boolean getClientNeedEAR() - { - return clientNeedEAR_; - } - - /** - * @param parser_ The parser_ to set. - */ - public void setWebServicesParser(WebServicesParser parser) { - // TODO Delete this method and corresponding mappings - // if no longer required. - } - - public void setWsdlURI(String wsdlURI) - { - wsdlURI_ = wsdlURI; - } - - public void setTestService(boolean testService) - { - test_ = testService; - } - - public void setResourceContext( ResourceContext resourceContext ) - { - resourceContext_ = resourceContext; - } - - private IProject getProjectFromInitialSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - if (resource==null) - return null; - IProject p = ResourceUtils.getProjectOf(resource.getFullPath()); - return p; - } catch(CoreException e) - { - return null; - } - } - } - return null; - } - - protected String[] getAllFlexibleProjects() - { - Vector v = new Vector(); - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i = 0; i < projects.length; i++) - { - if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith(".")) - { - v.add(projects[i].getName()); - } - } - - return (String[])v.toArray(new String[0]); - - } - - /** - * This inner class is being used to pass around Web service runtime - * and J2EE level information. - * - */ - protected class WSRuntimeJ2EEType - { - private String wsrId_; - private String j2eeVersionId_; - private String clientProjectTypeId; //only used for client-side defaulting - - public WSRuntimeJ2EEType() - { - //making this ctor public so that subclasses can instantiate. - } - /** - * @return Returns the j2eeVersionId_. - */ - public String getJ2eeVersionId() - { - return j2eeVersionId_; - } - /** - * @param versionId_ The j2eeVersionId_ to set. - */ - public void setJ2eeVersionId(String versionId_) - { - j2eeVersionId_ = versionId_; - } - /** - * @return Returns the wsrId_. - */ - public String getWsrId() - { - return wsrId_; - } - /** - * @param wsrId_ The wsrId_ to set. - */ - public void setWsrId(String wsrId_) - { - this.wsrId_ = wsrId_; - } - - /** - * @return Returns the clientProjectTypeId. - */ - public String getClientProjectTypeId() - { - return clientProjectTypeId; - } - /** - * @param clientProjectTypeId The clientProjectTypeId to set. - */ - public void setClientProjectTypeId(String clientProjectTypeId) - { - this.clientProjectTypeId = clientProjectTypeId; - } - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java deleted file mode 100644 index 9a661690c..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java +++ /dev/null @@ -1,663 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.runtime; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -public class ProjectSelectionWidget extends SimpleWidgetDataContributor { - - - - private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - - //private SelectionListChoices projects_; - - private boolean needEAR_; - - private TypeRuntimeServer trsIds_; - - private Listener statusListener_; - - private Text messageText_; - - private boolean isClient_ = false; - - private byte CREATE_PROJECT = (byte) 1; - - private byte CREATE_EAR = (byte) 2; - - private byte ADD_EAR_ASSOCIATION = (byte) 4; - - private Combo moduleProject_; - private Combo earProject_; - private Combo projectType_; - - private String[] templates_; - - //private String componentType_; - - private ModifyListener projectTypeListener_; - private ModifyListener moduleProjectListener_; - private ModifyListener earProjectListener_; - - /* - * CONTEXT_ID PWRS0006 for the service-side Web project combo box of the - * runtime selection Page - */ - private String INFOPOP_PWRS_COMBO_PROJECT = pluginId_ + ".PWRS0006"; - - //private Combo module_; - - /* CONTEXT_ID PWRS0018 for the client project type combo box of the runtime selection Page */ - private String INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE = pluginId_ + ".PWRS0018"; - - /* CONTEXT_ID PWRS0024 for the service project type combo box of the runtime selection Page */ - private String INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE = pluginId_ + ".PWRS0018"; - - //private Combo earModule_; - - /* - * Default Constructor - */ - public ProjectSelectionWidget() { - } - - /* - * ProjectSelectionWidget @param isClient - */ - public ProjectSelectionWidget(boolean isClient) { - this.isClient_ = isClient; - } - - public WidgetDataEvents addControls(Composite parent, Listener statusListener) { - - UIUtils uiUtils = new UIUtils(pluginId_); - - statusListener_ = statusListener; - - if (isClient_) - { - projectType_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_TYPE, ConsumptionUIMessages.TOOLTIP_PWCR_COMBO_CLIENT_TYPE, INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER); - moduleProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_PROJECT, ConsumptionUIMessages.LABEL_CLIENT_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - //module_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_MODULE", ConsumptionUIMessages.LABEL_CLIENT_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - earProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT, ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - //earModule_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_EAR_MODULE", ConsumptionUIMessages.LABEL_CLIENT_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER ); - } - else - { - projectType_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_TYPE, ConsumptionUIMessages.TOOLTIP_PWCR_COMBO_SERVICE_TYPE, INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER); - moduleProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_PROJECT, ConsumptionUIMessages.LABEL_SERVICE_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - //module_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_MODULE", ConsumptionUIMessages.LABEL_SERVICE_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - earProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT, ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - //earModule_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_EAR_MODULE, ConsumptionUIMessages.LABEL_SERVICE_EAR_MODULE, INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER ); - } - - //Temporarily remove the listeners - - projectTypeListener_ = new ModifyListener() - { - public void modifyText(ModifyEvent evt) - { - statusListener_.handleEvent( null ); - } - }; - - moduleProjectListener_ = new ModifyListener() - { - public void modifyText(ModifyEvent evt) - { - handleProjectChanged(); - statusListener_.handleEvent( null ); - } - }; - - earProjectListener_ = new ModifyListener() - { - public void modifyText(ModifyEvent evt) - { - statusListener_.handleEvent( null ); - } - }; - - // message area - messageText_ = uiUtils.createText(parent, ConsumptionUIMessages.LABEL_NO_LABEL, ConsumptionUIMessages.LABEL_NO_LABEL, null, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY); - setEarProjectItems(); - - return this; - } - - private void listenersOn() - { - projectType_.addModifyListener(projectTypeListener_); - moduleProject_.addModifyListener( moduleProjectListener_ ); - earProject_.addModifyListener( earProjectListener_ ); - } - - private void listenersOff() - { - projectType_.removeModifyListener(projectTypeListener_); - moduleProject_.removeModifyListener( moduleProjectListener_ ); - earProject_.removeModifyListener( earProjectListener_ ); - } - - /* - private void handleModuleProjectChanged(String moduleName) - { - String projectName = moduleProject_.getText(); - IProject project = null; - - if( projectName.equals( "" ) ) - { - module_.setItems( new String[0] ); - - return; - } - - project = ProjectUtilities.getProject( projectName ); - - - IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, componentType_ ); - String[] modules = new String[components.length]; - - for( int index = 0; index < components.length; index++ ) - { - modules[index] = components[index].getName(); - } - - module_.setItems( modules ); - - if( modules.length > 0 ) - { - if (moduleName != null) - { - module_.setText(moduleName); - } - else - { - module_.setText( modules[0] ); - } - - } - else - { - module_.setText( projectName ); - } - - } - */ - - /* - private void handleModuleChanged() - { - IVirtualComponent component = getEarModuleForModule(); - - if( component != null ) - { - String earProject = component.getProject().getName(); - String componentName = component.getName(); - - // This will cause the module list to be update via a listener. - earProject_.setText( earProject ); - earModule_.setText( componentName ); - } - else - { - earProject_.setText( "" ); - earModule_.setText( "" ); - } - - updateEAREnabledState(); - } - */ - - /* - private void handleEarProjectChanged() - { - - String projectName = earProject_.getText(); - - if( projectName != null && !projectName.equals( "" )) - { - IProject project = ProjectUtilities.getProject( projectName ); - - IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, J2EEUtils.EAR ); - String[] earModules = new String[components.length]; - - for( int index = 0; index < components.length; index++ ) - { - earModules[index] = components[index].getName(); - } - - earModule_.setItems( earModules ); - - if( earModules.length > 0 ) - { - earModule_.setText( earModules[0] ); - } - else - { - earModule_.setText( projectName ); - } - } - else - { - earModule_.setItems( new String[0] ); - } - } - */ - - /* - private IVirtualComponent getEarModuleForModule() - { - String projectName = moduleProject_.getText(); - - if( projectName.equals( "" ) ) - { - return null; - } - - IProject project = ProjectUtilities.getProject( projectName ); - - IVirtualComponent[] components = J2EEUtils.getReferencingEARComponents( project ); - - return components.length == 0 ? null : components[0]; - } - */ - - /* - public void setProjectChoices(SelectionListChoices projects) - { - listenersOff(); - - projects_ = projects; - - String selectedModuleProject = projects.getList().getSelection(); - String selectedEarModuleProject = projects.getChoice().getList().getSelection(); - String[] projectNames = getProjects(); - - moduleProject_.setItems( projectNames ); - moduleProject_.setText( selectedModuleProject ); - earProject_.setItems( projectNames ); - earProject_.setText( selectedEarModuleProject ); - - handleModuleProjectChanged(initialModuleName_); - handleModuleChanged(); - updateEAREnabledState(); - listenersOn(); - } - */ - - - - /* - public SelectionListChoices getProjectChoices() - { - return projects_; - } - */ - - public String getProjectName() - { - return moduleProject_.getText(); - } - - public void setProjectName( String name ) - { - listenersOff(); - moduleProject_.setText( name ); - handleProjectChanged(); - listenersOn(); - } - - public String getEarProjectName() - { - return earProject_.getText(); - } - - public void setEarProjectName( String name ) - { - listenersOff(); - earProject_.setText( name ); - listenersOn(); - } - - public void setComponentType( String type ) - { - projectType_.setText(type); - } - - public String getComponentType() - { - int idx = projectType_.getSelectionIndex(); - if (templates_ != null && idx > -1) - { - return templates_[idx]; - } - else - { - String templateLabel = projectType_.getText(); - String templateId = FacetUtils.getTemplateIdByLabel(templateLabel); - return templateId; - } - - } - - public boolean getNeedEAR() - { - return needEAR_; - } - - public void setNeedEAR(boolean b) - { - needEAR_ = b; - if (needEAR_) - { - earProject_.setEnabled(true); - populateEARCombos(); - } - else - { - earProject_.setEnabled(false); - earProject_.setText(""); - } - } - - public void setTypeRuntimeServer(TypeRuntimeServer trs) - { - trsIds_ = trs; - listenersOff(); - updateEARState(); - listenersOn(); - } - - public void refreshProjectItems() - { - listenersOff(); - String selectedModuleProject = moduleProject_.getText(); - String runtimeId = trsIds_.getRuntimeId(); - String typeId = trsIds_.getTypeId(); - - //Get all the projects that are compatible with the type and runtime - String[] projectNames = null; - if (isClient_) - { - projectNames = WebServiceRuntimeExtensionUtils2.getProjectsForClientTypeAndRuntime(typeId, runtimeId); - } - else - { - projectNames = WebServiceRuntimeExtensionUtils2.getProjectsForServiceTypeAndRuntime(typeId, runtimeId); - } - - moduleProject_.setItems(projectNames); - moduleProject_.setText(selectedModuleProject); - System.out.println("moduleProject_ = "+moduleProject_.getText()+".."); - handleProjectChanged(); - listenersOn(); - } - - public void setEarProjectItems() - { - IVirtualComponent[] ears = J2EEUtils.getAllEARComponents(); - String[] earProjectNames = new String[ears.length]; - for (int i=0; i<earProjectNames.length; i++) - { - earProjectNames[i]=ears[i].getProject().getName(); - } - earProject_.setItems(earProjectNames); - - if (earProjectNames.length > 0) - earProject_.select(0); - } - - private void handleProjectChanged() - { - updateEARState(); - updateTemplates(); - } - - private void updateTemplates() - { - String projectName = moduleProject_.getText(); - if (projectName != null && projectName.length()>0) - { - IProject project = ProjectUtilities.getProject(projectName); - if (project.exists()) - { - projectType_.setEnabled(false); - projectType_.setText(""); - } - else - { - populateProjectTypeCombo(); - projectType_.setEnabled(true); - } - } - } - - private void populateProjectTypeCombo() - { - String[] templates = null; - if (isClient_) - { - templates = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId()); - } - else - { - templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId()); - } - - String[] templateLabels = FacetUtils.getTemplateLabels(templates); - projectType_.setItems(templateLabels); - templates_ = templates; - - if (templates.length > 0) - { - //If a "..web.." template is there, pick that as the default. - int webTemplateIndex = getWebTemplateIndex(templates); - if (webTemplateIndex > -1) - { - projectType_.select(webTemplateIndex); - } - else - { - projectType_.select(0); - } - - } - } - - private int getWebTemplateIndex(String[] templateIds) - { - for (int i=0; i<templateIds.length; i++) - { - if (templateIds[i].indexOf("web") > -1) - { - return i; - } - } - - return -1; - } - - private void updateEARState() - { - if(!projectNeedsEAR(moduleProject_.getText())) - { - earProject_.setEnabled(false); - earProject_.setText(""); - needEAR_ = false; - } - else - { - needEAR_ = true; - earProject_.setEnabled(true); - populateEARCombos(); - } - - } - - private void populateEARCombos() - { - earProject_.removeAll(); - String projectName = moduleProject_.getText(); - if (projectName != null && projectName.length() > 0) - { - IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - if (proj.exists()) - { - IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(proj); - if (ears != null && ears.length > 0) - { - for (int i = 0; i < ears.length; i++) - { - earProject_.add(ears[i].getName()); - } - earProject_.select(0); - return; - } - } - - String earName = projectName + "EAR"; - earProject_.setText(earName); - } - else - { - setEarProjectItems(); - } - } - - private boolean projectNeedsEAR(String projectName) - { - //Use the server type - if (trsIds_ != null && trsIds_.getServerId() != null) - { - String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(trsIds_.getServerId()); - if (targetId!=null && targetId.length()>0) - { - if (!ServerUtils.isTargetValidForEAR(targetId,"13")) //rm j2ee - { - return false; - } - } - } - - return true; - } - - private IStatus handleSetMessageText() { - IStatus status = Status.OK_STATUS; - try { - byte result = (byte) 0; - if (moduleProject_.getText().length() != 0 && earProject_.getText().length() != 0) { - String projectText = moduleProject_.getText(); - String earText = earProject_.getText(); - IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText); - IProject ear = ResourceUtils.getWorkspaceRoot().getProject(earText); - if (project != null) { - if (!project.exists()) { - result = (byte) (result | CREATE_PROJECT); - } - if (!ear.exists()) { - result = (byte) (result | CREATE_EAR); - } - - if (project.exists() && J2EEUtils.exists(project) && ear.exists() && J2EEUtils.exists(ear)) { - if (!J2EEUtils.isComponentAssociated(ear, project)) result = (byte) (result | ADD_EAR_ASSOCIATION); - } - } - } - if (isClient_) { - messageText_.setText(getValidationMessage(result, ConsumptionUIMessages.MSG_CLIENT_SUB)); - } - else { - messageText_.setText(getValidationMessage(result, ConsumptionUIMessages.MSG_SERVICE_SUB)); - } - } - catch (Exception e) { - return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_VALIDATION_INTERNAL_ERROR, e ); - } - return status; - } - - private String getValidationMessage(byte result, String serviceOrClient) { - String msg = null; - switch (result) { - case 0: - return ""; - case 1: - case 5: - msg = ConsumptionUIMessages.MSG_PROJECT_WILL_BE_CREATED; - break; - case 2: - case 6: - msg = ConsumptionUIMessages.MSG_EAR_WILL_BE_CREATED; - break; - case 3: - case 7: - msg = ConsumptionUIMessages.MSG_PROJECT_AND_EAR_CREATED; - break; - case 4: - msg = ConsumptionUIMessages.MSG_EAR_WILL_BE_ASSOCIATED; - break; - } - return msg != null ? NLS.bind(msg, new Object[] { serviceOrClient}) : ""; - } - - public IStatus getStatus() - { - IStatus finalStatus = Status.OK_STATUS; - handleSetMessageText(); - String projectText = moduleProject_.getText(); - String earText = earProject_.getText(); - - if (projectText==null || projectText.length()==0) - { - if (isClient_) - return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_PROJECT_EMPTY, new String[]{""} ) ); - else - return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_PROJECT_EMPTY, new String[]{""} ) ); - } - - if (needEAR_ && (earText==null || earText.length()==0)) - { - if (isClient_) - return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_EAR_EMPTY, new String[]{""} ) ); - else - return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_EAR_EMPTY, new String[]{""} ) ); - } - - return finalStatus; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java deleted file mode 100644 index 43d7945ff..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java +++ /dev/null @@ -1,250 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.runtime; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.window.Window; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IServerType; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; - - - -public class RuntimeServerSelectionWidget extends SimpleWidgetDataContributor -{ - private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - private Text runtime_; - private Text server_; - - private Composite parent_; - private boolean isClientContext_; - private TypeRuntimeServer ids_; - - private Listener statusListener_; - - /* CONTEXT_ID PWRS0004 for the service-side runtime selection of the runtime selection Page */ - private String INFOPOP_PWRS_GROUP_SERVICE_RUNTIME = pluginId_ + ".PWRS0004"; - - /* CONTEXT_ID PWRS0005 for the service-sdie server selection of the runtime selection Page */ - private String INFOPOP_PWRS_GROUP_SERVICE_SERVER = pluginId_ + ".PWRS0005"; - - public RuntimeServerSelectionWidget( boolean isClientScenario ) - { - isClientContext_ = isClientScenario; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener) - */ - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - UIUtils uiUtils = new UIUtils( pluginId_ ); - - parent_ = parent; - statusListener_ = statusListener; - - // Runtime label and text - runtime_ = uiUtils.createText( parent, ConsumptionUIMessages.LABEL_RUNTIMES_LIST, - ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME, - INFOPOP_PWRS_GROUP_SERVICE_RUNTIME, SWT.READ_ONLY ); - - // Server label and text - server_ = uiUtils.createText( parent, ConsumptionUIMessages.LABEL_SERVERS_LIST, - ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER, - INFOPOP_PWRS_GROUP_SERVICE_SERVER, SWT.READ_ONLY ); - - Button editButton = new Button( parent, SWT.NONE ); - editButton.setText( ConsumptionUIMessages.LABEL_EDIT_BUTTON); - editButton.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleEditButton(); - } - } ); - - // Dummy label that goes on the right side of the edit button. - new Label( parent, SWT.NONE ); - - return this; - } - - public TypeRuntimeServer getTypeRuntimeServer() - { - return ids_; - } - - public void setTypeRuntimeServer( TypeRuntimeServer ids ) - { - ids_ = ids; - setLabels(); - } - - private void setLabels() - { - String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById( ids_.getRuntimeId() ); - String serverLabel = null; - - if( ids_.getServerInstanceId() == null ) - { - // Get the label for the general server type. - //WebServiceServer server = registry.getWebServiceServerByFactoryId( ids_.getServerId() ); - //serverLabel = server == null ? "" : server.getLabel(); - String serverId = ids_.getServerId(); - if (serverId != null) - serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId); - } - else - { - // Get the label for the server instance. - //serverLabel = registry.getServerInstanceLabelFromInstanceId( ids_.getServerInstanceId() ); - String serverInstanceId = ids_.getServerInstanceId(); - if (serverInstanceId != null) - serverLabel = WebServiceRuntimeExtensionUtils2.getServerInstanceLabelFromInstanceId(serverInstanceId); - } - // rskreg - runtimeLabel = runtimeLabel == null ? "" : runtimeLabel; - - runtime_.setText( runtimeLabel ); - if (serverLabel != null) - server_.setText( serverLabel ); - - } - - public void handleEditButton() - { - byte mode = isClientContext_ ? (byte)1 : (byte)0; - - RuntimeServerSelectionDialog dialog - = dialog = new RuntimeServerSelectionDialog( parent_.getShell(), mode, ids_, "14" ); //rm j2ee - dialog.create(); - dialog.handleServerViewSelectionEvent(); - int result = dialog.open(); - - if (result == Window.OK) - { - ids_ = dialog.getTypeRuntimeServer(); - setLabels(); - statusListener_.handleEvent(null); - } - } - - public void addModifyListener(ModifyListener listener) - { - if (runtime_ != null) - runtime_.addModifyListener(listener); - } - - public void removeModifyListener(ModifyListener listener) - { - if (runtime_ != null) - runtime_.removeModifyListener(listener); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus() - */ - public IStatus getStatus() - { - IStatus status = Status.OK_STATUS; - String scenario = isClientContext_ ? ConsumptionUIMessages.MSG_CLIENT_SUB - : ConsumptionUIMessages.MSG_SERVICE_SUB; - - String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById( ids_.getRuntimeId() ); - String serverLabel = ids_.getServerId() == null ? "" : WebServiceRuntimeExtensionUtils2.getServerLabelById(ids_.getServerId()); - - - if( ids_.getRuntimeId() == null || runtimeLabel == null || runtimeLabel.equals("" )) - { - status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME, new String[]{ scenario } ) ); - } - else if( ids_.getServerId() == null || serverLabel.equals( "" )) - { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER, new String[]{ scenario } ) ); - } - - //Check if only stub runtime is available for the selected server type - - String serverFactoryId = ids_.getServerId(); - // - IServerType serverType = ServerCore.findServerType(serverFactoryId); - if (serverType!=null) { - - //Find a Runtime which is not a stub - //IRuntime nonStubRuntime = null; - boolean foundNonStubRuntime = false; - IRuntime[] runtimes = ServerUtil.getRuntimes(null, null); - String serverRuntimeTypeId = serverType.getRuntimeType().getId(); - for (int i = 0; i < runtimes.length; i++) { - IRuntime runtime = runtimes[i]; - String thisRuntimeTypeId = runtime.getRuntimeType().getId(); - if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) { - //Found an appropriate IRuntime that is not a stub - foundNonStubRuntime=true; - break; - } - } - - if (!foundNonStubRuntime) - { - String servertypeLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId); - status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_STUB_ONLY,new String[]{servertypeLabel}) ); - } - } - - // - - //--------- check if WSCT exists for these selections - if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && isClientContext_) - { - - if (!WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported( ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) - { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[]{ scenario } ) ); - } - - } - - //--------- check if WSSRT exists for these selections - if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && !isClientContext_) - { - - if (!WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[]{ scenario } ) ); - } - - } - - - - return status; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java deleted file mode 100644 index c29b8d8f8..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java +++ /dev/null @@ -1,348 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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.ws.internal.consumption.ui.widgets.test; - -import java.util.List; -import java.util.Vector; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension; -import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry; -import org.eclipse.wst.command.internal.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; -import org.eclipse.wst.command.internal.env.core.selection.SelectionList; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.IStatusHandler; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester; -import org.eclipse.wst.ws.internal.wsrt.TestInfo; - - -/* -* The JSPGeneration task runs the jsp generation engine found in the -* JBWizard Plugin -* -* -*/ -public class ClientTestDelegateCommand extends AbstractDataModelOperation -{ - private WebServiceTestRegistry testRegistry; - private SelectionList testFacilities; - private String jspFolder; - private BooleanSelection[] methods; - private String sampleServerTypeID; - private IServer sampleExistingServer; - private String proxyBean; - private String sampleProject; - private String sampleP; - private String clientProject; - private String clientP; - private String clientC; - private boolean clientNeedEAR; - private String clientEarProjectName; - private String clientEarComponentName; - private TypeRuntimeServer serverIds; - private String serviceProject; - private String serviceP; - private String wsdlServiceURL; - private boolean isTestWidget = false; - private String setEndpointMethod; - private List endpoints; - - public ClientTestDelegateCommand () - { - testRegistry = WebServiceTestRegistry.getInstance(); - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - String clientTestID = testFacilities.getSelection(); - - //Get the webservice extension - - WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(clientTestID); - IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension(); - TestInfo testInfo = getTestInfo(); - - status = commandFactoryExecution(iwst.generate(testInfo),env, monitor ); - if(status.getSeverity() == Status.ERROR){ - return status; - } - status = commandFactoryExecution(iwst.launch(testInfo),env, monitor ); - if(status.getSeverity() == Status.ERROR){ - return status; - } - - return status; - } - - private IStatus commandFactoryExecution(ICommandFactory commandFactory,IEnvironment env, IProgressMonitor monitor ) - { - IStatus status = Status.OK_STATUS; - - while(commandFactory.hasNext()) - { - AbstractDataModelOperation operation = commandFactory.getNextCommand(); - operation.setEnvironment( env ); - - try - { - status = operation.execute( monitor, null ); - } - catch( Exception exc ) - { - status = StatusUtils.errorStatus( exc ); - } - - if(status.getSeverity() == Status.ERROR){ - IStatusHandler sHandler = env.getStatusHandler(); - sHandler.reportError(status); - return status; - } - } - return status; - } - - - //Helper method which sets up the TestInfo data structure - private TestInfo getTestInfo() - { - IServer serviceExistingServer = null; - String serviceServerTypeID = null; - - //service server info - if(serverIds != null){ - if (serverIds.getServerInstanceId() != null) - serviceExistingServer = ServerCore.findServer(serverIds.getServerInstanceId()); - } - if (serviceExistingServer != null) - serviceServerTypeID = serviceExistingServer.getServerType().getId(); - - - if(clientProject != null){ - int index = clientProject.indexOf("/"); - if (index!=-1){ - clientP = clientProject.substring(0,index); - clientC = clientProject.substring(index + 1); - } - } - - - if(sampleProject != null){ - int index = sampleProject.indexOf("/"); - if (index!=-1){ - sampleP = sampleProject.substring(0,index); - } - } - - - - TestInfo testInfo = new TestInfo(); - testInfo.setClientExistingServer(sampleExistingServer); - testInfo.setClientServerTypeID(sampleServerTypeID); - testInfo.setJspFolder(jspFolder); - testInfo.setEndpoint(endpoints); - testInfo.setGenerationProject(sampleP); - testInfo.setProxyBean(proxyBean); - testInfo.setSetEndpointMethod(setEndpointMethod); - testInfo.setClientProject(clientP); - testInfo.setClientModule(clientC); - testInfo.setClientNeedEAR(clientNeedEAR); - testInfo.setClientEARProject(clientEarProjectName); - testInfo.setClientEARModule(clientEarComponentName); - testInfo.setMethods(methods); - - //if this is a client scenario the service stuff is empty - if(serviceServerTypeID == null){ - serviceServerTypeID = sampleServerTypeID; - serviceExistingServer = sampleExistingServer; - } - - - testInfo.setServiceServerTypeID(serviceServerTypeID); - testInfo.setServiceExistingServer(serviceExistingServer); - //wsdl stuff - testInfo.setServiceProject(getWSDLProject()); - testInfo.setWsdlServiceURL(wsdlServiceURL); - return testInfo; - } - - - - //The test facilities retrieved from the extension - //plus the default - public void setTestFacility(SelectionList selection) - { - testFacilities = selection; - } - - public void setFolder(String folder) - { - } - - public void setJspFolder(String jspFolder) - { - this.jspFolder = jspFolder; - } - - public void setMethods(BooleanSelection[] methods) - { - this.methods = methods; - } - - public void setRunClientTest(boolean runClientTest) - { - } - - public void setProxyBean(String proxyBean) - { - this.proxyBean = proxyBean; - } - - public void setSampleProject(String sampleProject) - { - this.sampleProject = sampleProject; - } - - public void setClientProject(String clientProject) - { - this.clientProject = clientProject; - } - - public void setScenarioContext(ScenarioContext scenarioContext) - { - } - - public void setClientTestRegistry(WebServiceTestRegistry testRegistry) - { - this.testRegistry = testRegistry; - } - - public void setSampleServerTypeID(String sampleServerTypeID) - { - this.sampleServerTypeID = sampleServerTypeID; - } - - public void setSampleExistingServer(IServer sampleExistingServer) - { - this.sampleExistingServer = sampleExistingServer; - } - - public void setClientTypeRuntimeServer(TypeRuntimeServer ids) - { - } - - public void setServiceTypeRuntimeServer(TypeRuntimeServer ids) - { - serverIds = ids; - } - - public String getSampleServerTypeID() - { - return sampleServerTypeID; - } - - public IServer getSampleExistingServer() - { - return sampleExistingServer; - } - - public void setClientServer(String clientServer) - { - } - - public void setServerProject(String serviceProject) - { - this.serviceProject = serviceProject; - } - - public String getWSDLProject() - { - if(serviceProject != null){ - int index = serviceProject.indexOf("/"); - if (index!=-1) { - serviceP = serviceProject.substring(0,index); - return serviceP; - } - } - - return clientP; - } - - public void setWsdlURI(String wsdlServiceURL) - { - this.wsdlServiceURL = wsdlServiceURL; - } - - public void setGenerateProxy(boolean generateProxy) - { - } - - public boolean getIsTestWidget() - { - return isTestWidget; - } - - public void setClientEarProjectName(String clientEarProjectName) - { - this.clientEarProjectName = clientEarProjectName; - } - - public void setClientEarComponentName(String clientEarComponentName) - { - this.clientEarComponentName = clientEarComponentName; - } - - - - /** - * @param setEndpointMethod The setEndpointMethod to set. - */ - public void setSetEndpointMethod(String setEndpointMethod) - { - this.setEndpointMethod = setEndpointMethod; - } - /** - * @param endpoint The endpoint to set. - */ - public void setEndpoint(String endpoint) - { - if (endpoint != null && endpoint.length() > 0) - { - Vector v = new Vector(); - v.add(endpoint); - setEndpoints(v); - } - } - - public void setEndpoints(List endpoints) - { - this.endpoints = endpoints; - } - - public boolean getClientNeedEAR() { - return clientNeedEAR; - } - - public void setClientNeedEAR(boolean clientNeedEAR) { - this.clientNeedEAR = clientNeedEAR; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java deleted file mode 100644 index f86bb2619..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; - - -public class ClientTestFragment extends BooleanFragment -{ - private boolean testService; - private boolean genProxy; - private boolean launchedTest = false; - - public ClientTestFragment( String id ) - { - SequenceFragment clientTestRoot = new SequenceFragment(); - Condition condition = new Condition() - { - public boolean evaluate() - { - return testService && genProxy; - } - }; - setCondition( condition ); - - clientTestRoot.add( new SimpleFragment( new WebServiceClientTestArrivalCommand(), "" ) ); - clientTestRoot.add( new SimpleFragment( id ) ); - setTrueFragment( clientTestRoot ); - - } - - public void setGenerateProxy( boolean genProxy ) - { - this.genProxy = genProxy; - } - - public void setTestService( Boolean testService ) - { - this.testService = testService.booleanValue(); - } - - public boolean getLaunchedTest() - { - return launchedTest; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java deleted file mode 100644 index 9021919ad..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java +++ /dev/null @@ -1,415 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.common.FolderResourceFilter; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; -import org.eclipse.wst.command.internal.env.core.selection.SelectionList; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - - -public class ClientTestWidget extends SimpleWidgetDataContributor -{ - private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; - - /*CONTEXT_ID PWSM0001 for the Sample Page*/ - private String INFOPOP_PWSM_PAGE = "PWSM0001"; - // - private Button testCheckbox_; - /*CONTEXT_ID PWSM0002 for the Test check box of the Sample Page*/ - private String INFOPOP_PWSM_CHECKBOX_TEST = "PWSM0002"; - - private Combo testTypeCombo_; - /*CONTEXT_ID PWSM0003 for the Test Type Combo box of the Sample Page*/ - private String INFOPOP_PWSM_COMBOBOX_TEST = "PWSM0003"; - - private Text jspFolderText_; - /*CONTEXT_ID PWSM0008 for the JSP Folder field of the Sample Page*/ - private String INFOPOP_PWSM_TEXT_JSP_FOLDER = "PWSM0008"; - - private Button sampleFolderBrowseButton_; - /*CONTEXT_ID PWSM0009 for the JSP Folder Browse button of the Sample Page*/ - private String INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE = "PWSM0009"; - - private Combo projectCombo_; - /*CONTEXT_ID PWSM0010 for the Project combo box of the Sample Page*/ - private String INFOPOP_PWSM_COMBO_PROJECT = "PWSM0010"; - - private Tree methodsTree_; - - private Button selectAllMethodsButton_; - /*CONTEXT_ID PWSM0006 for the Select All button of the Sample Page*/ - private String INFOPOP_PWSM_BUTTON_SELECT_ALL = "PWSM0006"; - - private Button deselectAllMethodsButton_; - /*CONTEXT_ID PWSM0007 for the Deselect All button of the Sample Page*/ - private String INFOPOP_PWSM_BUTTON_DESELECT_ALL = "PWSM0007"; - - private Text sampleFolderText_; - /*CONTEXT_ID PWSM0014 for the Folder field of the Sample Page*/ - private String INFOPOP_PWSM_TEXT_SAMPLE_FOLDER = "PWSM0014"; - // - private Button runTestCheckbox_; - /*CONTEXT_ID PWSM0015 for the run test check box of the Sample Page*/ - private String INFOPOP_PWSM_CHECKBOX_LAUNCH = "PWSM0015"; - // - private Combo earCombo_; - /*CONTEXT_ID PWSM0016 for the EAR combo box of the Sample Page*/ - private String INFOPOP_PWSM_EAR_COMBO = "PWSM0016"; - - private Composite comboGroup_; - private SelectionList testFacilities_; - private FolderResourceFilter folderFilter_ = new FolderResourceFilter(); - private IStructuredSelection initialSelection_; - private boolean isTestWidget = false; - - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - isTestWidget = true; - UIUtils uiUtils = new UIUtils( pluginId_ ); - - parent.setToolTipText( ConsumptionUIMessages.TOOLTIP_PWSM_PAGE ); - PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWSM_PAGE ); - - testCheckbox_ = uiUtils.createCheckbox( parent, ConsumptionUIMessages.BUTTON_TEST, - ConsumptionUIMessages.TOOLTIP_PWSM_CHECKBOX_TEST, - INFOPOP_PWSM_CHECKBOX_TEST ); - testCheckbox_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleTestButton(); - } - }); - - comboGroup_ = uiUtils.createComposite( parent, 3, 5, 0 ); - - testTypeCombo_ = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_TEST_TYPES, - ConsumptionUIMessages.TOOLTIP_PWSM_COMBOBOX_TEST, - INFOPOP_PWSM_COMBOBOX_TEST, - SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY ); - new Label( comboGroup_, SWT.NONE ); - - projectCombo_ = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_JSP_PROJECT_NAME, - ConsumptionUIMessages.TOOLTIP_PWSM_COMBO_PROJECT, - INFOPOP_PWSM_COMBO_PROJECT, - SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY ); - projectCombo_.setEnabled( false ); - new Label( comboGroup_, SWT.NONE ); - - - earCombo_ = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_EAR_PROJECTS, - ConsumptionUIMessages.TOOLTIP_PWSM_EAR_PROJECT, - INFOPOP_PWSM_EAR_COMBO, - SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY ); - earCombo_.setEnabled( false ); - new Label( comboGroup_, SWT.NONE ); - - - - sampleFolderText_ = uiUtils.createText( comboGroup_, ConsumptionUIMessages.LABEL_FOLDER_NAME, - ConsumptionUIMessages.TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER, - INFOPOP_PWSM_TEXT_SAMPLE_FOLDER, - SWT.SINGLE | SWT.BORDER ); - - sampleFolderText_.addModifyListener( new ModifyListener() - { - public void modifyText( ModifyEvent evt ) - { - handleFolderText(); - } - }); - - - sampleFolderBrowseButton_ = uiUtils.createPushButton( comboGroup_, ConsumptionUIMessages.BUTTON_BROWSE, - ConsumptionUIMessages.TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE, - INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE ); - sampleFolderBrowseButton_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleSampleBrowse(); - } - }); - - jspFolderText_ = uiUtils.createText( comboGroup_, ConsumptionUIMessages.LABEL_JSP_FOLDER_NAME, - ConsumptionUIMessages.TOOLTIP_PWSM_TEXT_JSP_FOLDER, - INFOPOP_PWSM_TEXT_JSP_FOLDER, - SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY ); - jspFolderText_.setEnabled( false ); - - Group methodsGroup = uiUtils.createGroup( parent, ConsumptionUIMessages.LABEL_METHODS, - ConsumptionUIMessages.TOOLTIP_PWSM_TREE_METHODS, null ); - - methodsGroup.setLayoutData( uiUtils.createFillAll() ); - - GridLayout layout = new GridLayout(); - layout.marginHeight = 0; - layout.marginWidth = 0; - methodsGroup.setLayout( layout ); - - // TODO No infopop for this tree. - methodsTree_ = uiUtils.createTree( methodsGroup, ConsumptionUIMessages.TOOLTIP_PWSM_TREE_METHODS, - null, - SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK ); - - Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 ); - - selectAllMethodsButton_ - = uiUtils.createPushButton( selectButtons, ConsumptionUIMessages.BUTTON_SELECT_ALL, - ConsumptionUIMessages.TOOLTIP_PWSM_BUTTON_SELECT_ALL, - INFOPOP_PWSM_BUTTON_SELECT_ALL ); - selectAllMethodsButton_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleSelectAll( true ); - } - }); - - deselectAllMethodsButton_ - = uiUtils.createPushButton( selectButtons, ConsumptionUIMessages.BUTTON_DESELECT_ALL, - ConsumptionUIMessages.TOOLTIP_PWSM_BUTTON_DESELECT_ALL, - INFOPOP_PWSM_BUTTON_DESELECT_ALL ); - deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleSelectAll( false ); - } - }); - - runTestCheckbox_ = uiUtils.createCheckbox( parent, ConsumptionUIMessages.BUTTON_RUN_TEST, - ConsumptionUIMessages.TOOLTIP_PWSM_CHECKBOX_LAUNCH, - INFOPOP_PWSM_CHECKBOX_LAUNCH ); - - return this; - } - - private void handleFolderText() - { - String folder = sampleFolderText_.getText(); - String jspFolder = jspFolderText_.getText(); - int index = jspFolder.lastIndexOf(Path.SEPARATOR); - if(index == -1) return; - jspFolder = jspFolder.substring(0,index + 1); - jspFolder = jspFolder + folder; - jspFolderText_.setText(jspFolder); - } - - private void handleSampleBrowse() - { - IPath selectedPath = null; - IResource initialResource = null; - IPath projectPath = new Path( projectCombo_.getText() ).makeAbsolute(); - IResource project = ResourceUtils.findResource( projectPath ); -// IContainer webModuleContainer = ResourceUtils.getWebModuleServerRoot( (IProject)project); - IContainer webModuleContainer = J2EEUtils.getFirstWebContentContainer((IProject)project); - try - { - initialResource = ResourceUtils.getResourceFromSelection( initialSelection_ ); - } - catch( CoreException exc ) - { - } - - if( initialResource == null )initialResource = project; - - IResource resource = DialogUtils.browseResources( comboGroup_.getShell(), - project, - initialResource, - folderFilter_ ); - - if( resource != null ) - { - selectedPath = resource.getFullPath(); - - int webModuleSegments = selectedPath.matchingFirstSegments(webModuleContainer.getFullPath()); - - if ( webModuleSegments < 2 ) - { - sampleFolderText_.setText(""); - handleFolderText(); - } - else - { - sampleFolderText_.setText(selectedPath.removeFirstSegments(webModuleSegments).toString()); - handleFolderText(); - } - } - } - - private void handleTestButton() - { - boolean enabled = testCheckbox_.getSelection(); - - testTypeCombo_.setEnabled( enabled ); - sampleFolderText_.setEnabled( enabled ); - methodsTree_.setEnabled( enabled ); - runTestCheckbox_.setEnabled( enabled ); - selectAllMethodsButton_.setEnabled( enabled ); - deselectAllMethodsButton_.setEnabled( enabled ); - sampleFolderBrowseButton_.setEnabled( enabled ); - } - - private void handleSelectAll( boolean value ) - { - TreeItem[] items = methodsTree_.getItems(); - - for( int i = 0; i < items.length; i++ ) - { - items[i].setChecked(value); - } - } - - // Here are the getters and setters for this widget. - public void setTestService( Boolean testService ) - { - testCheckbox_.setSelection( testService.booleanValue() ); - handleTestButton(); - } - - public Boolean getTestService() - { - return new Boolean( testCheckbox_.getSelection() ); - } - - public void setTestFacility( SelectionList testFacilities ) - { - testFacilities_ = testFacilities; - testTypeCombo_.setItems( testFacilities.getList() ); - testTypeCombo_.select( testFacilities.getIndex() ); - } - - public SelectionList getTestFacility() - { - testFacilities_.setIndex( testTypeCombo_.getSelectionIndex() ); - return testFacilities_; - } - - public String getTestID() - { - return testTypeCombo_.getText(); - } - - public void setSampleProject(String clientProject) - { - projectCombo_.setItems( new String[]{ clientProject } ); - projectCombo_.select(0); - } - - public void setSampleProjectEAR(String clientProjectEAR) - { - earCombo_.setItems( new String[]{ clientProjectEAR } ); - earCombo_.select(0); - } - - public String getFolder() - { - return sampleFolderText_.getText(); - } - - public void setFolder( String folder ) - { - sampleFolderText_.setText( folder ); - } - - public boolean getIsTestWidget() - { - return isTestWidget; - } - - public void setJspFolder( String folder ) - { - jspFolderText_.setText( folder ); - } - - public String getJspFolder() - { - return jspFolderText_.getText(); - } - - public void setLaunchedServiceTestName (String launchedServiceTestName) - { - } - - public boolean getRunClientTest() - { - return runTestCheckbox_.getSelection(); - } - - public void setRunClientTest( boolean value ) - { - runTestCheckbox_.setSelection( value ); - } - - public BooleanSelection[] getMethods() - { - TreeItem[] items = methodsTree_.getItems(); - BooleanSelection[] methods = new BooleanSelection[items.length]; - - for( int index = 0; index < items.length; index++ ) - { - methods[index] = new BooleanSelection( items[index].getText(), items[index].getChecked() ); - } - - return methods; - } - - public void setMethods( BooleanSelection[] methods ) - { - methodsTree_.removeAll(); - - for( int index = 0; index < methods.length; index++ ) - { - if(methods[index] == null)continue; - TreeItem item = new TreeItem( methodsTree_, SWT.NULL ); - item.setText( methods[index].getValue() ); - item.setChecked( methods[index].isSelected() ); - } - } - - public void setInitialSelection( IStructuredSelection selection ) - { - initialSelection_ = selection; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java deleted file mode 100644 index bb5e85a61..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java +++ /dev/null @@ -1,123 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Plugin; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.IStatusHandler; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -public class CopyWebServiceUtilsJarCommand extends AbstractDataModelOperation -{ - private String sampleProject; - -/** - * Default CTOR; - */ - - -public CopyWebServiceUtilsJarCommand() -{ - -} - -/** - * Execute the command - */ -public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) -{ - IEnvironment env = getEnvironment(); - - try - { - ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_COPY_WEBSERVICE_UTILS ); - IProject sampleIProject = ProjectUtilities.getProject(sampleProject); - IPath webModulePath = J2EEUtils.getWebContentPath(sampleIProject); - if (webModulePath == null) - return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND ); - - IStatus status = copyIFile("webserviceutils.jar",webModulePath,"WEB-INF/lib/webserviceutils.jar", WebServiceConsumptionPlugin.getInstance(),env, monitor); - if(status.getSeverity() == Status.ERROR){ - IStatusHandler sHandler = env.getStatusHandler(); - IStatus errorStatus = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS ); - sHandler.reportError(errorStatus); - return status; - } - - - } - catch (Exception e) { - IStatusHandler sHandler = env.getStatusHandler(); - IStatus errorStatus = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS ); - sHandler.reportError(errorStatus); - return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS, e); - } - return Status.OK_STATUS; -} - -/** - * - */ -private IStatus copyIFile(String source, IPath targetPath, String targetFile, Plugin plugin,IEnvironment env, IProgressMonitor monitor ) -{ - - if (plugin != null) - { - IPath target = targetPath.append(new Path(targetFile)); - - ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_COPYING_FILE ); - try - { - ResourceContext context = new TransientResourceContext(); - context.setOverwriteFilesEnabled(true); - context.setCreateFoldersEnabled(true); - context.setCheckoutFilesEnabled(true); - IResource resource = FileResourceUtils.findResource(target); - if(resource != null) return Status.OK_STATUS; - FileResourceUtils.createFile(context, - target, - plugin.openStream(new Path(source)), - monitor, - env.getStatusHandler()); - } - catch (Exception e) { - return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS ,e); - } - } - return Status.OK_STATUS; -} - -public void setSampleProject(String sampleProject) -{ - this.sampleProject = sampleProject; -} - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java deleted file mode 100644 index e6828443d..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java +++ /dev/null @@ -1,174 +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.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; - -public class CreateSampleProjectCommand extends AbstractDataModelOperation -{ - private String sampleProject; - private String sampleProjectEar; - private IServer existingServer; - private String serverFactoryId; - private boolean needEAR; - private String j2eeVersion; - - - public CreateSampleProjectCommand() - { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - if (!root.getProject(sampleProject).exists() || !root.getProject(sampleProjectEar).exists()) - { - //Do the following - //1. Create the Web project/component to house the sample JSPs. - //2. If needEAR is true then - // - create a EAR project and component if it doesn't exist - // - add the Web component to the EAR component - //3. Add the right component to the server. - CreateModuleCommand command = new CreateModuleCommand(); - command.setProjectName(sampleProject); - command.setModuleName(sampleProject); - command.setModuleType(CreateModuleCommand.WEB); - command.setServerFactoryId(serverFactoryId); - command.setServerInstanceId(existingServer.getId()); - command.setJ2eeLevel(j2eeVersion); - command.setEnvironment( env ); - IStatus status = command.execute( monitor, null ) ; - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - return status; - } - - if (needEAR) - { - CreateModuleCommand commandEAR = new CreateModuleCommand(); - commandEAR.setProjectName(sampleProjectEar); - //TODO The EAR component name is not necessarily the same as the project name - //so the component name needs to somehow be piped into this command - commandEAR.setModuleName(sampleProjectEar); - commandEAR.setModuleType(CreateModuleCommand.EAR); - commandEAR.setServerFactoryId(serverFactoryId); - commandEAR.setServerInstanceId(existingServer.getId()); - commandEAR.setJ2eeLevel(j2eeVersion); - commandEAR.setEnvironment( env ); - status = commandEAR.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - return status; - } - - - //Associate the service module and service EAR - AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand(); - associateCommand.setProject(sampleProject); - associateCommand.setModule(sampleProject); - associateCommand.setEARProject(sampleProjectEar); - //TODO The EAR component name is not necessarily the same as the project name - //so the component name needs to somehow be piped into this command - associateCommand.setEar(sampleProjectEar); - associateCommand.setEnvironment( env ); - status = associateCommand.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - return status; - } - - //Add the EAR to the server - AddModuleToServerCommand commandInstall = new AddModuleToServerCommand(); - commandInstall.setServerInstanceId(existingServer.getId()); - commandInstall.setProject(sampleProjectEar); - //TODO The EAR component name is not necessarily the same as the project name - //so the component name needs to somehow be piped into this command - commandInstall.setModule(sampleProjectEar); - commandInstall.setEnvironment( env ); - status = commandInstall.execute( monitor, null ) ; - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - return status; - } - } - else - { - //Add the Web component to the server - AddModuleToServerCommand commandInstall = new AddModuleToServerCommand(); - commandInstall.setServerInstanceId(existingServer.getId()); - commandInstall.setProject(sampleProject); - commandInstall.setModule(sampleProject); - commandInstall.setEnvironment( env ); - - status = commandInstall.execute( monitor, null ) ; - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - return status; - } - } - - } - return Status.OK_STATUS; - } - - public void setSampleProject(String sampleProject) - { - this.sampleProject = sampleProject; - } - - public void setSampleProjectEAR(String sampleProjectEar) - { - this.sampleProjectEar = sampleProjectEar; - } - - public void setExistingServer(IServer existingServer) { - - this.existingServer = existingServer; - } - - public void setServerFactoryId(String serverFactoryId) - { - this.serverFactoryId = serverFactoryId; - } - - /** - * @param needEAR The needEAR to set. - */ - public void setNeedEAR(boolean needEAR) - { - this.needEAR = needEAR; - } - - /** - * @param version The j2eeVersion to set. - */ - public void setJ2eeVersion(String version) - { - j2eeVersion = version; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java deleted file mode 100644 index 9c6df0cba..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; - - -/* -* The JSPGeneration task runs the jsp generation engine found in the -* JBWizard Plugin -* -* -*/ -public class FinishDefaultCommand extends AbstractDataModelOperation -{ - private String sampleServerTypeID; - private IServer sampleExistingServer; - private String sampleServerInstanceId; - - - public FinishDefaultCommand () - { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - if(sampleServerInstanceId != null){ - sampleExistingServer = ServerCore.findServer(sampleServerInstanceId); - if (sampleExistingServer != null) - sampleServerTypeID = sampleExistingServer.getServerType().getId(); - - } - return status; - - } - - public void setServerInstanceId(String serverInstanceId) - { - this.sampleServerInstanceId = serverInstanceId; - } - - public String getSampleServerTypeID() - { - return sampleServerTypeID; - - } - - public IServer getSampleExistingServer() - { - return sampleExistingServer; - } - - public void setExistingServerId(String existingServerId) - { - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java deleted file mode 100644 index f90c1b5ac..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -/* - * Created on May 4, 2004 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand; -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; - - -/** - * @author gilberta - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class FinishJavaTestFragment extends BooleanFragment -{ - private boolean generateProxy; - - public FinishJavaTestFragment() - { - SequenceFragment javaTestRoot = new SequenceFragment(); - Condition condition = new Condition() - { - public boolean evaluate() - { - return generateProxy; - } - }; - setCondition(condition); - javaTestRoot.add(new SimpleFragment(new TestClientDepartureInitCommand(), "")); - javaTestRoot.add(new SimpleFragment(new BuildProjectCommand(), "")); - setTrueFragment(javaTestRoot); - } - - public void setGenerateProxy(boolean generateProxy) - { - this.generateProxy = generateProxy; - } - - public void setIsJSPGen(boolean jspGen) - { - - } - - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java deleted file mode 100644 index aeb174ab7..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -/* - * Created on May 4, 2004 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension; -import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; - - -/** - * @author gilberta - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class FinishTestFragment extends BooleanFragment{ - - private boolean isTestWidget; - private boolean generateProxy; - private String launchedServiceTestName; - private boolean testService; - private String testID; - public FinishTestFragment() - { - Condition condition = new Condition() - { - public boolean evaluate() - { - if(!testService) return false; - if(launchedServiceTestName == null) return true; - if(launchedServiceTestName != null) - if((!launchedServiceTestName.equals("") && (!isPreferedAWSDLTest() || (isTestWidget && isClientTestJava())) && generateProxy) || launchedServiceTestName.equals("")) return true; - - return false; - } - }; - - setTrueFragment(new WebServiceTestClientDepartureFragment()); - setCondition(condition); - } - - public void setLaunchedServiceTestName(String launchedServiceTestName) - { - this.launchedServiceTestName = launchedServiceTestName; - } - - public boolean isPreferedAWSDLTest() - { - ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy(); - String[] testTypes = scenarioContext.getWebServiceTestTypes(); - WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance(); - WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[0]); - if(wscte.testWSDL()) - return true; - return false; - } - - public boolean isClientTestJava() - { - if(testID == null) return false; - WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance(); - WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testID); - if(!wscte.testWSDL()) - return true; - return false; - } - - - public void setTestService(boolean testService) - { - this.testService = testService; - } - - public void setGenerateProxy(boolean generateProxy) - { - this.generateProxy = generateProxy; - } - - public void setTestID(String testID) - { - this.testID = testID; - } - - public void setIsTestWidget(boolean isTestWidget) - { - this.isTestWidget = isTestWidget; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java deleted file mode 100644 index 6c61ebaaa..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -/* - * Created on Mar 25, 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - -/** - * @author gilberta - * - * To change the template for this generated type comment go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -public class TestClientDepartureInitCommand extends AbstractDataModelOperation -{ - - private boolean forceBuild; - - public TestClientDepartureInitCommand() - { - forceBuild = true; - } - - public boolean getForceBuild() - { - return forceBuild; - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java deleted file mode 100644 index d3e5fb5b5..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java +++ /dev/null @@ -1,95 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -/* - * Created on May 4, 2004 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.wst.command.internal.env.core.selection.SelectionList; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -/** - * @author gilberta - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class TestDefaultingFragment extends AbstractDataModelOperation -{ - - private SelectionList testFacilities; - private String launchedServiceTestName; - private ScenarioContext scenarioContext; - - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - - scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy(); - // test facilities - selectTestFacility(); - return status; - } - - // The test facilities retrieved from the extension - // plus the default - public SelectionList getTestFacility() - { - return testFacilities; - } - - - - // *********************** - // This method uses the preference to - // select the correct test facility - // - //*********************** - private void selectTestFacility() - { - //if we find something we launched earlier - //put it on the bottom - String[] testTypes = scenarioContext.getWebServiceTestTypes(); - String[] newTestTypes = new String[testTypes.length]; - boolean launched = false; - int j = 0; - for(int i = 0;i<testTypes.length;i++){ - if(testTypes[i].equals(launchedServiceTestName)) - launched = true; - else{ - newTestTypes[j] = testTypes[i]; - j++; - } - } - - if(launched) - newTestTypes[testTypes.length - 1] = launchedServiceTestName; - - testFacilities = new SelectionList(newTestTypes,0); - } - - public void setLaunchedServiceTestName(String launchedServiceTestName) - { - this.launchedServiceTestName = launchedServiceTestName; - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java deleted file mode 100644 index a4efaabcb..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java +++ /dev/null @@ -1,54 +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.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.wst.command.internal.env.core.ICommandFactory; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.ISelection; -import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; - -public class TestWebServiceClient extends AbstractWebServiceClient { - - public TestWebServiceClient(WebServiceClientInfo clientInfo){ - super(clientInfo); - } - - public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, - String project, String earProject){ - return null; - } - - public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, - String project, String earProject){ - return null; - } - - - public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, - String project, String earProject){ - return null; - } - - public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, - String project, String earProject){ - return null; - } - - - public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, - String project, String earProject){ - return null; - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java deleted file mode 100644 index 07f436804..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -/* - * Created on May 4, 2004 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; - -/** - * @author gilberta - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class WSDLFinishFragment extends BooleanFragment{ - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java deleted file mode 100644 index f1102969b..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java +++ /dev/null @@ -1,186 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -/* - * Created on May 4, 2004 - * - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; - -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension; -import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry; -import org.eclipse.wst.command.internal.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.IStatusHandler; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester; -import org.eclipse.wst.ws.internal.wsrt.TestInfo; - -/** - * @author gilberta - * - * Window - Preferences - Java - Code Style - Code Templates - */ -public class WSDLTestLaunchCommand extends AbstractDataModelOperation -{ - private String testID; - private String launchedServiceTestName; - private TypeRuntimeServer serviceids; - private String serverProject; - private String serverModule; - private String wsdlURI; - private List endpoints; - private IServer serviceExistingServer = null; - private String serviceServerTypeID = null; - private String serviceServerInstanceId = null; - - public WSDLTestLaunchCommand() - { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - - WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance(); - WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(testID); - IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension(); - TestInfo testInfo = getTestInfo(); - - - status = commandFactoryExecution(iwst.launch(testInfo),env, monitor); - - //Dont need to shut everything down because the wsdl test doesnt work - if(status.getSeverity() != Status.OK){ - IStatusHandler sHandler = env.getStatusHandler(); - IStatus infoStatus = StatusUtils.infoStatus( ConsumptionUIMessages.MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST ); - sHandler.reportInfo(infoStatus); - return infoStatus; - } - return status; - - } - - private IStatus commandFactoryExecution(ICommandFactory commandFactory,IEnvironment env, IProgressMonitor monitor) - { - IStatus status = Status.OK_STATUS; - while(commandFactory.hasNext()) - { - AbstractDataModelOperation operation = commandFactory.getNextCommand(); - - if (operation != null) - { - try - { - operation.setEnvironment( env ); - status = operation.execute( monitor, null ); - } - catch( Exception exc ) - { - status = StatusUtils.errorStatus( exc ); - } - } - - if(status.getSeverity() == Status.ERROR){ - IStatusHandler sHandler = env.getStatusHandler(); - sHandler.reportError(status); - return status; - } - } - return status; - } - - - private TestInfo getTestInfo() - { - // get the server stuff - if (serviceids.getServerInstanceId() != null) - serviceExistingServer = ServerCore.findServer(serviceids.getServerInstanceId()); - else if (serviceServerInstanceId!=null) - serviceExistingServer = ServerCore.findServer(serviceServerInstanceId); - - if (serviceExistingServer != null) - serviceServerTypeID = serviceExistingServer.getServerType().getId(); - else - serviceServerTypeID = serviceids.getServerId(); - // server will be created in ServerDeployableConfigurationCommand - - TestInfo testInfo = new TestInfo(); - if (serviceExistingServer!=null) - testInfo.setServiceExistingServer(serviceExistingServer); - testInfo.setServiceServerTypeID(serviceServerTypeID); - testInfo.setServiceProject(serverProject); - testInfo.setWsdlServiceURL(wsdlURI); - testInfo.setEndpoint(endpoints); - return testInfo; - - } - - - public void setTestID(String testID) - { - this.testID = testID; - } - - public String getLaunchedServiceTestName() - { - return launchedServiceTestName; - } - public void setWsdlURI(String wsdlURI) - { - this.wsdlURI = wsdlURI; - } - - public void setServerProject(String serverProject) - { - this.serverProject = serverProject; - } - - - public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids) - { - this.serviceids = serviceids; - } - - public void setExternalBrowser(boolean externalBrowser) - { - } - - public void setEndpoint(List endpoints) - { - this.endpoints = endpoints; - } - -public String getServerModule() { - return serverModule; -} - -public void setServerModule(String serverModule) { - this.serverModule = serverModule; -} - -public void setServiceServerInstanceId(String ssInstanceId){ - this.serviceServerInstanceId = ssInstanceId; -} - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java deleted file mode 100644 index 920259315..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java +++ /dev/null @@ -1,234 +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.ws.internal.consumption.ui.widgets.test; - -import java.util.List; -import java.util.ListIterator; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.java.JavaClass; -import org.eclipse.jem.java.JavaHelpers; -import org.eclipse.jem.java.Method; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.IStatusHandler; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -/** -* This task sets up all the defaults for the webservice test -* client page -* -*/ -public class WebServiceClientTestArrivalCommand extends AbstractDataModelOperation -{ - public static final String DEFAULT_WEB_MODULE_ROOT = "WebContent"; - public static final String DEFAULT_SAMPLE_WEB_PROJECT_EXT = "Sample"; - - public static String SAMPLE_DIR = "sample"; - - private String clientProject; - private String clientProjectEAR; - private String clientP; - private String clientC; - private IProject clientIProject; - private String folder; - private String jspFolder; - private BooleanSelection[] methods; - private String proxyBean; - private String sampleProject; - private String sampleP; - private String sampleC; - private String sampleProjectEAR; - - - - /** - * Constructs a new WebServiceClientTestArrivalTask object with the given label and description. - */ - public WebServiceClientTestArrivalCommand () - { - - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - - sampleProjectAndEarSetup(env); - - //Get the sample Folder ready - StringBuffer sb = new StringBuffer(); - - sb.append("/").append(sampleC).append("/").append(DEFAULT_WEB_MODULE_ROOT).append("/"); - folder = SAMPLE_DIR + getBean(); - - sb.append(folder); - jspFolder = sb.toString(); - - //get the method names ready - //find the full path of the file in the project - /* - * Getting the method names using javamof introspection - */ - if(proxyBean == null){ - IStatusHandler sHandler = env.getStatusHandler(); - IStatus errorStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED ); - sHandler.reportError(errorStatus); - return errorStatus; - - } - - - JavaMofReflectionCommand javamofcommand = new JavaMofReflectionCommand(); - javamofcommand.setProxyBean(proxyBean); - javamofcommand.setClientProject(clientP); - javamofcommand.setEnvironment( env ); - - - - try{ - IStatus mofStatus = javamofcommand.execute( monitor, null); - if(mofStatus.getSeverity() == Status.ERROR) - return mofStatus; - }catch(Exception exc){ - IStatusHandler sHandler = env.getStatusHandler(); - IStatus errorStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED ); - sHandler.reportError(errorStatus); - return errorStatus; - } - JavaHelpers javaHelpers = javamofcommand.getJavaClass(); - if (javaHelpers == null) return status; - - JavaClass javaClass = null; - if(javaHelpers instanceof JavaClass) - javaClass = (JavaClass)javaHelpers; - else return status; - List methodList = javaClass.getPublicMethods(); - BooleanSelection[] tempMethods = new BooleanSelection[methodList.size()]; - ListIterator listIterator = methodList.listIterator(); - - int j = 0; - while (listIterator.hasNext()) - { - Method method = (Method)listIterator.next(); - if(method.isConstructor()) continue; - - tempMethods[j] = new BooleanSelection( method.getMethodElementSignature(), true); - j++; - } - methods = tempMethods; - return status; - } - public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR"; - - private void sampleProjectAndEarSetup(IEnvironment env) - { - if(clientProject == null) return; - else{ - int index = clientProject.indexOf("/"); - clientP = clientProject.substring(0,index); - clientC = clientProject.substring(index + 1); - } - - clientIProject = (IProject)ProjectUtilities.getProject(clientP); - - if(J2EEUtils.isWebComponent(clientIProject)){ - sampleProject = clientProject; - sampleP = clientP; - sampleC = clientC; - } - else{ - sampleP = clientP + DEFAULT_SAMPLE_WEB_PROJECT_EXT; - sampleC = clientC + DEFAULT_SAMPLE_WEB_PROJECT_EXT; - sampleProject = sampleP + "/" + sampleC; - - - } - sampleProjectEAR = clientProjectEAR; - if (sampleProjectEAR == null || sampleProjectEAR.length()==0){ - sampleProjectEAR = sampleP + DEFAULT_SAMPLE_EAR_PROJECT_EXT + "/" + sampleC + DEFAULT_SAMPLE_EAR_PROJECT_EXT; - } - - } - - //getters and setters - - private String getBean() - { - int index = proxyBean.lastIndexOf("."); - String end = ""; - if(index != -1){ - end = proxyBean.substring(index + 1); - } - String bean = end.substring(0,end.length()); - - return bean; - } - - - - - public String getFolder() - { - return folder; - } - - public String getJspFolder() - { - return jspFolder; - } - - public BooleanSelection[] getMethods() - { - return methods; - } - - public String getSampleProject() - { - return sampleProject; - } - - public void setClientProject(String clientProject) - { - this.clientProject = clientProject; - } - - - public void setClientProjectEAR(String clientProjectEAR) - { - this.clientProjectEAR = clientProjectEAR; - } - - - public void setProxyBean(String proxyBean) - { - this.proxyBean = proxyBean; - } - - public String getSampleProjectEAR() - { - return sampleProjectEAR; - } - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java deleted file mode 100644 index 00bdfd0b4..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -/* - * Created on Mar 25, 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; - -import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; - - -/** - * @author gilberta - * - * To change the template for this generated type comment go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -public class WebServiceTestClientDepartureFragment extends SequenceFragment -{ - public WebServiceTestClientDepartureFragment() - { - add(new SimpleFragment(new FinishDefaultCommand(),"")); - add(new SimpleFragment(new ClientTestDelegateCommand(),"")); - } - - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataRegistry.addMapping(TestClientDepartureInitCommand.class, "ForceBuild",BuildProjectCommand.class); - dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",AddModuleDependenciesCommand.class); - dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",AddModuleDependenciesCommand.class); - dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",ClientTestDelegateCommand.class); - dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",ClientTestDelegateCommand.class); - - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java deleted file mode 100644 index 61d390ca2..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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.ws.internal.consumption.ui.widgets.test.explorer; - -import java.util.Iterator; -import java.util.List; -import java.util.Vector; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand; -import org.eclipse.jst.ws.internal.ext.test.WSDLTestFinishCommand; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.ws.internal.explorer.LaunchOption; -import org.eclipse.wst.ws.internal.explorer.LaunchOptions; -import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; -import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin; - -public class ExplorerServiceTestCommand extends AbstractDataModelOperation implements WSDLTestFinishCommand -{ - - private boolean externalBrowser = true; - private String wsdlServiceURL; - private String serviceServerTypeID; - private IServer serviceExistingServer; - private String serviceProject; - private List endpoints; - - /** - * Constructs a new WebServiceExplorerLaunch object with the given label and description. - */ - public ExplorerServiceTestCommand () - { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - - StartProjectCommand spc = new StartProjectCommand( true ); - spc.setServiceServerTypeID(serviceServerTypeID); - spc.setServiceExistingServer(serviceExistingServer); - IProject project = (IProject) ResourceUtils.findResource(serviceProject); - spc.setServiceProject(project); - spc.setIsWebProjectStartupRequested(true); - spc.setEnvironment( env ); - - status = spc.execute( monitor, null ); - if (status.getSeverity() == Status.ERROR) - return status; - - WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand(); - launchCommand.setForceLaunchOutsideIDE(externalBrowser); - Vector launchOptionVector = new Vector(); - String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation(); - String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation(); - launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation)); - launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation)); - launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,wsdlServiceURL)); - if (endpoints != null) - for (Iterator it = endpoints.iterator(); it.hasNext();) - launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString())); - launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0])); - launchCommand.setEnvironment( env ); - status = launchCommand.execute( monitor, null ); - return status; - } - - public void setExternalBrowser(boolean externalBrowser) - { - this.externalBrowser = externalBrowser; - } - - public void setWsdlServiceURL(String wsdlServiceURL) - { - this.wsdlServiceURL = wsdlServiceURL; - } - - public void setServerTypeID(String serviceServerTypeID) - { - this.serviceServerTypeID = serviceServerTypeID; - } - - public void setExistingServer(IServer serviceExistingServer) - { - this.serviceExistingServer = serviceExistingServer; - } - - public void setServiceProject(String serviceProject) - { - this.serviceProject = serviceProject; - } - - public void setEndpoint(List endpoints) - { - this.endpoints = endpoints; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java deleted file mode 100644 index 063061dbf..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java +++ /dev/null @@ -1,74 +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 - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer; - -import java.util.Iterator; -import java.util.Vector; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.explorer.LaunchOption; -import org.eclipse.wst.ws.internal.explorer.LaunchOptions; -import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; -import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin; -import org.eclipse.wst.ws.internal.wsrt.TestInfo; - -public class WSEGenerateCommand extends AbstractDataModelOperation -{ - - private TestInfo testInfo; - - public WSEGenerateCommand(TestInfo testInfo){ - this.testInfo = testInfo; - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - - StartProjectCommand spc = new StartProjectCommand( true ); - spc.setServiceServerTypeID(testInfo.getServiceServerTypeID()); - spc.setServiceExistingServer(testInfo.getServiceExistingServer()); - IProject project = (IProject) ProjectUtilities.getProject(testInfo.getServiceProject()); - spc.setServiceProject(project); - spc.setIsWebProjectStartupRequested(true); - spc.setEnvironment( env ); - - status = spc.execute( monitor, null ); - if (status.getSeverity() == Status.ERROR) - return status; - - WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand(); - launchCommand.setForceLaunchOutsideIDE(false); - Vector launchOptionVector = new Vector(); - String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation(); - String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation(); - launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation)); - launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation)); - launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,testInfo.getWsdlServiceURL())); - if (testInfo.getEndpoint() != null) - for (Iterator it = testInfo.getEndpoint().iterator(); it.hasNext();) - launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString())); - launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0])); - launchCommand.setEnvironment( env ); - status = launchCommand.execute( monitor, null ); - return status; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java deleted file mode 100644 index cfa116d05..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java +++ /dev/null @@ -1,34 +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 - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer; - -import java.util.Vector; - -import org.eclipse.wst.command.internal.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester; -import org.eclipse.wst.ws.internal.wsrt.TestInfo; - -public class WSEWebServiceTester implements IWebServiceTester { - - public ICommandFactory generate(TestInfo testInfo){ - Vector commands = new Vector(); - return new SimpleCommandFactory(commands); - } - - public ICommandFactory launch(TestInfo testInfo){ - Vector commands = new Vector(); - commands.add(new WSEGenerateCommand(testInfo)); - return new SimpleCommandFactory(commands); - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java deleted file mode 100644 index ecb320e5a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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.ws.internal.consumption.ui.widgets.test.explorer; - -import org.eclipse.jst.ws.internal.ext.WebServiceExecutable; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - -/** -* This is the interface for objects that represent a kind of -* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType -* object is to manufacture the wizard pages that support the type, server, and runtime configuration. -*/ -public class WebServiceExplorerExecutable implements WebServiceExecutable -{ - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - - public AbstractDataModelOperation getFinishCommand() - { - return new ExplorerServiceTestCommand(); - } - -} - - diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java deleted file mode 100644 index 784b5c275..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java +++ /dev/null @@ -1,206 +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.ws.internal.consumption.ui.widgets.test.wssample; - -import java.io.IOException; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; -import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.TestInfo; - -public class AddModuleDependenciesCommand extends AbstractDataModelOperation -{ - - private TestInfo testInfo; - - private IProject sampleIProject; - private IProject clientIProject; - private IProject sampleEARIProject; - private String sampleEARProject; - private String sampleEARModule; - - public AddModuleDependenciesCommand(TestInfo testInfo) - { - this.testInfo = testInfo; - } - - /** - * Execute WebServerDefaultingTask Set the default server name and id given a - * deployable. - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - try - { - createSampleProjects(env, monitor ); - clientIProject = ProjectUtilities.getProject(testInfo.getClientProject()); - - if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)) - { - String uri = clientIProject.getName() + ".jar"; - if (J2EEUtils.isJavaComponent(clientIProject)) - addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri); - addJAROrModuleDependency(sampleIProject, uri); - addBuildPath(sampleIProject, clientIProject); - } - } - catch (IOException ioe) - { - } - catch (CoreException ce) - { - } - return Status.OK_STATUS; - } - - private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri) - { - // TODO Remove refs to old command -// AddUtilityJARMapCommand cmd = new AddUtilityJARMapCommand(earProject, uri, javaProject); -// cmd.execute(); - } - - private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException - { - ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project); - manifest.mergeClassPath(new String[]{uri}); - J2EEProjectUtilities.writeManifest(project, manifest); - - } - - public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR"; - - private void createSampleProjects(IEnvironment env, IProgressMonitor monitor ) - { - - - - sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject()); - clientIProject = ProjectUtilities.getProject(testInfo.getClientProject()); - - if (testInfo.getClientNeedEAR()) { - if(testInfo.getClientEARProject() == null || testInfo.getClientEARProject().length() == 0){ - sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT; - } - else{ - sampleEARProject = testInfo.getClientEARProject(); - } - - sampleEARIProject = ProjectUtilities.getProject(sampleEARProject); - if(sampleEARIProject == null || !sampleEARIProject.isOpen()){ - - CreateModuleCommand createEAR = new CreateModuleCommand(); - createEAR.setProjectName(sampleEARProject); - createEAR.setModuleName(sampleEARModule); - createEAR.setServerInstanceId(testInfo.getClientExistingServer().getId()); - createEAR.setServerFactoryId(testInfo.getClientServerTypeID()); - createEAR.setModuleType(CreateModuleCommand.EAR); - createEAR.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject)); - createEAR.setEnvironment( env ); - IStatus status = createEAR.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - } - - AddModuleToServerCommand modToServer = new AddModuleToServerCommand(); - modToServer.setModule(sampleEARModule); - modToServer.setProject(sampleEARProject); - modToServer.setServerInstanceId(testInfo.getClientExistingServer().getId()); - modToServer.setEnvironment( env ); - status = modToServer.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - } - - } - } - - if (!sampleIProject.isOpen()) - { - CreateModuleCommand createSample = new CreateModuleCommand(); - createSample.setProjectName(testInfo.getGenerationProject()); - createSample.setModuleType(CreateModuleCommand.WEB); - createSample.setServerInstanceId(testInfo.getClientExistingServer().getId()); - createSample.setServerFactoryId(testInfo.getClientServerTypeID()); - createSample.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject)); - createSample.setEnvironment( env ); - IStatus status = createSample.execute( monitor, null ); - - if (testInfo.getClientNeedEAR()) { -// Associate the client module and service EAR - AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand(); - associateCommand.setProject(testInfo.getGenerationProject()); - associateCommand.setEARProject(sampleEARProject); - associateCommand.setEar(sampleEARModule); - associateCommand.setEnvironment( env ); - status = associateCommand.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - } - } - - StartServerCommand startServer = new StartServerCommand(false, true); - startServer.setServerInstanceId(testInfo.getClientExistingServer().getId()); - startServer.setEnvironment( env ); - status = startServer.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - env.getStatusHandler().reportError(status); - } - - } - - } - - private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException - { - IJavaProject javaProject = JavaCore.create(referencingProject); - if (javaProject != null) - { - IClasspathEntry[] oldCp = javaProject.getRawClasspath(); - IClasspathEntry[] newCp = new IClasspathEntry[oldCp.length + 1]; - for (int i = 0; i < oldCp.length; i++) - newCp[i] = oldCp[i]; - newCp[newCp.length - 1] = JavaCore.newProjectEntry(referencedProject.getFullPath()); - javaProject.setRawClasspath(newCp, new NullProgressMonitor()); - } - } - - - - - - - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java deleted file mode 100644 index e7d91d9aa..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java +++ /dev/null @@ -1,172 +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 - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator; -import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator; -import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator; -import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator; -import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand; -import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand; -import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.datamodel.Model; -import org.eclipse.wst.ws.internal.wsrt.TestInfo; - -public class GSTCGenerateCommand extends AbstractDataModelOperation -{ - - public static String INPUT = "Input.jsp"; - public static String TEST_CLIENT = "TestClient.jsp"; - public static String RESULT = "Result.jsp"; - public static String METHOD = "Method.jsp"; - - private TestInfo testInfo; - private Model proxyModel; - private String jspfolder; - - public GSTCGenerateCommand(TestInfo testInfo){ - this.testInfo = testInfo; - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand(); - copy.setSampleProject(testInfo.getGenerationProject()); - copy.setEnvironment( env ); - status = copy.execute( monitor, null); - if (status.getSeverity() == Status.ERROR) return status; - setJSPFolder(); - status = createModel(env, monitor); - if (status.getSeverity() == Status.ERROR) return status; - status = generatePages(env); - if (status.getSeverity() == Status.ERROR) return status; - return status; - } - - private void setJSPFolder(){ - //if the client is not a webcomponent then the - //sample must have been created, we must now factor in - //flexible projects - - IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject()); - if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){ - IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject()); - IPath path = J2EEUtils.getWebContentPath(project); - int index = testInfo.getJspFolder().lastIndexOf("/"); - String jsp = testInfo.getJspFolder().substring(index + 1); - StringBuffer sb = new StringBuffer(); - sb.append("/").append(path.toString()).append("/").append(jsp); - jspfolder = sb.toString(); - } - else - jspfolder = testInfo.getJspFolder(); - - - } - - //create the model from the resource - private IStatus createModel(IEnvironment env, IProgressMonitor monitor ) { - JavaToModelCommand jtmc = new JavaToModelCommand(); - jtmc.setMethods(testInfo.getMethods()); - jtmc.setClientProject(testInfo.getClientProject()); - jtmc.setProxyBean(testInfo.getProxyBean()); - jtmc.setEnvironment( env ); - IStatus status = jtmc.execute( monitor, null); - if (status.getSeverity() == Status.ERROR) return status; - proxyModel = jtmc.getJavaDataModel(); - return status; - } - - /** - * Generate the four jsps that make up this - * sample app. - */ - private IStatus generatePages(IEnvironment env) - { - IStatus status = Status.OK_STATUS; - IPath fDestinationFolderPath = new Path(jspfolder); - fDestinationFolderPath = fDestinationFolderPath.makeAbsolute(); - IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot(); - - IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT); - IFile fileTest = fWorkspace.getFile(pathTest); - GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel, - new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest); - //gpcTest.setStatusMonitor(getStatusMonitor()); - gpcTest.setEnvironment( env ); - status = gpcTest.execute( null, null ); - if (status.getSeverity() == Status.ERROR ) - return status; - - - //input codegen - IPath pathInput = fDestinationFolderPath.append(INPUT); - IFile fileInput = fWorkspace.getFile(pathInput); - InputFileGenerator inputGenerator = new InputFileGenerator(RESULT); - GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel, - inputGenerator,fileInput); - //gpcInput.setStatusMonitor(getStatusMonitor()); - gpcInput.setEnvironment( env ); - status = gpcInput.execute( null, null ); - if (status.getSeverity() == Status.ERROR ) - return status; - - //method codegen - IPath pathMethod = fDestinationFolderPath.append(METHOD); - IFile fileMethod = fWorkspace.getFile(pathMethod); - MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT); - methodGenerator.setClientFolderPath(jspfolder); - GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel, - methodGenerator,fileMethod); - //gpcMethod.setStatusMonitor(getStatusMonitor()); - gpcMethod.setEnvironment( env ); - status = gpcMethod.execute( null, null ); - if (status.getSeverity() == Status.ERROR ) - return status; - - - //result codegen - IPath pathResult = fDestinationFolderPath.append(RESULT); - IFile fileResult = fWorkspace.getFile(pathResult); - ResultFileGenerator rfg = new ResultFileGenerator(); - rfg.setClientFolderPath(jspfolder); - rfg.setSetEndpointMethod(testInfo.getSetEndpointMethod()); - GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel, - rfg,fileResult); - gpcResult.setEnvironment( env ); - status = gpcResult.execute( null, null ); - - return status; - } - - - - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java deleted file mode 100644 index 879ed5a6a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java +++ /dev/null @@ -1,166 +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 - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.browser.IWebBrowser; -import org.eclipse.ui.browser.IWorkbenchBrowserSupport; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.ILog; -import org.eclipse.wst.common.environment.StatusException; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.TestInfo; - -public class GSTCLaunchCommand extends AbstractDataModelOperation -{ - - public static String INPUT = "Input.jsp"; - public static String TEST_CLIENT = "TestClient.jsp"; - public static String RESULT = "Result.jsp"; - public static String METHOD = "Method.jsp"; - - private TestInfo testInfo; - private String jspfolder; - - public GSTCLaunchCommand(TestInfo testInfo){ - this.testInfo = testInfo; - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - setJSPFolder(); - - return launchSample(env, monitor); - } - private void setJSPFolder(){ - //if the client is not a webcomponent then the - //sample must have been created, we must now factor in - //flexible projects - - IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject()); - if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){ - IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject()); - IPath path = J2EEUtils.getWebContentPath(project); - int index = testInfo.getJspFolder().lastIndexOf("/"); - String jsp = testInfo.getJspFolder().substring(index + 1); - StringBuffer sb = new StringBuffer(); - sb.append("/").append(path.toString()).append("/").append(jsp); - jspfolder = sb.toString(); - } - else - jspfolder = testInfo.getJspFolder(); - - - } - - private IStatus launchSample (IEnvironment env, IProgressMonitor monitor ) { - IStatus status = Status.OK_STATUS; - IPath fDestinationFolderPath = new Path(jspfolder); - fDestinationFolderPath = fDestinationFolderPath.makeAbsolute(); - PublishProjectCommand ppc = new PublishProjectCommand(); - ppc.setServerTypeID(testInfo.getClientServerTypeID()); - ppc.setExistingServer(testInfo.getClientExistingServer()); - ppc.setProject(testInfo.getGenerationProject()); - ppc.setEnvironment( env ); - status = ppc.execute( monitor, null ); - - StartServerCommand serverCommand = new StartServerCommand( true, true ); - serverCommand.setServerInstanceId( testInfo.getClientExistingServer().getId() ); - serverCommand.setEnvironment( env ); - - status = serverCommand.execute(monitor, null); - if (status.getSeverity() == Status.ERROR) return status; - - IProject sampleProject = ProjectUtilities.getProject(testInfo.getGenerationProject()); - IPath newPath = new Path(ServerUtils.getWebComponentURL(sampleProject, testInfo.getClientServerTypeID(),testInfo.getClientExistingServer())); - int count = J2EEUtils.getWebContentPath(sampleProject).segmentCount(); - - newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(count).makeAbsolute()); - StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString()); - if (testInfo.getEndpoint() != null && !testInfo.getEndpoint().isEmpty()) - { - urlString.append("?endpoint="); - urlString.append(testInfo.getEndpoint().get(0).toString()); - } - - try{ - URL url; - url = new URL(urlString.toString()); - - for( int retries = 0; retries < 10; retries++ ) - { - try - { - // Test the URLs - (new URL(newPath.append(RESULT).toString())).openStream(); - (new URL(newPath.append(METHOD).toString())).openStream(); - (new URL(newPath.append(INPUT).toString())).openStream(); - (new URL(newPath.append(TEST_CLIENT).toString())).openStream(); - // Looks good, exit loop - break; - } - catch( IOException ioe ) - { - try - { - Thread.sleep(1000); - } - catch (InterruptedException ie) {} - } - } - - IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport(); - IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR, null, null, null); - browser.openURL(url); - return status; - }catch(PartInitException exc){ - //TODO: change error message - env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc); - status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL ); - try { - env.getStatusHandler().report(status); - } catch (StatusException e) { - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e ); - } - return status; - }catch(MalformedURLException exc){ - env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc); - status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, exc ); - try { - env.getStatusHandler().report(status); - } catch (StatusException e) { - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e ); - } - return status; - } - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java deleted file mode 100644 index 29f1651d6..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java +++ /dev/null @@ -1,36 +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 - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample; - -import java.util.Vector; - -import org.eclipse.wst.command.internal.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester; -import org.eclipse.wst.ws.internal.wsrt.TestInfo; - -public class GSTCWebServiceTester implements IWebServiceTester { - - public ICommandFactory generate(TestInfo testInfo){ - Vector commands = new Vector(); - commands.add(new AddModuleDependenciesCommand(testInfo)); - commands.add(new GSTCGenerateCommand(testInfo)); - return new SimpleCommandFactory(commands); - } - - public ICommandFactory launch(TestInfo testInfo){ - Vector commands = new Vector(); - commands.add(new GSTCLaunchCommand(testInfo)); - return new SimpleCommandFactory(commands); - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java deleted file mode 100644 index f0b7a8c8d..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java +++ /dev/null @@ -1,327 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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.ws.internal.consumption.ui.widgets.test.wssample; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand; -import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator; -import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator; -import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator; -import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator; -import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand; -import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand; -import org.eclipse.jst.ws.internal.ext.test.JavaProxyTestCommand; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.browser.IWebBrowser; -import org.eclipse.ui.browser.IWorkbenchBrowserSupport; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; -import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.ILog; -import org.eclipse.wst.common.environment.StatusException; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.ws.internal.datamodel.Model; - -public class WSSampleFinishCommand extends AbstractDataModelOperation implements JavaProxyTestCommand -{ - - public static String INPUT = "Input.jsp"; - public static String TEST_CLIENT = "TestClient.jsp"; - public static String RESULT = "Result.jsp"; - public static String METHOD = "Method.jsp"; - - private Model proxyModel; - private String sampleServerTypeID; - private IServer sampleExistingServer; - - - private String clientProject; - private String jspFolder; - private boolean runClientTest; - private String sampleProject; - private BooleanSelection[] methods; - private String proxyBean; - private String setEndpointMethod; - private List endpoints; - - /** - * Constructs a new JavaBeanToSampleActiveTask object with the given label and description. - */ - public WSSampleFinishCommand () - { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - //setters and getters to be removed - CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand(); - copy.setSampleProject(sampleProject); - copy.setEnvironment( env ); - status = copy.execute( monitor, null ); - if (status.getSeverity() == Status.ERROR) return status; - status = createModel(env, monitor ); - if (status.getSeverity() == Status.ERROR) return status; - status = generatePages(env, monitor ); - if (status.getSeverity() == Status.ERROR) return status; - //if (!isSuccessful()) return; - status = launchSample(env, monitor); - return status; - } - - - /** - * Generate the four jsps that make up this - * sample app. - */ - protected IStatus generatePages(IEnvironment env, IProgressMonitor monitor ) - { - IStatus status = Status.OK_STATUS; - IPath fDestinationFolderPath = new Path(jspFolder); - fDestinationFolderPath = fDestinationFolderPath.makeAbsolute(); - IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot(); - - IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT); - IFile fileTest = fWorkspace.getFile(pathTest); - GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel, - new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest); - //gpcTest.setStatusMonitor(getStatusMonitor()); - gpcTest.setEnvironment( env ); - status = gpcTest.execute( monitor, null ); - if (status.getSeverity() == Status.ERROR ) - return status; - - - //input codegen - IPath pathInput = fDestinationFolderPath.append(INPUT); - IFile fileInput = fWorkspace.getFile(pathInput); - InputFileGenerator inputGenerator = new InputFileGenerator(RESULT); - GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel, - inputGenerator,fileInput); - //gpcInput.setStatusMonitor(getStatusMonitor()); - gpcInput.setEnvironment( env ); - status = gpcInput.execute( monitor, null ); - if (status.getSeverity() == Status.ERROR ) - return status; - - //method codegen - IPath pathMethod = fDestinationFolderPath.append(METHOD); - IFile fileMethod = fWorkspace.getFile(pathMethod); - MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT); - methodGenerator.setClientFolderPath(jspFolder); - GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel, - methodGenerator,fileMethod); - //gpcMethod.setStatusMonitor(getStatusMonitor()); - gpcMethod.setEnvironment( env ); - status = gpcMethod.execute( monitor, null ); - if (status.getSeverity() == Status.ERROR ) - return status; - - - //result codegen - IPath pathResult = fDestinationFolderPath.append(RESULT); - IFile fileResult = fWorkspace.getFile(pathResult); - ResultFileGenerator rfg = new ResultFileGenerator(); - rfg.setClientFolderPath(jspFolder); - rfg.setSetEndpointMethod(setEndpointMethod); - GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel, - rfg,fileResult); - //gpcResult.setStatusMonitor(getStatusMonitor()); - gpcResult.setEnvironment( env ); - status = gpcResult.execute( monitor, null ); - - return status; - } - - - protected IStatus launchSample (IEnvironment env, IProgressMonitor monitor ) { - - IStatus status = Status.OK_STATUS; - if (!runClientTest) return status; - - - IPath fDestinationFolderPath = new Path(jspFolder); - fDestinationFolderPath = fDestinationFolderPath.makeAbsolute(); - - PublishProjectCommand ppc = new PublishProjectCommand(); - ppc.setServerTypeID(sampleServerTypeID); - ppc.setExistingServer(sampleExistingServer); - ppc.setProject(sampleProject); - ppc.setEnvironment( env ); - status = ppc.execute( monitor, null ); - - StartProjectCommand spc = new StartProjectCommand(false ); - spc.setServiceServerTypeID(sampleServerTypeID); - spc.setSampleExistingServer(sampleExistingServer); - IProject project = (IProject) ResourceUtils.findResource(sampleProject); - spc.setSampleProject(project); - spc.setIsWebProjectStartupRequested(true); - spc.setEnvironment( env ); - - status = spc.execute( monitor, null ); - if (status.getSeverity() == Status.ERROR) return status; - - IPath newPath = new Path(ResourceUtils.getWebProjectURL(ResourceUtils.getProjectOf(fDestinationFolderPath),sampleServerTypeID,sampleExistingServer)); - newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(2).makeAbsolute()); - StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString()); - if (endpoints != null && !endpoints.isEmpty()) - { - urlString.append("?endpoint="); - urlString.append(endpoints.get(0).toString()); - } - - try{ - URL url; - url = new URL(urlString.toString()); - - for( int retries = 0; retries < 10; retries++ ) - { - try - { - // Test the URLs - (new URL(newPath.append(RESULT).toString())).openStream(); - (new URL(newPath.append(METHOD).toString())).openStream(); - (new URL(newPath.append(INPUT).toString())).openStream(); - (new URL(newPath.append(TEST_CLIENT).toString())).openStream(); - // Looks good, exit loop - break; - } - catch( IOException ioe ) - { - try - { - Thread.sleep(1000); - } - catch (InterruptedException ie) {} - } - } - - IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport(); - IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null); - browser.openURL(url); - return status; - }catch(PartInitException exc){ - //TODO: change error message - env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc); - status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, exc ); - try { - env.getStatusHandler().report(status); - } catch (StatusException e) { - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e ); - } - return status; - }catch(MalformedURLException exc){ - env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc); - status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, exc ); - try { - env.getStatusHandler().report(status); - } catch (StatusException e) { - status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e ); - } - return status; - } - } - - - - protected IStatus createModel(IEnvironment env, IProgressMonitor monitor ) { - - //create the model from the resource - JavaToModelCommand jtmc = new JavaToModelCommand(); - jtmc.setMethods(methods); - jtmc.setClientProject(clientProject); - jtmc.setProxyBean(proxyBean); - jtmc.setEnvironment( env ); - //jtmc.setStatusMonitor(getStatusMonitor()); - IStatus status = jtmc.execute( monitor, null); - if (status.getSeverity() == Status.ERROR) return status; - - proxyModel = jtmc.getJavaDataModel(); - return status; - } - - public void setServerTypeID(String sampleServerTypeID) - { - this.sampleServerTypeID = sampleServerTypeID; - } - - public void setExistingServer(IServer sampleExistingServer) - { - this.sampleExistingServer = sampleExistingServer; - } - - public void setJspFolder(String jspFolder) - { - this.jspFolder = jspFolder; - } - - public void setRunClientTest(boolean runClientTest) - { - this.runClientTest = runClientTest; - } - - public void setSampleProject(String sampleProject) - { - this.sampleProject = sampleProject; - } - - public void setClientProject(String clientProject) - { - this.clientProject = clientProject; - } - - public void setMethods(BooleanSelection[] methods) - { - this.methods = methods; - } - - public void setProxyBean(String proxyBean) - { - this.proxyBean = proxyBean; - } - - /** - * @param setEndpointMethod The setEndpointMethod to set. - */ - public void setSetEndpointMethod(String setEndpointMethod) - { - this.setEndpointMethod = setEndpointMethod; - } - - public void setEndpoint(List endpoints) - { - this.endpoints = endpoints; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java deleted file mode 100644 index 59f68f977..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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.ws.internal.consumption.ui.widgets.test.wssample; - -import org.eclipse.jst.ws.internal.ext.WebServiceExecutable; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - -/** -* This is the interface for objects that represent a kind of -* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType -* object is to manufacture the wizard pages that support the type, server, and runtime configuration. -*/ -public class WebServiceWSSampleExecutable implements WebServiceExecutable -{ - - - public AbstractDataModelOperation getFinishCommand() - { - return new WSSampleFinishCommand(); - } - -} - - |