Author: Grid.Qian Date: 2008-04-24 03:55:08 -0400 (Thu, 24 Apr 2008) New Revision: 7727 Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java Removed: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java Log: Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-04-24 07:44:02 UTC (rev 7726) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-04-24 07:55:08 UTC (rev 7727) @@ -49,9 +49,9 @@ <extension point="org.eclipse.wst.command.env.ui.widgetRegistry"> <widgetFactory - class="org.jboss.tools.ws.creation.ui.wsrt.JBossWSJava2WSDLConfigWidgetFactory" - id="JBossWSJava2WSDLConfig" - insertBeforeCommandId="org.jboos.tools.ws.creation.core.commands.Java2WSDLCommnad"> + class="org.jboss.tools.ws.creation.ui.wsrt.JBossWSProviderInvokeConfigWidgetFactory" + id="JBossWSProviderInvokeConfig" + insertBeforeCommandId="org.jboos.tools.ws.creation.core.commands.WSProviderInvokeCommnad"> </widgetFactory> </extension> Deleted: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java 2008-04-24 07:44:02 UTC (rev 7726) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java 2008-04-24 07:55:08 UTC (rev 7727) @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.creation.ui.widgets; - -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.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.FileDialog; -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.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.jboos.tools.ws.creation.core.data.ServiceModel; - -public class Java2WSDLCodeGenConfigWidget extends SimpleWidgetDataContributor { - - private ServiceModel model; - - public Java2WSDLCodeGenConfigWidget(ServiceModel model){ - this.model = model; - } - - public WidgetDataEvents addControls( Composite parent, Listener statusListener){ - - Composite configCom = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(2, false); - configCom.setLayout(layout); - configCom.setLayoutData(new GridData(GridData.FILL_BOTH)); - Label lblCustomPakage = new Label(configCom, SWT.NONE); - lblCustomPakage.setText("Custom package name:"); - final Text txtCustomPkgName = new Text(configCom, SWT.NONE); - txtCustomPkgName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - txtCustomPkgName.addModifyListener(new ModifyListener(){ - - public void modifyText(ModifyEvent e) { - model.setCustomPackage(txtCustomPkgName.getText()); - }}); - - new Label(configCom, SWT.NONE).setText("Binding file:"); - Composite fileSelection = new Composite(configCom, SWT.NONE); - fileSelection.setLayout(new GridLayout(2, false)); - fileSelection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - final Text txtFiles = new Text(fileSelection, SWT.NONE); - txtFiles.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - Button btnSelect = new Button(fileSelection, SWT.NONE); - btnSelect.setText("..."); - btnSelect.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e) { - String fileLocation = new FileDialog(Display.getCurrent().getActiveShell(), SWT.NONE).open(); - txtFiles.setText(fileLocation); - model.setBindingFileLcation(fileLocation); - } - }); - - return this; - } -} Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java (from rev 7724, trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java 2008-04-24 07:55:08 UTC (rev 7727) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ws.creation.ui.widgets; + +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.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.FileDialog; +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.ui.widgets.SimpleWidgetDataContributor; +import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; +import org.jboos.tools.ws.creation.core.data.ServiceModel; + +public class ProviderInvokeCodeGenConfigWidget extends SimpleWidgetDataContributor { + + private ServiceModel model; + + public ProviderInvokeCodeGenConfigWidget(ServiceModel model){ + this.model = model; + } + + public WidgetDataEvents addControls( Composite parent, Listener statusListener){ + + Composite configCom = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(2, false); + configCom.setLayout(layout); + configCom.setLayoutData(new GridData(GridData.FILL_BOTH)); + Label lblCustomPakage = new Label(configCom, SWT.NONE); + lblCustomPakage.setText("Custom package name:"); + final Text txtCustomPkgName = new Text(configCom, SWT.NONE); + txtCustomPkgName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + txtCustomPkgName.addModifyListener(new ModifyListener(){ + + public void modifyText(ModifyEvent e) { + model.setCustomPackage(txtCustomPkgName.getText()); + }}); + + new Label(configCom, SWT.NONE).setText("Binding file:"); + Composite fileSelection = new Composite(configCom, SWT.NONE); + fileSelection.setLayout(new GridLayout(2, false)); + fileSelection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + final Text txtFiles = new Text(fileSelection, SWT.NONE); + txtFiles.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + Button btnSelect = new Button(fileSelection, SWT.NONE); + btnSelect.setText("..."); + btnSelect.addSelectionListener(new SelectionAdapter(){ + public void widgetSelected(SelectionEvent e) { + String fileLocation = new FileDialog(Display.getCurrent().getActiveShell(), SWT.NONE).open(); + txtFiles.setText(fileLocation); + model.setBindingFileLcation(fileLocation); + } + }); + + return this; + } +} Deleted: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java 2008-04-24 07:44:02 UTC (rev 7726) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java 2008-04-24 07:55:08 UTC (rev 7727) @@ -1,87 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.creation.ui.wsrt; - -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor; -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.WidgetDataContributor; -import org.jboos.tools.ws.creation.core.commands.InitialCommnad; -import org.jboos.tools.ws.creation.core.data.ServiceModel; -import org.jboss.tools.ws.creation.ui.widgets.CodeGenConfigWidget; -import org.jboss.tools.ws.creation.ui.widgets.Java2WSDLCodeGenConfigWidget; - -public class JBossWSJava2WSDLConfigWidgetFactory implements - INamedWidgetContributorFactory { - - private SimpleWidgetContributor servicesXMLSelectWidgetContrib; - private ServiceModel model; - - public JBossWSJava2WSDLConfigWidgetFactory() { - } - - public INamedWidgetContributor getFirstNamedWidget() { - if (servicesXMLSelectWidgetContrib == null) - init(); - return servicesXMLSelectWidgetContrib; - } - - public INamedWidgetContributor getNextNamedWidget( - INamedWidgetContributor widgetContributor) { - if (servicesXMLSelectWidgetContrib == null) - init(); - INamedWidgetContributor nextWidgetContrib = null; - return nextWidgetContrib; - } - - public void registerDataMappings(DataMappingRegistry dataRegistry) { - // Map the data model from the defaulting command to this widget - // factory. - // The framework will actually to the call to getWebServiceDataModel in - // the ExampleDefaultingCommand class and then call the - // setWebServiceDataModel - // method in this class. - dataRegistry.addMapping(InitialCommnad.class, "WebServiceDataModel", //$NON-NLS-1$ - JBossWSJava2WSDLConfigWidgetFactory.class); - } - - public void setWebServiceDataModel(ServiceModel model) { - this.model = model; - } - - private void init() { - // Pages of JBossWS Java2WSDL - Java2WSDLCodeGenConfigWidget java2WSDLWidget = new Java2WSDLCodeGenConfigWidget( - model); - servicesXMLSelectWidgetContrib = createWidgetContributor( - "JBoss Web Service Code Generation Configuration", - "Please input the appropriate option for the code generation", - java2WSDLWidget); - } - - private SimpleWidgetContributor createWidgetContributor(String title, - String description, final WidgetDataContributor contributor) { - SimpleWidgetContributor widgetContrib = new SimpleWidgetContributor(); - widgetContrib.setTitle(title); - widgetContrib.setDescription(description); - widgetContrib.setFactory(new WidgetContributorFactory() { - public WidgetContributor create() { - return contributor; - } - }); - return widgetContrib; - } - -} Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java (from rev 7724, trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java 2008-04-24 07:55:08 UTC (rev 7727) @@ -0,0 +1,87 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ws.creation.ui.wsrt; + +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory; +import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor; +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.WidgetDataContributor; +import org.jboos.tools.ws.creation.core.commands.InitialCommnad; +import org.jboos.tools.ws.creation.core.data.ServiceModel; +import org.jboss.tools.ws.creation.ui.widgets.CodeGenConfigWidget; +import org.jboss.tools.ws.creation.ui.widgets.ProviderInvokeCodeGenConfigWidget; + +public class JBossWSProviderInvokeConfigWidgetFactory implements + INamedWidgetContributorFactory { + + private SimpleWidgetContributor servicesXMLSelectWidgetContrib; + private ServiceModel model; + + public JBossWSProviderInvokeConfigWidgetFactory() { + } + + public INamedWidgetContributor getFirstNamedWidget() { + if (servicesXMLSelectWidgetContrib == null) + init(); + return servicesXMLSelectWidgetContrib; + } + + public INamedWidgetContributor getNextNamedWidget( + INamedWidgetContributor widgetContributor) { + if (servicesXMLSelectWidgetContrib == null) + init(); + INamedWidgetContributor nextWidgetContrib = null; + return nextWidgetContrib; + } + + public void registerDataMappings(DataMappingRegistry dataRegistry) { + // Map the data model from the defaulting command to this widget + // factory. + // The framework will actually to the call to getWebServiceDataModel in + // the ExampleDefaultingCommand class and then call the + // setWebServiceDataModel + // method in this class. + dataRegistry.addMapping(InitialCommnad.class, "WebServiceDataModel", //$NON-NLS-1$ + JBossWSProviderInvokeConfigWidgetFactory.class); + } + + public void setWebServiceDataModel(ServiceModel model) { + this.model = model; + } + + private void init() { + // Pages of JBossWS Java2WSDL + ProviderInvokeCodeGenConfigWidget java2WSDLWidget = new ProviderInvokeCodeGenConfigWidget( + model); + servicesXMLSelectWidgetContrib = createWidgetContributor( + "JBoss Web Service Code Generation Configuration", + "Please input the appropriate option for the code generation", + java2WSDLWidget); + } + + private SimpleWidgetContributor createWidgetContributor(String title, + String description, final WidgetDataContributor contributor) { + SimpleWidgetContributor widgetContrib = new SimpleWidgetContributor(); + widgetContrib.setTitle(title); + widgetContrib.setDescription(description); + widgetContrib.setFactory(new WidgetContributorFactory() { + public WidgetContributor create() { + return contributor; + } + }); + return widgetContrib; + } + +} Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-04-24 07:44:02 UTC (rev 7726) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-04-24 07:55:08 UTC (rev 7727) @@ -12,8 +12,8 @@ import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; import org.jboos.tools.ws.creation.core.commands.InitialCommnad; -import org.jboos.tools.ws.creation.core.commands.Java2WSDLCommand; import org.jboos.tools.ws.creation.core.commands.WSDL2JavaCommnad; +import org.jboos.tools.ws.creation.core.commands.WSProviderInvokeCommnad; import org.jboos.tools.ws.creation.core.data.ServiceModel; import org.jboss.tools.ws.core.command.JbossWSRuntimeCommand; @@ -52,7 +52,7 @@ } else if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP){ commands.add(new InitialCommnad(model, this, WebServiceScenario.BOTTOMUP)); - commands.add(new Java2WSDLCommand(model)); + commands.add(new WSProviderInvokeCommnad(model)); commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project))); }