diff options
Diffstat (limited to 'bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws')
5 files changed, 16 insertions, 34 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(); |