diff options
9 files changed, 116 insertions, 91 deletions
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 index 81413585e..d5d426b2e 100644 --- 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 @@ -183,7 +183,7 @@ public class ClientWizardWidget extends SimpleWidgetDataContributor public String getClientProjectName() { - return clientProjectName_; + return clientWidget_.getClientProjectName(); } public String getClientComponentType() diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java index a9be03262..88f82e76f 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java @@ -31,6 +31,8 @@ public class ProjectSelectionDialog extends SimpleDialog { projWidget.setComponentType(componentType_); projWidget.setNeedEAR(needEAR_); projWidget.setTypeRuntimeServer(trs_); + + projWidget.refreshProjectItems(); } protected Point getInitialSize() 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 index 56606025a..f0ebb0291 100644 --- 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 @@ -16,7 +16,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; 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.runtime.ClientRuntimeSelectionWidgetDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget; import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; @@ -424,8 +423,7 @@ public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor int status = rssd.open(); if (status == Window.OK) { - setTypeRuntimeServer(rssd.getTypeRuntimeServer()); - refreshServerRuntimeSelection(); + setTypeRuntimeServer(rssd.getTypeRuntimeServer()); } } @@ -589,10 +587,12 @@ public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor public void setClientProjectName(String name) { projectName_ = name; - } + } public String getClientProjectName() - { + { + if (projectName_ == null) + return ""; return projectName_; } @@ -603,6 +603,8 @@ public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor public String getClientEarProjectName() { + if (earProjectName_ == null) + return ""; return earProjectName_; } @@ -635,28 +637,7 @@ public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor } } - private void refreshServerRuntimeSelection() - { - //new up ServerRuntimeSelectionWidgetDefaultingCommand - ClientRuntimeSelectionWidgetDefaultingCommand clientRTDefaultCmd = new ClientRuntimeSelectionWidgetDefaultingCommand(); - - //call setters on new defaulting command - clientRTDefaultCmd.setClientInitialSelection(getObjectSelection()); - clientRTDefaultCmd.setClientInitialProject(getProject()); - clientRTDefaultCmd.setWebServicesParser(getWebServicesParser()); - clientRTDefaultCmd.setClientEarProjectName(getClientEarProjectName()); - clientRTDefaultCmd.setClientTypeRuntimeServer(getTypeRuntimeServer()); - - clientRTDefaultCmd.execute(null, null); - - //perform data mappings from the defaulting command to the project settings... - setClientProjectName(clientRTDefaultCmd.getClientProjectName()); - setClientEarProjectName(clientRTDefaultCmd.getClientEarProjectName()); - setTypeRuntimeServer(clientRTDefaultCmd.getClientTypeRuntimeServer()); - setClientNeedEAR(clientRTDefaultCmd.getClientNeedEAR()); - setClientRuntimeId(clientRTDefaultCmd.getClientRuntimeId()); - } - + private class ScaleSelectionListener implements SelectionListener { public void widgetSelected(SelectionEvent e) { @@ -669,11 +650,7 @@ public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor setGraphics(selection); //disable the client settings if the client scenario setting isn't at least "DEVELOP" boolean generate = selection<=ScenarioContext.WS_DEVELOP; - showSummary(generate); - if (generate) - { - refreshServerRuntimeSelection(); - } + showSummary(generate); } 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 index 8c1e06785..d658873a0 100644 --- 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 @@ -16,6 +16,7 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding; +import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer; 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; @@ -103,6 +104,7 @@ public class ClientWidgetBinding implements CommandWidgetBinding dataRegistry.addMapping(ClientWizardWidget.class, "TestService", ClientWizardWidgetOutputCommand.class); dataRegistry.addMapping(ClientWizardWidget.class, "MonitorService", ClientWizardWidgetOutputCommand.class); dataRegistry.addMapping(ClientWizardWidget.class, "ResourceContext", ClientWizardWidgetOutputCommand.class); + dataRegistry.addMapping(ClientWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class); //jvh added.. dataRegistry.addMapping(ClientWizardWidget.class, "Project", ClientWizardWidgetOutputCommand.class); @@ -310,6 +312,7 @@ public class ClientWidgetBinding implements CommandWidgetBinding dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WebServicesParser", GetMonitorCommand.class); dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class); dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class); + //jvh - add code to widget so that the appropriate sets happen and defaulting occurs again after object selection /*dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null); 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 index 2c82316b2..867e83d59 100644 --- 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 @@ -434,7 +434,7 @@ public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implement String wsdlURI = toWsdlURI(object); wsdlURI_ = wsdlURI; - if (wsdlURI != null) + if (wsdlURI != null && webServiceURI != null) { webServiceURI.setText(wsdlURI); handleWebServiceURI(); diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java index a111fa027..a8e3f6fb0 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java @@ -15,6 +15,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; @@ -22,7 +23,6 @@ import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; import org.eclipse.jst.ws.internal.consumption.ui.widgets.IObjectSelectionLaunchable; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ProjectSelectionDialog; import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.IObjectSelectionWidget; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionRegistry; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget; @@ -387,8 +387,7 @@ public class ServerWizardWidget extends SimpleWidgetDataContributor { int result = rssd.open(); if (result == Window.OK) { - setServiceTypeRuntimeServer(rssd.getTypeRuntimeServer()); - refreshServerRuntimeSelection(); + setServiceTypeRuntimeServer(rssd.getTypeRuntimeServer()); } } @@ -566,23 +565,7 @@ public class ServerWizardWidget extends SimpleWidgetDataContributor { private void setObjectSelection(IStructuredSelection selection) { objectSelection_ = selection; - clientWidget_.setObjectSelection(selection); - - if (objectSelectionWidget_ != null) - { - if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) - { - IObjectSelectionLaunchable objLaunchable = (IObjectSelectionLaunchable)objectSelectionWidget_; - objLaunchable.setInitialSelection(selection); - serviceImpl_.setText(objLaunchable.getObjectSelectionDisplayableString()); - } - else if (objectSelectionWidget_ instanceof IObjectSelectionWidget) - { - IObjectSelectionWidget objWidget = (IObjectSelectionWidget)objectSelectionWidget_; - objWidget.setInitialSelection(selection); - serviceImpl_.setText(objWidget.getObjectSelectionDisplayableString()); - } - } + clientWidget_.setObjectSelection(selection); } public void setInitialSelection(IStructuredSelection selection) @@ -661,7 +644,7 @@ public class ServerWizardWidget extends SimpleWidgetDataContributor { public void setServiceProjectName(String name) { hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX + " " + name); - serviceProjectName_= name; + serviceProjectName_= name; } public void setServiceEarProjectName(String name) @@ -723,12 +706,21 @@ public class ServerWizardWidget extends SimpleWidgetDataContributor { return serviceEarProjectName_; } - public void setProject(IProject project) + public void setClientProject(IProject project) { - project_ = project; clientWidget_.setProject(project); } + private IProject getClientProject() + { + return clientWidget_.getProject(); + } + + public void setProject(IProject project) + { + project_ = project; + } + public IProject getProject() { return project_; @@ -875,10 +867,10 @@ public class ServerWizardWidget extends SimpleWidgetDataContributor { serverRTDefaultCmd.setServiceTypeRuntimeServer(getServiceTypeRuntimeServer()); serverRTDefaultCmd.setWebServicesParser(getWebServicesParser()); serverRTDefaultCmd.setClientInitialSelection(getObjectSelection()); - serverRTDefaultCmd.setClientInitialProject(getProject()); + serverRTDefaultCmd.setClientInitialProject(getClientProject()); serverRTDefaultCmd.setClientEarProjectName(clientWidget_.getClientEarProjectName()); serverRTDefaultCmd.setClientTypeRuntimeServer(getClientTypeRuntimeServer()); - + serverRTDefaultCmd.execute(null, null); //perform mappings from the defaulting command to the project settings... @@ -892,6 +884,8 @@ public class ServerWizardWidget extends SimpleWidgetDataContributor { setClientTypeRuntimeServer(serverRTDefaultCmd.getClientTypeRuntimeServer()); setServiceNeedEAR(serverRTDefaultCmd.getServiceNeedEAR()); setClientNeedEAR(serverRTDefaultCmd.getClientNeedEAR()); + setClientRuntimeId(serverRTDefaultCmd.getClientRuntimeId()); + setClientComponentType(serverRTDefaultCmd.getClientComponentType()); } private class ScaleSelectionListener implements SelectionListener @@ -955,47 +949,51 @@ public class ServerWizardWidget extends SimpleWidgetDataContributor { IStructuredSelection objectSelection = null; IProject project = null; String componentName=""; + int result=Dialog.CANCEL; if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) { IObjectSelectionLaunchable launchable = ((IObjectSelectionLaunchable)objectSelectionWidget_); launchable.setInitialSelection(getObjectSelection()); - launchable.launch(Workbench.getInstance().getActiveWorkbenchWindow().getShell()); - serviceImpl_.setText(launchable.getObjectSelectionDisplayableString()); - objectSelection = launchable.getObjectSelection(); - project = launchable.getProject(); - componentName= launchable.getComponentName(); + result = launchable.launch(Workbench.getInstance().getActiveWorkbenchWindow().getShell()); + if (result == Dialog.OK) + { + serviceImpl_.setText(launchable.getObjectSelectionDisplayableString()); + objectSelection = launchable.getObjectSelection(); + project = launchable.getProject(); + componentName= launchable.getComponentName(); + } } else { browseDialog_.setTypeRuntimeServer(getServiceTypeRuntimeServer()); browseDialog_.setInitialSelection(getObjectSelection()); - browseDialog_.open(); - serviceImpl_.setText(browseDialog_.getDisplayableSelectionString()); - objectSelection = browseDialog_.getObjectSelection(); - project = browseDialog_.getProject(); - componentName= browseDialog_.getComponentName(); + result = browseDialog_.open(); + if (result == Dialog.OK) + { + serviceImpl_.setText(browseDialog_.getDisplayableSelectionString()); + objectSelection = browseDialog_.getObjectSelection(); + project = browseDialog_.getProject(); + componentName= browseDialog_.getComponentName(); + } } - // call setters for new data - //jvh - not sure we need these two calls?? - // for BU - the following line gives an NPE... - /*setServiceProjectName(project.getName()); - setProject(project);*/ - // call ObjectSelectionOutputCommand to carry out any transformation on the objectSelection - objOutputCommand.setTypeRuntimeServer(getServiceTypeRuntimeServer()); - objOutputCommand.setObjectSelection(objectSelection); - objOutputCommand.setProject(project); - objOutputCommand.setComponentName(componentName); - - objOutputCommand.execute(null, null); - - setWebServicesParser(objOutputCommand.getWebServicesParser()); - setObjectSelection(objOutputCommand.getObjectSelection()); - setComponentName(objOutputCommand.getComponentName()); - setProject(objOutputCommand.getProject()); - refreshServerRuntimeSelection(); + if (result == Dialog.OK) + { + objOutputCommand.setTypeRuntimeServer(getServiceTypeRuntimeServer()); + objOutputCommand.setObjectSelection(objectSelection); + objOutputCommand.setProject(project); + objOutputCommand.setComponentName(componentName); + + objOutputCommand.execute(null, null); + + setWebServicesParser(objOutputCommand.getWebServicesParser()); + setObjectSelection(objOutputCommand.getObjectSelection()); + setComponentName(objOutputCommand.getComponentName()); + setProject(objOutputCommand.getProject()); + refreshServerRuntimeSelection(); + } } } } diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java index 8d614a130..f9b89330e 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java @@ -10,11 +10,15 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.creation.ui.widgets; +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.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; @@ -58,6 +62,41 @@ public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefau return initialSelection_ ; } + IProject project_; + + public IProject getInitialProject() + { + if (project_==null) + { + project_ = getProjectFromObjectSelection(initialSelection_); + } + + return project_; + } + + 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) + { + return null; + } + } + } + return null; + } + public TypeRuntimeServer getServiceTypeRuntimeServer() { return typeRuntimeServer_; diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java index 564c1bfb4..d4b3ca586 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java @@ -155,6 +155,7 @@ public class ServerWidgetBinding implements CommandWidgetBinding dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ServerWizardWidget.class); dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class); dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class); + dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh // After ServerWizardWidget dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class); @@ -399,8 +400,9 @@ public class ServerWidgetBinding implements CommandWidgetBinding dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class); // Map ServerWizardWidgetOutputCommand. + dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerRuntimeSelectionWidgetDefaultingCommand.class); dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class); + dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class); dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerExtensionDefaultingCommand.class); dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerExtensionDefaultingCommand.class); dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerExtensionDefaultingCommand.class); diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java index 8d431fe84..b1a8e8b81 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java @@ -134,15 +134,19 @@ public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntime setDefaultServiceEarProject(); - if (generateProxy_) - { + // jvh - for now comment out generate proxy + // need to look at defaulting based on an event + // on page 1 - when client generation goes from none + // to develop... + /*if (generateProxy_) + {*/ //Default the client-side. IStatus clientSideStatus = defaultClientSide(monitor); if (clientSideStatus.getSeverity() == Status.ERROR) { return clientSideStatus; } - } + // } return Status.OK_STATUS; |