diff options
474 files changed, 2584 insertions, 1876 deletions
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java index b2a6704f6..c312f13a9 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java @@ -22,10 +22,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * Commands are executable, undoable, redoable objects. Every Command has a name and a description. */ diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java index 8f083be17..697d3e323 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java @@ -15,7 +15,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; import java.util.ResourceBundle; - import org.apache.axis.AxisEngine; import org.apache.axis.server.AxisServer; import org.apache.axis.tools.ant.axis.AdminClientTask; @@ -35,11 +34,11 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * Commands are executable, undoable, redoable objects. Every Command has a name and a description. diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java index d5c77f58c..6f7c55f41 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java @@ -27,11 +27,11 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.Log; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * Commands are executable, undoable, redoable objects. diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java index 2906565d3..fb5b7972e 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java @@ -23,11 +23,11 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.Log; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class WSDL2JavaCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java index 6bc3b6d67..8e47d5a9f 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +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.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java index 0c463111e..7c0c39b65 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java @@ -15,7 +15,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java index 063b72d53..d40ceed0b 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java @@ -15,7 +15,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java index a14ce15d7..3a8de6c88 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java @@ -28,11 +28,11 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java index f7c45aa6c..ac509f937 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java @@ -24,11 +24,11 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.datamodel.Model; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java index c8fad2d23..b75f4d6b5 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java @@ -19,11 +19,11 @@ 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.J2EEUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.StatusException; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.common.EnvironmentUtils; public class CheckAxisDeploymentDescriptorsTask extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java index e81a0b317..c3a4378ea 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java @@ -33,7 +33,6 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisCons import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; @@ -41,6 +40,7 @@ import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceCon import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.common.BundleUtils; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java index 005b00f13..0a6c00e75 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +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; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java index a2e3b91e5..d629d25c7 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java @@ -18,10 +18,10 @@ 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.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java index 979c12091..fec20ee05 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java @@ -34,11 +34,11 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java index 8fd2c30e7..3184cd477 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java @@ -16,10 +16,10 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java index 604d27a79..52f98d9ec 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java @@ -14,7 +14,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStream; - import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.CoreException; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java index cb652a18a..518496b0b 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java @@ -13,7 +13,6 @@ package org.eclipse.jst.ws.internal.axis.consumption.ui.util; import java.net.MalformedURLException; import java.net.URL; - import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java index f2acb5c46..8f1a0dab5 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java @@ -17,7 +17,6 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; import java.util.StringTokenizer; - import javax.wsdl.Binding; import javax.wsdl.Definition; import javax.wsdl.Port; @@ -27,7 +26,6 @@ import javax.wsdl.extensions.soap.SOAPAddress; import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; - import org.apache.axis.wsdl.toJava.Utils; import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java index b82a52dc8..888298213 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java @@ -13,7 +13,6 @@ package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets; import java.util.ArrayList; import java.util.HashMap; import java.util.List; - import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java index ec448cf9d..956da3c2d 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService; import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceInfo; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class AxisOutputCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java index f1e7c1b98..cf8e37d19 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class AxisRunInputCommand extends AbstractDataModelOperation{ diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java index 35e43fd1a..ae1fabdd5 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java @@ -15,7 +15,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +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.provisional.wsrt.IWebService; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java index d8073abf7..adb2718db 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java @@ -12,13 +12,12 @@ package org.eclipse.jst.ws.internal.axis.creation.ui.command; 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.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java index 4e898aa44..9db3a43eb 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java @@ -21,9 +21,9 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFile; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java index 4cf192e1f..7d6cef623 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java @@ -24,11 +24,11 @@ import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jem.java.Method; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.Log; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class JavaToWSDLMethodCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java index 77fdf9409..a6fa30356 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java @@ -15,7 +15,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java index ead96381b..8e575407b 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java @@ -26,12 +26,12 @@ import org.eclipse.jst.j2ee.webapplication.ServletMapping; import org.eclipse.jst.j2ee.webapplication.ServletType; import org.eclipse.jst.j2ee.webapplication.WebApp; import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.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.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class UpdateWEBXMLCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java index 274c3b5e8..402d5a837 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java @@ -31,10 +31,10 @@ 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.ui.wsil.Utils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java index cef8d704a..e461ca2fa 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java @@ -23,10 +23,10 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil; 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.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class MoveDeploymentFilesTask extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java index 6cfa929de..4934e0fd7 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java @@ -19,10 +19,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class MoveJavaFilesTask extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java index 8f1a64282..da2543b4b 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java @@ -41,10 +41,10 @@ import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; import org.eclipse.jst.ws.internal.consumption.command.common.CopyWSDLCommand; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; public class Skeleton2WSDLCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java index 4f44cc52d..3845dd7c3 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java @@ -33,10 +33,10 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil; import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.common.BundleUtils; public class UpdateAxisWSDDFileTask extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java index 5ddb13dc4..3929968ec 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java @@ -17,10 +17,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java index e9ee35179..e449eca5f 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean; import java.util.Enumeration; import java.util.Hashtable; - import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java index 684c41ced..b0d25b821 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java @@ -24,10 +24,10 @@ import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class ValidateObjectSelectionCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java index d6965e8b6..ed1c61239 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java index 611beb04d..8c9d2acea 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton; import java.io.File; import java.net.MalformedURLException; - import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java index 615e05ba0..2f5e749e1 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton; import java.io.File; import java.net.MalformedURLException; - import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IAdaptable; @@ -23,7 +22,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class SkeletonConfigWidgetDefaultingCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java index 6508f699c..08da92c36 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java @@ -17,12 +17,12 @@ 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.ui.common.ValidationUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.StatusException; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java index 75fe3a5c4..741479c51 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java @@ -26,10 +26,10 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.common.EnvironmentUtils; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java index c809e7a4e..405ecc8a9 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; import org.eclipse.ui.progress.UIJob; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class OpenJavaEditorCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java index 0ddde2b30..d2f99a5f4 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java @@ -17,10 +17,10 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin; import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIAPContext; import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSISSBPContext; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java index 8f8400b6e..d0507f713 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java @@ -11,7 +11,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.command.data; import java.net.MalformedURLException; - import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java index 948cb5cf8..852126ded 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; public class PreClientAssembleCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java index cb8966583..28203c621 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java @@ -15,7 +15,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class PreClientDeployCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java index feedac3a1..468d2bb03 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java @@ -18,10 +18,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java index df45d2f9a..ae503ac53 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java @@ -17,8 +17,8 @@ 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.CreateServerCommand; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; public class PreClientInstallCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java index cc843529b..a0eeec27c 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java @@ -16,8 +16,8 @@ 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.StartServerCommand; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; public class PreClientRunCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java index 092411ee4..411fca4d2 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java @@ -14,7 +14,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.plugin; import java.net.MalformedURLException; import java.net.URL; import java.text.MessageFormat; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext; import org.eclipse.ui.plugin.AbstractUIPlugin; 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 index 0514a0324..89fc9fa7d 100644 --- 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 @@ -21,10 +21,10 @@ 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.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** 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 index 8aa7f35f8..77fb684a9 100644 --- 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 @@ -18,11 +18,11 @@ 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.widgets.object.ValidateWSDLJob; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.plugin.WSPlugin; 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 index e13fdc27e..b182a805e 100644 --- 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 @@ -16,7 +16,6 @@ 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; @@ -31,9 +30,9 @@ 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.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.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; 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 index 06a01bd84..29b4885b9 100644 --- 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 @@ -10,12 +10,17 @@ *******************************************************************************/ 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.WebServiceRuntimeExtensionUtils; 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class ClientWizardWidgetDefaultingCommand extends AbstractDataModelOperation @@ -62,4 +67,9 @@ public class ClientWizardWidgetDefaultingCommand extends AbstractDataModelOperat 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 index 203c4963f..f7bcd92dc 100644 --- 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 @@ -10,9 +10,14 @@ *******************************************************************************/ 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class ClientWizardWidgetOutputCommand extends AbstractDataModelOperation @@ -62,4 +67,9 @@ public class ClientWizardWidgetOutputCommand extends AbstractDataModelOperation { 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/PublishWSWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java index 9a40b1af2..5d03e01d9 100644 --- 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 @@ -11,7 +11,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets; import java.util.Vector; - 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; 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 index 15214d600..504f1e5c6 100644 --- 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 @@ -26,7 +26,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility; /* 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 index d4de766dd..3551c050f 100644 --- 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 @@ -16,10 +16,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.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; 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 index 9273f6d15..b2b127c0c 100644 --- 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 @@ -16,10 +16,10 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +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; 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 index 029e4451b..fc40135fe 100644 --- 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 @@ -10,16 +10,21 @@ *******************************************************************************/ 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.command.internal.provisional.env.core.AbstractDataModelOperation; 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; @@ -144,5 +149,10 @@ public class WSDLSelectionWidgetDefaultingCommand extends AbstractDataModelOpera } } 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/binding/GenSampleWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java index 6ee84f190..5ced295c3 100644 --- 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 @@ -49,12 +49,12 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo; import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState; 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 index 676e74f46..1f46b5fba 100644 --- 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 @@ -10,10 +10,15 @@ *******************************************************************************/ 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +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; @@ -408,6 +413,11 @@ public class ClientExtensionDefaultingCommand extends AbstractDataModelOperation { 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/ClientExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java index 4068f1dd1..fb3fb9c9f 100644 --- 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 @@ -12,7 +12,12 @@ */ package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +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.provisional.wsrt.IWebServiceClient; public class ClientExtensionOutputCommand extends AbstractDataModelOperation @@ -55,4 +60,9 @@ public class ClientExtensionOutputCommand extends AbstractDataModelOperation { 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 index 9440444b4..4eda82c7a 100644 --- 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 @@ -10,9 +10,14 @@ *******************************************************************************/ 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.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +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; @@ -279,4 +284,9 @@ public class ServerExtensionDefaultingCommand extends AbstractDataModelOperation { serviceEarComponentName_ = s; } + + 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/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java index 4f8f2a01f..ac0eb4059 100644 --- 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 @@ -12,7 +12,12 @@ */ package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +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.provisional.wsrt.IWebService; @@ -102,4 +107,9 @@ 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/EJBTableViewer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java index 98afd649a..cda16922f 100644 --- 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 @@ -11,7 +11,6 @@ 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; 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 index 2314e8738..3cb6a969d 100644 --- 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 @@ -23,11 +23,11 @@ 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.WebServiceRuntimeExtensionUtils; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.Environment; 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.provisional.wsrt.WebServiceScenario; 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 index 546120c40..4db0a341c 100644 --- 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 @@ -11,7 +11,6 @@ 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 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 index 79672c379..b562902ea 100644 --- 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 @@ -11,7 +11,6 @@ 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; 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 index 29f63c6d5..5b0683e3a 100644 --- 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 @@ -31,7 +31,6 @@ import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRu import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; @@ -39,6 +38,7 @@ import org.eclipse.wst.command.internal.provisional.env.core.selection.Selection import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; 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 index 72afb34cb..a08552de5 100644 --- 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 @@ -21,13 +21,13 @@ 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.StatusHandler; +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.provisional.wsrt.IWebServiceTester; 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 index 887507d23..09ae87196 100644 --- 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 @@ -24,7 +24,6 @@ import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; @@ -32,6 +31,7 @@ import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceCon import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.StatusHandler; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class CopyWebServiceUtilsJarCommand extends AbstractDataModelOperation 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 index a5de43f1c..6a68ca571 100644 --- 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 @@ -19,8 +19,8 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; public class CreateSampleProjectCommand extends AbstractDataModelOperation 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 index d18ad63a4..9c6df0cba 100644 --- 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 @@ -15,7 +15,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; 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 index 66c233d64..6c61ebaaa 100644 --- 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 @@ -16,7 +16,12 @@ */ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +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 @@ -38,5 +43,10 @@ public class TestClientDepartureInitCommand extends AbstractDataModelOperation { 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 index 4c78feb6a..36f95ffb8 100644 --- 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 @@ -22,8 +22,8 @@ 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** 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 index e3d7cc22f..50e8857ef 100644 --- 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 @@ -23,12 +23,12 @@ import org.eclipse.core.runtime.Status; 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.StatusHandler; +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.provisional.wsrt.IWebServiceTester; 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 index 42a6e539f..a12e09286 100644 --- 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 @@ -23,12 +23,12 @@ 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.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.StatusHandler; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** 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 index df2ae28cf..fe8604246 100644 --- 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 @@ -22,8 +22,8 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +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; 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 index b7f60ca96..f285f7ef8 100644 --- 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 @@ -9,8 +9,8 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +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; 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 index 6ab3b93ab..32bb37c02 100644 --- 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 @@ -1,7 +1,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer; import java.util.Vector; - import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester; 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 index 5d40bee5f..ecb320e5a 100644 --- 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 @@ -12,7 +12,7 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer; import org.eclipse.jst.ws.internal.ext.WebServiceExecutable; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * This is the interface for objects that represent a kind of 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 index 38724a7a7..4bc0477d0 100644 --- 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 @@ -30,8 +30,8 @@ import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerC 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.command.common.StartServerCommand; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; public class AddModuleDependenciesCommand extends AbstractDataModelOperation 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 index 2ef743893..c52c64ccd 100644 --- 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 @@ -19,8 +19,8 @@ import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileG 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.common.EnvironmentUtils; import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; 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 index fe212516a..cb867d789 100644 --- 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 @@ -19,12 +19,12 @@ import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUI import org.eclipse.ui.PartInitException; import org.eclipse.ui.browser.IWebBrowser; import org.eclipse.ui.browser.IWorkbenchBrowserSupport; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.Log; import org.eclipse.wst.common.environment.StatusException; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; public class GSTCLaunchCommand extends AbstractDataModelOperation 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 index 4926adc59..c7c5fec34 100644 --- 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 @@ -1,7 +1,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample; import java.util.Vector; - import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester; 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 index 74a41f2f5..ca7aab249 100644 --- 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 @@ -40,13 +40,13 @@ 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.Log; 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.common.EnvironmentUtils; import org.eclipse.wst.ws.internal.datamodel.Model; 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 index 93ac97034..59f68f977 100644 --- 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 @@ -12,7 +12,7 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample; import org.eclipse.jst.ws.internal.ext.WebServiceExecutable; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * This is the interface for objects that represent a kind of diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java index 4d2873220..0070383df 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wizard; import java.util.Vector; - import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java index cef821386..778828d59 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wizard; import java.util.Hashtable; import java.util.Vector; - import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java index 9db02e7d6..4e3a51e01 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java index aa98c1428..b5c243bca 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java @@ -13,7 +13,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsil; import java.util.ArrayList; import java.util.List; - import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ISelection; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java index 41e17c363..4dae50bac 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsil; import java.net.MalformedURLException; - import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; import org.eclipse.jst.ws.internal.common.ResourceUtils; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java index 808a1afc9..85a02603b 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; import java.util.Hashtable; import java.util.StringTokenizer; - import org.eclipse.core.runtime.IConfigurationElement; public class ClientType { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java index ec311b949..cb5ed82f3 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; import java.util.Hashtable; import java.util.StringTokenizer; - import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java index 971875ca1..b5630e9dc 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java @@ -11,7 +11,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; import java.util.StringTokenizer; - import org.eclipse.core.runtime.IConfigurationElement; public class WebServiceImpl { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java index 3347379db..cca569eb8 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java @@ -14,7 +14,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; import java.util.ArrayList; import java.util.HashMap; import java.util.Hashtable; - import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java index c0a22a6ea..5fc1bd905 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; import java.util.Vector; - import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java index 0c880bc98..2b85d6fd2 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java @@ -13,7 +13,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; import java.util.Hashtable; import java.util.StringTokenizer; - import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java index c9d1b447b..f37bedb71 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java @@ -9,10 +9,10 @@ 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.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java index 605984184..3ed75056b 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java @@ -8,10 +8,10 @@ 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.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class AssociateModuleWithEARCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java index 18996a560..90c6ff9b3 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class BuildProjectCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java index af291d9f5..a986b894d 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java @@ -15,9 +15,9 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java index a562dce68..329a3e5d9 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java @@ -18,7 +18,12 @@ import javax.wsdl.Port; import javax.wsdl.Service; import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.soap.SOAPAddress; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +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.wsil.WebServicesParser; public class ComputeEndpointCommand extends AbstractDataModelOperation @@ -124,4 +129,9 @@ public class ComputeEndpointCommand extends AbstractDataModelOperation } 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/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java index ad82ad691..28eb288ad 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java @@ -41,10 +41,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.EList; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.uri.URIException; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder; import org.eclipse.wst.ws.internal.parser.discovery.NetUtils; import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java index aba4f45e6..211c7b1d5 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java @@ -22,10 +22,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java index bb67db9f8..451478521 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java @@ -25,9 +25,9 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java index 6ad516c79..c66957e93 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java @@ -20,10 +20,10 @@ import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataMo import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java index f5ae400b3..259adccc3 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java @@ -17,10 +17,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +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.server.core.ServerPort; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java index ec3f32848..b3368962c 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java @@ -6,10 +6,10 @@ 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.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerType; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java index 00da2f1d5..49fcf2550 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java @@ -16,9 +16,9 @@ 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.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.datamodel.Model; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java index 29df06f97..8d881db0f 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java @@ -17,9 +17,9 @@ 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.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class DisableValidationCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java index 8b0fe353d..666296b7d 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java @@ -29,10 +29,10 @@ 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.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.StatusException; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor; import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy; import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java index 0c7c54b0c..2f2f33cfb 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java @@ -25,8 +25,8 @@ import org.eclipse.jem.java.JavaHelpers; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java index fbba7a6b5..c361ff91e 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java @@ -16,10 +16,10 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; /** diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java index 765a7c70d..c00b0dc76 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java @@ -18,12 +18,12 @@ 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.common.ServerUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.Log; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; public class PublishProjectCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java index 1f4baa353..39f2e49db 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java @@ -17,9 +17,9 @@ 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.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class RestoreBuildStateCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java index f9b77c806..1aadc504c 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java @@ -17,9 +17,9 @@ 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.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class RestoreValidationStateCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java index dd47c623b..e39ef4d3c 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java @@ -19,11 +19,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.common.ServerUtils; import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; public class StartProjectCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java index 54cd1a007..310d21cb5 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java @@ -6,16 +6,15 @@ 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.core.runtime.adaptor.EclipseLog; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.EnvironmentService; import org.eclipse.wst.common.environment.Log; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java index 67bd29dcc..91ef77815 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java @@ -15,7 +15,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * This command is intended to clean up data after either the diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java index 111d2b9a0..7a4f20210 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java @@ -21,10 +21,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.codegen.Generator; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.datamodel.Element; import org.eclipse.wst.ws.internal.datamodel.Model; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java index 4bb41e97a..1fb4d6b8a 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java @@ -20,12 +20,12 @@ import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions.JavaMofBeanVisitorAction; import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor; import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.datamodel.Element; import org.eclipse.wst.ws.internal.datamodel.Model; diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java index 8fd6b2f74..655d21d08 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; public class PreServiceAssembleCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java index 78b1e32b8..e0adbe6e7 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java @@ -15,7 +15,7 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class PreServiceDeployCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java index 8f4513eed..dac94a5d4 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java @@ -18,10 +18,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java index cfdd16209..8a8a4f632 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java @@ -17,8 +17,8 @@ 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.CreateServerCommand; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; public class PreServiceInstallCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java index cc68b968d..8ebab0ab4 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java @@ -16,8 +16,8 @@ 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.StartServerCommand; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; public class PreServiceRunCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java index 3aa830d8a..2c195a36a 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java @@ -26,9 +26,9 @@ 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.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; import org.eclipse.wst.common.environment.Environment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java index 2a58fc3cb..ea24416fc 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java @@ -10,8 +10,13 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.uddiregistry.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.uddiregistry.wizard.PrivateUDDIRegistryType; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /* import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; @@ -75,4 +80,9 @@ public class PrivateUDDISelectionCommand extends AbstractDataModelOperation { registryType = regType; } + + 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.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java index 05ed0fd65..f741d9c8e 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java @@ -14,8 +14,8 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class PrivateUDDISelectionWidgetConditionCommand extends AbstractDataModelOperation implements Condition diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java index 2af533c00..79d092128 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java @@ -13,7 +13,6 @@ package org.eclipse.jst.ws.internal.uddiregistry.wizard; import java.util.Enumeration; import java.util.Vector; - import org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding; import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java index 971d6c55d..5fd441ee4 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java @@ -13,7 +13,6 @@ package org.eclipse.jst.ws.internal.uddiregistry.wizard; import java.util.StringTokenizer; import java.util.Vector; - import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java index e1fd2ecdf..15b8f03c9 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Vector; - import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java index 596a30b4e..9660fbb82 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java @@ -11,7 +11,7 @@ package org.eclipse.jst.ws.internal.ext; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * All Extensions with exectutable extensions should implement this diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java index c6d34264e..03f41cf46 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java @@ -12,7 +12,6 @@ package org.eclipse.wst.command.internal.env.core.data; import java.util.Hashtable; import java.util.Vector; - import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java index ab7edc07f..3dcf25de3 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java @@ -12,7 +12,6 @@ package org.eclipse.wst.command.internal.env.core.fragment; import java.util.Enumeration; import java.util.Hashtable; - import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.common.Evaluate; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java index 867725bfd..053ce5bfc 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java @@ -13,9 +13,9 @@ package org.eclipse.wst.command.internal.env.core.fragment; import java.util.Vector; import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public abstract class CommandFactoryFragment implements CommandFragment { diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java index 82fef6bf1..0de6d6382 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java @@ -16,7 +16,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; import org.eclipse.wst.command.internal.env.core.data.DataFlowManager; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.CommandManager; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; @@ -24,6 +23,7 @@ import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.Log; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java index e293fbec3..7751ba603 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java @@ -11,7 +11,6 @@ package org.eclipse.wst.command.internal.env.core.fragment; import java.util.Hashtable; - import org.eclipse.wst.command.internal.env.core.registry.CommandRegistry; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java index 0abcb355d..5e0e70438 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java @@ -13,7 +13,6 @@ package org.eclipse.wst.command.internal.env.core.fragment; import java.util.Arrays; import java.util.List; import java.util.Vector; - import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java index b69ef1b73..9435224c8 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java @@ -11,7 +11,7 @@ package org.eclipse.wst.command.internal.env.core.fragment; import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * This class implements an empty of WizardFragment. diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/AbstractDataModelOperation.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/AbstractDataModelOperation.java deleted file mode 100644 index 14a37311b..000000000 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/AbstractDataModelOperation.java +++ /dev/null @@ -1,35 +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.wst.command.internal.provisional.env.core; - -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; - -public abstract class AbstractDataModelOperation extends org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation -{ - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } - - public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } - - public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } - -} diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java index 409e1df82..88c20c012 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.provisional.env.core; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; + /** * This interface is used to create Command objects. * diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java index 6a0a4d4d4..3f32a71fb 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java @@ -12,6 +12,7 @@ package org.eclipse.wst.command.internal.provisional.env.core; import java.util.Iterator; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java index 5ff072a5b..6db25d500 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java @@ -1,6 +1,7 @@ package org.eclipse.wst.command.internal.provisional.env.core; import java.util.Vector; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class SimpleCommandFactory implements ICommandFactory diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java index fd5a761e1..306d230de 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java @@ -16,9 +16,9 @@ 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.wst.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.common.environment.uri.URI; import org.eclipse.wst.common.environment.uri.URIException; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public abstract class NativeFileCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java index 94f91d634..6509401e0 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java @@ -11,8 +11,13 @@ package org.eclipse.wst.command.internal.env.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.jface.wizard.IWizardPage; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** @@ -33,4 +38,9 @@ public class CurrentPageCommand extends AbstractDataModelOperation { return pageManager_.getCurrentPage(); } + + public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException + { + return Status.OK_STATUS; + } } diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java index c86649ca2..0450ad308 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java @@ -11,7 +11,12 @@ package org.eclipse.wst.command.internal.env.ui.widgets; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +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; /** @@ -32,4 +37,9 @@ public class DataObjectCommand extends AbstractDataModelOperation { return dataObject_; } + + public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException + { + return Status.OK_STATUS; + } } diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java index 8b3f257c4..1abb1e68a 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java @@ -11,8 +11,13 @@ package org.eclipse.wst.command.internal.env.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.jface.viewers.IStructuredSelection; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** @@ -35,4 +40,9 @@ public class SelectionCommand extends AbstractDataModelOperation { return selection_; } + + public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException + { + return Status.OK_STATUS; + } } diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java index 561fb7589..c35982acf 100644 --- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java +++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.BitSet; import java.util.ResourceBundle; import java.util.Vector; - import org.eclipse.wst.command.internal.env.common.StringUtils; diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java index 2eb42d1b3..0d8a1843c 100644 --- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java +++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java @@ -16,7 +16,7 @@ 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.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public class WaitForAutoBuildCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java index 9ada4f3b9..ff6a2c522 100644 --- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java +++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java @@ -12,7 +12,6 @@ package org.eclipse.wst.command.internal.env.context; import java.util.Vector; - import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java index 31675476f..b12fd54b4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java +++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java @@ -16,7 +16,6 @@ import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; - import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java index c1a8909ee..bbc765abb 100644 --- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java +++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java @@ -19,7 +19,7 @@ import java.util.Properties; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * @author cbrealey@ca.ibm.com diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java index 364d5e245..864bf08e2 100644 --- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java +++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java @@ -14,7 +14,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.text.MessageFormat; import java.util.Hashtable; - +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java index cca897f69..87aed0065 100644 --- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java +++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java @@ -15,21 +15,20 @@ import java.net.MalformedURLException; import java.util.Iterator; import java.util.List; import java.util.Vector; - import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IActionDelegate; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; 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.monitor.GetMonitorCommand; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.ui.IActionDelegate; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; public class PopupTestWSDL extends Action implements IActionDelegate { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java index 0cfceec6d..fd0e81f48 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; public class CheckWorkbenchFileReadOnlyAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java index 65d3db43b..56a51937b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java @@ -11,9 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public abstract class ClearNodeAction extends NodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java index d87965205..8ade3c5a9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java @@ -10,12 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import javax.servlet.http.*; import java.util.Hashtable; import java.util.Iterator; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public abstract class FormAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java index cefc21128..3ad12b3a3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import javax.servlet.http.HttpServletRequest; import javax.wsdl.Definition; import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLWriter; -import java.io.OutputStreamWriter; -import java.io.OutputStream; -import javax.servlet.http.*; import org.apache.wsil.WSILDocument; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl; public abstract class ImportToFileSystemAction extends LinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java index 1370dde4e..f9ddf5e87 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java @@ -10,9 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.LaunchWizardRunnable; +import org.eclipse.wst.ws.internal.explorer.LaunchWizardTask; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java index 223b155c3..06c508f25 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java @@ -11,10 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; // Abstract class representing the action of clicking a link. These actions // may change the history list. diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java index f9136ec40..48ec08b1d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java @@ -11,9 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; public class OpenCalendarBrowserAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java index f29974991..fc176914a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java @@ -11,9 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; public class OpenWSDLBrowserAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java index 01a5e40b2..56ef2d662 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java @@ -11,9 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; public class ProxyLoadPageAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java index 87d94cec9..1cc9e44a3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java @@ -11,11 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public abstract class ResizeFramesAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java index 494444b6c..fa84e2621 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java @@ -10,10 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeSelectionTransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public abstract class SelectNodeAction extends NodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java index bd35d8ec4..474048ce3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java @@ -10,10 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeIdTransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public abstract class ToggleNodeAction extends NodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java index ea7184d63..78c95671a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; public class ValidateEditAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java index dfcf6a356..8b96d21b0 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.actions; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; public class WriteWSDLToWorkbenchAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java index 8829f7df9..49f3f3fd2 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.datamodel; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; public class ListElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java index 79c44b18e..abbd14650 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java @@ -11,7 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.datamodel; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; public class ListManager { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java index 2d2da7445..8228ad3a8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java @@ -11,7 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.eclipse.wst.ws.internal.datamodel.BasicElement; +import org.eclipse.wst.ws.internal.datamodel.Model; public class TreeElement extends BasicElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java index 13fce578b..c613f0dd7 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java @@ -10,25 +10,23 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.engine; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.FactoryConfigurationError; +import javax.xml.parsers.ParserConfigurationException; import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants; import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor; import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor; import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor; - -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.FactoryConfigurationError; -import javax.xml.parsers.ParserConfigurationException; - import org.w3c.dom.CDATASection; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.NodeList; import org.w3c.dom.Node; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; +import org.w3c.dom.NodeList; public class ActionDataParser { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java index e33e3284b..f7ae8573f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java @@ -13,11 +13,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.engine; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Constructor; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.Hashtable; import java.util.Vector; - import org.eclipse.wst.ws.internal.explorer.platform.actions.Action; import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction; import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java index 5bf3299f4..48a0b2768 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java @@ -11,7 +11,6 @@ package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer; import java.util.Hashtable; - import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java index 81ac34fb9..521869289 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java @@ -12,7 +12,6 @@ package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer; import java.util.Hashtable; import java.util.Vector; - import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java index b4f0a2c68..182f3e88d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java @@ -10,9 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer; -import java.util.Hashtable; import java.util.Enumeration; - +import java.util.Hashtable; import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java index d2af98b5b..75657d232 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer; +import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import java.util.Enumeration; import org.eclipse.wst.ws.internal.datamodel.Element; import org.eclipse.wst.ws.internal.datamodel.Rel; import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java index 32312a53c..3e85712df 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java @@ -10,17 +10,18 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction; import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; -import java.util.Hashtable; - public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction { public AddBusinessToUDDIPerspectiveAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java index 174df859d..a5fdc5601 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java @@ -10,11 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class AddRegistryToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java index b3921bda3..93337f4ca 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java @@ -10,17 +10,18 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceInterfaceUUIDAction; import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; -import java.util.Hashtable; - public class AddServiceInterfaceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction { public AddServiceInterfaceToUDDIPerspectiveAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java index 26969d2a7..1db7f592e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java @@ -10,17 +10,18 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction; import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; -import java.util.Hashtable; - public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction { public AddServiceToUDDIPerspectiveAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java index 80a10308b..d249eef65 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java @@ -10,16 +10,17 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSILElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILAction; import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs; -import java.util.Hashtable; - public class AddWSILToWSILPerspectiveAction extends MultipleLinkAction { public AddWSILToWSILPerspectiveAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java index 233e22e39..568b21776 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java @@ -10,14 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; +import java.util.Hashtable; import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement; import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction; -import java.util.Hashtable; - public class FavoritesAddToWSDLPerspectiveAction extends MultipleLinkAction { public FavoritesAddToWSDLPerspectiveAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java index bad13a92a..632814c7b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java @@ -11,16 +11,18 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; - import java.io.OutputStream; import javax.wsdl.Definition; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; +import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; public class FavoritesImportToFileSystemAction extends ImportToFileSystemAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java index b26d560dc..58663dbb9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java @@ -11,13 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; +import java.util.Hashtable; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesImportToWorkbenchAction extends ImportToWorkbenchAction { public FavoritesImportToWorkbenchAction(Controller controller) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java index 58aae22b1..54917460c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java @@ -12,10 +12,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement; import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java index 9cd0e35b7..48076eb40 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java @@ -11,14 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - import java.util.Vector; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesRestoreDefaultFavoritesAction extends LinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java index d5d337a90..bafa64d9b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java @@ -11,9 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; public class FavoritesToggleNodeAction extends ToggleNodeAction { public FavoritesToggleNodeAction(Controller controller) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java index 7edb7f883..aa5aa09dc 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java @@ -10,14 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; +import javax.servlet.http.HttpServletRequest; import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MassNodeIdTransformer; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import javax.servlet.http.*; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; public abstract class MultipleLinkAction extends LinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java index 7c07c5bcb..877c72e06 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java @@ -10,14 +10,17 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - import java.util.Enumeration; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class RemoveFavoritesAction extends MultipleLinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java index a101bb44b..00ffe421b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java @@ -11,12 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesFrameNames; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public class ResizeFavoritesFramesAction extends ResizeFramesAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java index 32f0e372e..f4dfe1693 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java @@ -11,8 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; public class SelectFavoritesNodeAction extends SelectNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java index 9706b1924..295b76eaa 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java @@ -11,8 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; public class SelectFavoritesToolAction extends SelectNodeToolAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java index 4470c6ba4..46dc69997 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java @@ -11,12 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public final class SwitchPerspectiveFromFavoritesAction extends ShowPerspectiveAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java index b0833e785..07102a268 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java @@ -11,11 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; - import java.util.Enumeration; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java index 567dcc73d..2e637d3d8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java @@ -11,12 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; - -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java index 2ce48a25d..daeb65688 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java @@ -11,13 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.favorites.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.apache.wsil.*; +import org.apache.wsil.Link; +import org.apache.wsil.Service; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeWSE; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java index fa91fb18d..e9a148e08 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.apache.wsil.Link; +import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIBusiness; -import org.apache.wsil.*; public class FavoritesUDDIBusinessElement extends FavoritesElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java index 6fe50a018..903ec86fb 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java @@ -11,15 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import java.util.Hashtable; import java.util.Enumeration; -import org.apache.wsil.*; +import java.util.Hashtable; +import org.apache.wsil.Link; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java index d9d49d511..00a339723 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java @@ -11,10 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.apache.wsil.Link; +import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIRegistry; import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry; -import org.apache.wsil.*; public class FavoritesUDDIRegistryElement extends FavoritesElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java index bae3db071..c8c5b118d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java @@ -14,7 +14,6 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; import java.io.File; import java.util.Enumeration; import java.util.Hashtable; - import org.apache.wsil.Link; import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java index ee4ce93d3..2a86ed19b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.apache.wsil.Service; +import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIService; -import org.apache.wsil.*; public class FavoritesUDDIServiceElement extends FavoritesElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java index 384851598..0b8597651 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java @@ -11,15 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import java.util.Hashtable; import java.util.Enumeration; -import org.apache.wsil.*; +import java.util.Hashtable; +import org.apache.wsil.Service; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java index d3f892242..81e8beb8d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.apache.wsil.Service; +import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIServiceInterface; -import org.apache.wsil.*; public class FavoritesUDDIServiceInterfaceElement extends FavoritesElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java index bbdc90d31..dee62cb36 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java @@ -11,15 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import java.util.Hashtable; import java.util.Enumeration; -import org.apache.wsil.*; +import java.util.Hashtable; +import org.apache.wsil.Service; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java index ec9993d12..b842ff6f8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.apache.wsil.Service; +import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSDL; -import org.apache.wsil.*; public class FavoritesWSDLServiceElement extends FavoritesElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java index 7b26004a4..0e95e3e67 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java @@ -11,15 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import java.util.Hashtable; import java.util.Enumeration; -import org.apache.wsil.*; +import java.util.Hashtable; +import org.apache.wsil.Service; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesWSDLServiceFolderElement extends FavoritesFolderElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java index 764b6d61b..fb5d38dff 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.apache.wsil.Link; +import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSIL; -import org.apache.wsil.*; public class FavoritesWSILElement extends FavoritesElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java index d7d10c3f3..f6fb2c12f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java @@ -11,14 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.apache.wsil.*; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; +import org.apache.wsil.Link; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesWSILFolderElement extends FavoritesFolderElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java index c67c2b277..bdeba4a7d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java @@ -11,8 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesAddToWSDLPerspectiveAction; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; public class FavoritesAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java index debb25816..924d97890 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java @@ -12,10 +12,17 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSILFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesMainNode extends FavoritesNavigatorNode { public FavoritesMainNode(TreeElement treeElement, NodeManager nodeManager) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java index dfce85fbd..53d6cdd63 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java @@ -11,15 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; +import javax.servlet.ServletContext; import org.eclipse.wst.ws.internal.datamodel.BasicModel; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SwitchPerspectiveFromFavoritesAction; import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective; import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils; -import javax.servlet.*; - public class FavoritesPerspective extends Perspective { private BasicModel model_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java index d354eb4d9..ff57fe5a8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesUDDIBusinessFolderNode extends FavoritesNavigatorFolderNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java index cc6f6b263..4f5dfcb36 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesUDDIBusinessNode extends FavoritesNavigatorNode { public FavoritesUDDIBusinessNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java index 88fc7bd59..26aec8a58 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java @@ -11,14 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; +import java.io.File; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement; import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; -import java.io.*; - public class FavoritesUDDIRegistryFolderNode extends FavoritesNavigatorFolderNode { public FavoritesUDDIRegistryFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) { super(treeElement, nodeManager, nodeDepth); diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java index 85fdd7acc..ec7fc94ef 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesUDDIRegistryNode extends FavoritesNavigatorNode { public FavoritesUDDIRegistryNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth,String imagePath) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java index 37b722fff..4a555ba47 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesUDDIServiceFolderNode extends FavoritesNavigatorFolderNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java index 953000a94..9e8b19b7b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesUDDIServiceInterfaceFolderNode extends FavoritesNavigatorFolderNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java index 787993936..fd4223f76 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesUDDIServiceInterfaceNode extends FavoritesNavigatorNode { public FavoritesUDDIServiceInterfaceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java index 1c4024708..7eee38c22 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesUDDIServiceNode extends FavoritesNavigatorNode { public FavoritesUDDIServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java index b82b64487..39230ede4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesWSDLServiceFolderNode extends FavoritesNavigatorFolderNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java index 81c3c1bd0..311957a3e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java @@ -11,8 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesWSDLServiceNode extends FavoritesNavigatorNode { public FavoritesWSDLServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java index d938c4927..14f3ea324 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesWSILFolderNode extends FavoritesNavigatorFolderNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java index 1ae32dd86..5969d9572 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; public class FavoritesWSILNode extends FavoritesNavigatorNode { public FavoritesWSILNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java index 53123381b..98e5622bb 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; public abstract class ActionTool extends Tool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java index 355bce7ad..783cfdcab 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java @@ -11,14 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import javax.servlet.ServletContext; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*; - -import javax.servlet.*; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; public class Controller extends MessageProvider { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java index f95d0af8f..52fc4b8f8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; public abstract class FolderNode extends Node { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java index 8765319bb..51f95c5bb 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java @@ -11,9 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; - -import java.util.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; public abstract class FormTool extends Tool implements FormToolPropertiesInterface { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java index 09a4436ca..f0e58383b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java @@ -11,7 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; public class FormToolProperties implements FormToolPropertiesInterface { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java index a5926cfb5..accd0d3d6 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import java.util.*; +import java.util.Hashtable; public abstract interface FormToolPropertiesInterface { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java index 432bf703d..f219e2634 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java @@ -11,10 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; import java.util.Hashtable; - import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; - import org.eclipse.wst.ws.internal.explorer.LaunchOptions; import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java index ce8c8ca48..834bc71e3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import java.util.ResourceBundle; import java.util.MissingResourceException; +import java.util.ResourceBundle; /** * An message bundle is a collection of messages drawn from some diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java index 1395a32a7..4e08507f8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java @@ -11,7 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import java.util.*; +import java.util.MissingResourceException; +import java.util.ResourceBundle; // A Class which provides String messages. public class MessageProvider diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java index cccfc5d24..f28c81c5a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.util.*; +import java.util.Enumeration; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils; public class MessageQueue { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java index e3a2cdf68..ec413795b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java @@ -11,12 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import javax.servlet.http.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import javax.servlet.http.HttpServletResponse; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils; public abstract class Node { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java index edbe5ae85..6b23801e3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java @@ -11,8 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import javax.servlet.http.*; -import java.util.*; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; +import javax.servlet.http.HttpServletResponse; public class NodeManager { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java index bbe34a0f7..e3f44222b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import javax.servlet.*; +import javax.servlet.ServletContext; public abstract class Perspective extends MessageProvider { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java index f7dd679bb..6710fa319 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java @@ -11,12 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import javax.servlet.http.*; - -import java.util.*; +import java.util.Hashtable; +import javax.servlet.http.HttpServletResponse; +import org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames; +import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils; // A class for representing toolbar tools. public abstract class Tool diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java index 260b109b3..b5e24eb7c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import java.util.*; +import java.util.List; +import java.util.Vector; public class ToolManager { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java index 5dc398d6b..829013e91 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java @@ -11,9 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; - -import java.util.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; public abstract class ViewTool extends FormTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java index 6043aebc1..09f0fc254 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java @@ -11,13 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.util.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public class AddItemsToFavoritesAction extends UDDIPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java index 9271d416c..081d6bfb2 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java @@ -11,24 +11,35 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import org.uddi4j.*; -import org.uddi4j.util.*; -import org.uddi4j.response.*; +import java.net.MalformedURLException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.datatype.assertion.*; +import org.uddi4j.datatype.assertion.PublisherAssertion; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.tmodel.TModel; +import org.uddi4j.response.DispositionReport; +import org.uddi4j.response.Result; import org.uddi4j.transport.TransportException; - -import java.util.*; -import java.net.*; +import org.uddi4j.util.KeyedReference; public class AddPublisherAssertionsAction extends CommonPublisherAssertionsAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java index 87a82c1b2..b3d8b0f6a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java @@ -12,16 +12,27 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; public class AddToFavoritesAction extends UDDINodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java index 6961248ec..4a8dc5072 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java @@ -10,14 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.util.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.uddi4j.datatype.business.BusinessEntity; public class BusPublishServiceAdvancedAction extends PublishAction diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java index ea9da0af8..31c369166 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java @@ -10,14 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.util.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.uddi4j.datatype.business.BusinessEntity; public class BusPublishServiceSimpleAction extends PublishAction diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java index 9f305f803..f15ee0d33 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java @@ -11,17 +11,17 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.uddi4j.datatype.business.BusinessEntity; -import java.util.*; - public class BusinessGetServicesAction extends UDDINodeAction { private BusinessNode busNode_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java index 3a5db863c..d58061fb7 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; public class ClearNavigatorFolderNodeAction extends ClearNavigatorNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java index 75e4b421b..c9bdf423e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; public class ClearNavigatorNodeAction extends ClearNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java index e0f5166d2..5ba7b22f6 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java @@ -11,12 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.util.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public class ClearNavigatorNodesAction extends UDDIPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java index 5e14725a3..1920119e2 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java @@ -11,20 +11,25 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; import org.uddi4j.client.UDDIProxy; import org.uddi4j.response.BusinessInfo; import org.uddi4j.response.RegisteredInfo; -import java.util.Vector; -import java.util.Iterator; -import java.util.Enumeration; - public abstract class CommonPublisherAssertionsAction extends UDDIPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java index 985c352f4..6a00853d7 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java @@ -11,21 +11,32 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import org.uddi4j.client.UDDIProxy; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; -import org.uddi4j.response.*; +import org.uddi4j.client.UDDIProxy; +import org.uddi4j.response.CompletionStatus; +import org.uddi4j.response.DispositionReport; +import org.uddi4j.response.Result; import org.uddi4j.transport.TransportException; -import java.util.*; -import java.net.*; - public class CompletePublisherAssertionsAction extends CommonPublisherAssertionsAction { public CompletePublisherAssertionsAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java index b33b22a34..2cde5503b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java @@ -10,16 +10,33 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import java.util.Enumeration; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.util.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryParentElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryTransferTarget; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; public abstract class FindAction extends UDDIPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java index 0e470bad6..8a53f3679 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java @@ -11,23 +11,32 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.net.MalformedURLException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; +import org.uddi4j.client.UDDIProxy; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.service.BusinessServices; -import org.uddi4j.client.UDDIProxy; -import org.uddi4j.UDDIException; import org.uddi4j.transport.TransportException; -import java.util.*; -import java.net.*; - public class ManageReferencedServicesAction extends UDDIPropertiesFormAction { protected String subQueryKey_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java index 55573c624..3d1b1fd48 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java @@ -11,11 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.actions.Action; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; public class OpenCategoryBrowserAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java index e07820f97..891ff4f48 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java @@ -10,22 +10,39 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Hashtable; +import java.util.Properties; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.datatype.tmodel.*; -import org.uddi4j.transport.*; -import org.uddi4j.response.*; -import org.uddi4j.util.*; -import org.uddi4j.*; - -import java.util.*; -import java.net.*; +import org.uddi4j.datatype.tmodel.TModel; +import org.uddi4j.response.TModelDetail; +import org.uddi4j.response.TModelInfo; +import org.uddi4j.response.TModelInfos; +import org.uddi4j.response.TModelList; +import org.uddi4j.transport.TransportException; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.KeyedReference; public class OpenRegistryAction extends UDDIPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java index 01a22061e..22c9d8e9d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java @@ -10,22 +10,37 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import java.util.Enumeration; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import java.util.*; - public abstract class PublishAction extends UDDIPropertiesFormAction { protected String subQueryKey_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java index 489bc0102..1ca92f5ce 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java @@ -11,20 +11,35 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddRegistryToUDDIPerspectiveAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.PublishedItemsNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryParentNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import java.util.*; - public class RefreshUDDINodeAction extends UDDINodeAction { private Vector staleNodes_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java index 4b3d246e9..9feb1f184 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java @@ -11,13 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.util.*; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public class RefreshUDDINodesAction extends UDDIPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java index 34223f5dd..4e3d8a2e3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java @@ -11,19 +11,23 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; -import org.uddi4j.transport.TransportException; import org.uddi4j.client.UDDIProxy; import org.uddi4j.datatype.business.BusinessEntity; - -import java.util.*; +import org.uddi4j.transport.TransportException; public class RegFindBusinessUUIDAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java index 300a7946f..771abc9ea 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java @@ -11,26 +11,38 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; +import java.net.MalformedURLException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; -import org.uddi4j.transport.TransportException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.datatype.tmodel.TModel; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; -import org.uddi4j.datatype.*; +import org.uddi4j.datatype.tmodel.TModel; import org.uddi4j.response.BusinessInfo; import org.uddi4j.response.BusinessInfos; -import org.uddi4j.util.*; - -import java.util.*; -import java.net.MalformedURLException; +import org.uddi4j.transport.TransportException; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.DiscoveryURL; +import org.uddi4j.util.DiscoveryURLs; +import org.uddi4j.util.FindQualifier; +import org.uddi4j.util.FindQualifiers; +import org.uddi4j.util.IdentifierBag; +import org.uddi4j.util.KeyedReference; +import org.uddi4j.util.TModelBag; public class RegFindBusinessesAdvancedAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java index b30e24530..d2438b24e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java @@ -11,22 +11,24 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.transport.TransportException; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; -import org.uddi4j.datatype.*; import org.uddi4j.response.BusinessInfo; import org.uddi4j.response.BusinessInfos; - -import java.util.*; +import org.uddi4j.transport.TransportException; public class RegFindBusinessesSimpleAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java index ead534a14..58f86e685 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java @@ -11,20 +11,24 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.response.*; +import org.uddi4j.response.TModelDetail; import org.uddi4j.transport.TransportException; -import org.uddi4j.UDDIException; - -import java.util.*; public class RegFindServiceInterfaceUUIDAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java index 2b5c302f7..40d2781c4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java @@ -10,25 +10,41 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.net.MalformedURLException; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.datatype.binding.*; -import org.uddi4j.datatype.service.*; -import org.uddi4j.datatype.tmodel.*; -import org.uddi4j.response.*; +import org.uddi4j.datatype.binding.BindingTemplate; +import org.uddi4j.datatype.binding.BindingTemplates; +import org.uddi4j.datatype.binding.TModelInstanceDetails; +import org.uddi4j.datatype.binding.TModelInstanceInfo; +import org.uddi4j.datatype.service.BusinessService; +import org.uddi4j.datatype.tmodel.TModel; +import org.uddi4j.response.DispositionReport; +import org.uddi4j.response.RegisteredInfo; +import org.uddi4j.response.Result; +import org.uddi4j.response.TModelDetail; +import org.uddi4j.response.TModelInfo; +import org.uddi4j.response.TModelInfos; +import org.uddi4j.response.TModelList; import org.uddi4j.transport.TransportException; -import org.uddi4j.util.*; -import org.uddi4j.UDDIException; - -import java.util.*; -import java.net.*; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.FindQualifier; +import org.uddi4j.util.FindQualifiers; +import org.uddi4j.util.IdentifierBag; +import org.uddi4j.util.KeyedReference; public class RegFindServiceInterfacesAdvancedAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java index a6567a9eb..420359821 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java @@ -11,20 +11,25 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.response.*; +import org.uddi4j.response.TModelDetail; +import org.uddi4j.response.TModelInfo; +import org.uddi4j.response.TModelInfos; +import org.uddi4j.response.TModelList; import org.uddi4j.transport.TransportException; -import org.uddi4j.UDDIException; - -import java.util.*; public class RegFindServiceInterfacesSimpleAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java index 207e86876..9cbc0358c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java @@ -11,20 +11,24 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; import org.uddi4j.datatype.service.BusinessService; -import org.uddi4j.response.*; +import org.uddi4j.response.ServiceDetail; import org.uddi4j.transport.TransportException; -import org.uddi4j.UDDIException; - -import java.util.*; public class RegFindServiceUUIDAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java index 0f249e3bd..8556db5c8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java @@ -10,26 +10,42 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.response.*; +import org.uddi4j.response.BusinessInfo; +import org.uddi4j.response.BusinessInfos; +import org.uddi4j.response.DispositionReport; +import org.uddi4j.response.RegisteredInfo; +import org.uddi4j.response.Result; +import org.uddi4j.response.ServiceDetail; +import org.uddi4j.response.ServiceInfo; +import org.uddi4j.response.ServiceInfos; +import org.uddi4j.response.ServiceList; import org.uddi4j.transport.TransportException; -import org.uddi4j.datatype.*; -import org.uddi4j.util.*; -import org.uddi4j.UDDIException; - -import java.util.*; -import java.net.*; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.FindQualifier; +import org.uddi4j.util.FindQualifiers; +import org.uddi4j.util.KeyedReference; +import org.uddi4j.util.TModelBag; public class RegFindServicesAdvancedAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java index 0a6793168..5eaef0de7 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java @@ -11,21 +11,26 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.service.BusinessService; -import org.uddi4j.datatype.*; -import org.uddi4j.response.*; +import org.uddi4j.response.ServiceDetail; +import org.uddi4j.response.ServiceInfo; +import org.uddi4j.response.ServiceInfos; +import org.uddi4j.response.ServiceList; import org.uddi4j.transport.TransportException; -import org.uddi4j.UDDIException; - -import java.util.*; public class RegFindServicesSimpleAction extends FindAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java index 001fbad7e..5ae3a8a73 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java @@ -11,26 +11,30 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.transport.TransportException; +import org.uddi4j.datatype.Description; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; -import org.uddi4j.datatype.*; -import org.uddi4j.util.IdentifierBag; +import org.uddi4j.transport.TransportException; import org.uddi4j.util.CategoryBag; -import org.uddi4j.util.DiscoveryURLs; import org.uddi4j.util.DiscoveryURL; +import org.uddi4j.util.DiscoveryURLs; +import org.uddi4j.util.IdentifierBag; import org.uddi4j.util.KeyedReference; -import java.util.*; -import java.net.*; - public class RegPublishBusinessAdvancedAction extends PublishAction { public RegPublishBusinessAdvancedAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java index 10ee7ef74..57dd64ded 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java @@ -11,20 +11,22 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.net.MalformedURLException; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.transport.TransportException; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; -import org.uddi4j.datatype.*; - -import java.util.*; -import java.net.*; +import org.uddi4j.transport.TransportException; public class RegPublishBusinessSimpleAction extends PublishAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java index d9a3ca50a..8cb48a616 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java @@ -10,28 +10,35 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.transport.TransportException; +import org.uddi4j.datatype.Description; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.datatype.*; -import org.uddi4j.util.*; - -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import java.util.*; -import java.net.*; +import org.uddi4j.transport.TransportException; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.KeyedReference; public class RegPublishServiceAdvancedAction extends PublishAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java index ef218529a..9af4270b2 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java @@ -11,24 +11,29 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import javax.wsdl.WSDLException; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.transport.TransportException; +import org.uddi4j.datatype.Description; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.datatype.*; -import org.uddi4j.util.*; - -import javax.wsdl.WSDLException; -import java.util.*; -import java.net.*; +import org.uddi4j.transport.TransportException; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.IdentifierBag; +import org.uddi4j.util.KeyedReference; public class RegPublishServiceInterfaceAdvancedAction extends PublishAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java index 211baade0..6e6657c58 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java @@ -11,22 +11,24 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import java.net.MalformedURLException; +import java.util.Vector; +import javax.wsdl.WSDLException; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.transport.TransportException; import org.uddi4j.datatype.tmodel.TModel; - -import javax.wsdl.WSDLException; -import java.util.*; -import java.net.*; +import org.uddi4j.transport.TransportException; public class RegPublishServiceInterfaceSimpleAction extends PublishAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java index bbe0caafb..cc5c222c9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java @@ -10,27 +10,31 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.transport.TransportException; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.datatype.*; - -import javax.wsdl.WSDLException; -import javax.wsdl.Definition; -import java.util.*; -import java.net.*; +import org.uddi4j.transport.TransportException; public class RegPublishServiceSimpleAction extends PublishAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java index ed001171c..e6f615ca3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java @@ -11,22 +11,33 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import org.uddi4j.*; -import org.uddi4j.response.*; -import org.uddi4j.datatype.assertion.*; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; +import org.uddi4j.datatype.assertion.PublisherAssertion; +import org.uddi4j.response.CompletionStatus; +import org.uddi4j.response.DispositionReport; +import org.uddi4j.response.Result; import org.uddi4j.transport.TransportException; -import java.util.*; -import java.net.*; - public class RemovePublisherAssertionsAction extends CommonPublisherAssertionsAction { public RemovePublisherAssertionsAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java index e9f354432..01bb1f7f8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java @@ -11,14 +11,17 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - -import javax.servlet.http.*; - -import java.util.*; +import java.util.Vector; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.actions.Action; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; public class RemoveSubQueryItemAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java index 6b30c2e5a..8d37a9620 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java @@ -11,12 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIFrameNames; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public class ResizeUDDIFramesAction extends ResizeFramesAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java index 7fa3d43df..2088d3d76 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; public class SelectCategoryNodeAction extends SelectNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java index 5afd276b7..896d0cacf 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; public class SelectFindToolAction extends SelectPropertiesToolAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java index 44c9845ae..8b8ddbaa3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java @@ -11,9 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; public class SelectNavigatorNodeAction extends SelectNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java index 388995c4c..821784add 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; public class SelectPropertiesToolAction extends SelectNodeToolAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java index 0d9f2f06a..490fb96bf 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java @@ -10,20 +10,23 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - +import java.util.Hashtable; +import java.util.Vector; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import javax.servlet.http.*; - -import java.util.*; - public class SelectSubQueryItemAction extends SelectPropertiesToolAction { private boolean requiresTreeViewRefresh_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java index 9b0987f8c..cf5234668 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java @@ -11,16 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - -import org.uddi4j.datatype.service.*; - -import java.util.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.actions.NodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.uddi4j.datatype.service.BusinessService; public class ServiceGetBusinessAction extends NodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java index 22ced4ccb..61f8124ea 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java @@ -11,16 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - -import org.uddi4j.datatype.service.*; - -import java.util.*; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.uddi4j.datatype.service.BusinessService; public class ServiceGetServiceInterfacesAction extends UDDINodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java index 8187288a7..d80035921 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java @@ -11,17 +11,17 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - -import org.uddi4j.datatype.tmodel.*; -import org.uddi4j.util.*; - -import java.util.*; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.uddi4j.datatype.tmodel.TModel; +import org.uddi4j.util.TModelBag; public class ServiceInterfaceGetBusinessesAction extends UDDINodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java index 52cbeea5e..bb23f274c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java @@ -11,17 +11,17 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - -import org.uddi4j.datatype.tmodel.*; -import org.uddi4j.util.*; - -import java.util.*; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.uddi4j.datatype.tmodel.TModel; +import org.uddi4j.util.TModelBag; public class ServiceInterfaceGetServicesAction extends UDDINodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java index 01c321f4e..44a6a9805 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java @@ -11,22 +11,40 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.net.MalformedURLException; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; -import org.uddi4j.transport.TransportException; -import org.uddi4j.util.*; -import org.uddi4j.response.*; -import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.client.UDDIProxy; - -import java.util.*; -import java.net.*; +import org.uddi4j.datatype.business.BusinessEntity; +import org.uddi4j.response.AssertionStatusItem; +import org.uddi4j.response.AssertionStatusReport; +import org.uddi4j.response.CompletionStatus; +import org.uddi4j.response.DispositionReport; +import org.uddi4j.response.RelatedBusinessInfo; +import org.uddi4j.response.RelatedBusinessesList; +import org.uddi4j.response.Result; +import org.uddi4j.response.SharedRelationships; +import org.uddi4j.transport.TransportException; +import org.uddi4j.util.FindQualifiers; +import org.uddi4j.util.KeyedReference; public class ShowPublisherAssertionsAction extends CommonPublisherAssertionsAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java index 8a142b386..5cc79e6be 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java @@ -11,12 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public final class SwitchPerspectiveFromUDDIAction extends ShowPerspectiveAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java index 43272da62..85a089d3d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java @@ -11,10 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; public class ToggleCategoryNodeAction extends ToggleNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java index a0fccac81..0a8045bd5 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java @@ -11,9 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; public class ToggleNavigatorNodeAction extends ToggleNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java index e6b31f079..0b20134de 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java @@ -11,15 +11,27 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryTransferTarget; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; public class TransferSubQueryResultsAction extends UDDIPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java index 566b0b800..025265d55 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java @@ -11,11 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.actions.Action; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; public class TransferToAddCategoryDataAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java index 69160696e..5f0659a28 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java @@ -11,24 +11,26 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*; - -import org.uddi4j.datatype.service.BusinessService; - -import javax.servlet.http.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Hashtable; +import javax.servlet.http.HttpServletRequest; import javax.wsdl.Definition; import javax.wsdl.WSDLException; - -import java.util.*; -import java.net.*; -import java.io.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction; +import org.uddi4j.datatype.service.BusinessService; public class UDDIAddToWSDLPerspectiveAction extends LinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java index f0b281f16..3c49d5f7c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java @@ -11,16 +11,19 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; - -import java.io.*; +import java.io.OutputStream; import javax.wsdl.Definition; - +import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; +import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java index 083435a37..4ab1cac49 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java @@ -11,12 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; - import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; public class UDDIImportWSDLToWorkbenchAction extends ImportToWorkbenchAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java index b290772f8..6a65f46fd 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java @@ -11,19 +11,23 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import java.io.File; +import java.io.FileOutputStream; +import javax.wsdl.Definition; +import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; - import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import java.io.*; -import javax.wsdl.Definition; - public class UDDILaunchWebServiceWizardAction extends LaunchWebServiceWizardAction { public UDDILaunchWebServiceWizardAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java index d21e58239..4387ffc95 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.NodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode; public abstract class UDDINodeAction extends NodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java index 4dd19b6bf..1078b291a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java @@ -11,9 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode; public abstract class UDDIPropertiesFormAction extends FormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java index b3cca2804..9a9af761f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java @@ -11,19 +11,27 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import org.uddi4j.transport.TransportException; -import org.uddi4j.response.*; -import org.uddi4j.*; +import java.net.MalformedURLException; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; - -import java.net.*; +import org.uddi4j.response.DispositionReport; +import org.uddi4j.transport.TransportException; public class UnpublishAction extends UDDIPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java index 2bfbb9958..6f6365007 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java @@ -10,22 +10,37 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.PublishedItemsNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import java.util.*; - public abstract class UpdateAction extends UDDIPropertiesFormAction { protected RegistryNode regNode_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java index 64086bc4c..0c30fcf54 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java @@ -11,22 +11,30 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.transport.TransportException; +import org.uddi4j.datatype.Description; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; -import org.uddi4j.datatype.*; -import org.uddi4j.util.*; - -import java.util.*; -import java.net.*; +import org.uddi4j.transport.TransportException; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.DiscoveryURL; +import org.uddi4j.util.DiscoveryURLs; +import org.uddi4j.util.IdentifierBag; +import org.uddi4j.util.KeyedReference; public class UpdateBusinessAction extends UpdateAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java index acc9a12f2..4edc31d69 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java @@ -10,14 +10,19 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - -import java.text.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.StringReader; +import java.text.ParseException; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; public class UpdateRegistryAction extends UpdateAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java index 9ee5dab54..41bfc586d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java @@ -11,28 +11,35 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegPublishTool; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; -import org.uddi4j.datatype.service.BusinessService; +import org.uddi4j.datatype.Description; +import org.uddi4j.datatype.Name; import org.uddi4j.datatype.business.BusinessEntity; +import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.datatype.*; -import org.uddi4j.response.*; +import org.uddi4j.response.ServiceDetail; import org.uddi4j.transport.TransportException; -import org.uddi4j.util.*; -import org.uddi4j.UDDIException; - -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import java.util.*; -import java.net.*; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.KeyedReference; public class UpdateServiceAction extends UpdateAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java index 70d78395b..a042a2003 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java @@ -11,25 +11,30 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; +import javax.wsdl.WSDLException; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective; import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; - +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; +import org.uddi4j.datatype.Description; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.datatype.*; +import org.uddi4j.response.TModelDetail; import org.uddi4j.transport.TransportException; -import org.uddi4j.response.*; -import org.uddi4j.util.*; -import org.uddi4j.UDDIException; - -import javax.wsdl.WSDLException; -import java.util.*; -import java.net.*; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.IdentifierBag; +import org.uddi4j.util.KeyedReference; public class UpdateServiceInterfaceAction extends UpdateAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java index 09562fd8e..a40b239d9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java @@ -10,12 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; +import java.util.Enumeration; import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; -import java.util.Enumeration; - public abstract class AbstractUDDIElement extends TreeElement { public AbstractUDDIElement(String name, Model model) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java index b1d4ed233..f6fcc6a4f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java @@ -10,9 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; - +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; import org.uddi4j.datatype.business.BusinessEntity; public class BusinessElement extends AbstractUDDIElement diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java index 478c87fa9..b111b246f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java @@ -10,9 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; - -import org.uddi4j.util.*; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.uddi4j.util.KeyedReference; public class CategoryElement extends AbstractUDDIElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java index d49432492..f24b27c8b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; - -import java.util.*; +import java.util.Enumeration; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; public class PublishedItemsElement extends AbstractUDDIElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java index 8580dd6f1..eac7d6154 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java @@ -11,11 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; import org.uddi4j.datatype.assertion.PublisherAssertion; import org.uddi4j.util.KeyedReference; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; - public class PublisherAssertionElement { // owningBusinessKey_ is the key of the business element that owns this diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java index fdf824f48..59bed5068 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java @@ -10,15 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; -import org.uddi4j.datatype.tmodel.*; - -import java.util.*; +import org.uddi4j.datatype.tmodel.TModel; public class QueryElement extends AbstractUDDIElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java index 961485ba5..c2d822c44 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; - -import java.util.*; +import java.util.Enumeration; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; public class QueryParentElement extends AbstractUDDIElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java index 2949762db..24c336d2a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java @@ -10,17 +10,19 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.parser.discovery.*; +import java.net.MalformedURLException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.parser.discovery.NetUtils; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; +import org.uddi4j.datatype.Description; +import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.response.AuthToken; import org.uddi4j.transport.TransportException; -import org.uddi4j.datatype.service.*; -import org.uddi4j.datatype.*; -import java.util.*; -import java.net.*; public class RegistryElement extends AbstractUDDIElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java index 62f559fcc..cc10e2c00 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java @@ -10,8 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; - +import org.eclipse.wst.ws.internal.datamodel.Model; import org.uddi4j.datatype.service.BusinessService; public class ServiceElement extends AbstractUDDIElement diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java index 7eb9acfde..108142d3b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java @@ -10,8 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; - +import org.eclipse.wst.ws.internal.datamodel.Model; import org.uddi4j.datatype.tmodel.TModel; public class ServiceInterfaceElement extends AbstractUDDIElement diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java index 1ba793ab5..ef72f68dd 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java @@ -11,10 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; - -import java.util.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; public class UDDIMainElement extends TreeElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java index 97ed102f8..b05a85380 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java @@ -11,15 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; import org.uddi4j.datatype.business.BusinessEntity; -import org.uddi4j.util.*; - -import java.util.*; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.DiscoveryURLs; +import org.uddi4j.util.IdentifierBag; public class BusinessDetailsTool extends DetailsTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java index 307ffde27..41023b64a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java @@ -11,10 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.BusinessGetServicesAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public class BusinessNode extends UDDINavigatorNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java index dea0df097..9c4ac3e79 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java @@ -11,13 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - -import java.util.*; +import java.util.Enumeration; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectCategoryNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleCategoryNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIFrameNames; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryElement; public class CategoryNode extends Node { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java index 2f8cfcd63..4571f14d7 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java @@ -11,13 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - -import java.util.*; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public class DetailsTool extends FormTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java index 4f4f3cf2e..ac040de73 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java @@ -11,8 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; public class GetBusinessesTool extends ActionTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java index 7ea5ac0d0..8ed766311 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java @@ -11,8 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; public class GetServiceInterfacesTool extends ActionTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java index f2f034a3c..e14e65568 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java @@ -11,8 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; public class GetServicesTool extends ActionTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java index e3507e2c2..d14fbe2aa 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface; public abstract interface MultipleFormToolPropertiesInterface { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java index 1c3885877..a2aee33f6 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java @@ -11,14 +11,17 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; - -import java.util.*; +import java.util.Enumeration; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; public class OpenRegistryTool extends FormTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java index c43146192..6539d9a60 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java @@ -11,11 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement; public class PublishedItemsNode extends UDDINavigatorFolderNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java index 435046aa5..3b014f7fb 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java @@ -11,20 +11,26 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - +import java.util.Vector; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.FindAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import java.util.*; - public class QueryNode extends UDDINavigatorNode { private FormTool regFindTool_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java index 177189639..d482fe1c8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java @@ -11,11 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public class QueryParentNode extends UDDINavigatorFolderNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java index f37d64d69..233f8c920 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java @@ -11,8 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RefreshUDDINodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; public class RefreshTool extends ActionTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java index e7a33a5c8..ce960f00a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java @@ -11,10 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public class RegistryDetailsTool extends DetailsTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java index f3e233f2c..ccf029751 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java @@ -11,14 +11,20 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - -import java.util.*; +import java.util.Vector; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryParentElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public class RegistryNode extends UDDINavigatorNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java index a6340d0f2..99a765a7e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; public class ResultsTool extends FormTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java index 5726ee673..c0c4233cd 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java @@ -11,12 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - -import java.util.*; +import java.util.Enumeration; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryElement; public class RootCategoryNode extends Node { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java index 807b79d65..4f70b4099 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java @@ -11,15 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - -import org.uddi4j.datatype.service.*; -import org.uddi4j.util.*; - -import java.util.*; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement; +import org.uddi4j.datatype.service.BusinessService; +import org.uddi4j.util.CategoryBag; public class ServiceDetailsTool extends DetailsTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java index 0f8968b8b..4e70e98a7 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java @@ -11,16 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - -import org.uddi4j.datatype.tmodel.*; -import org.uddi4j.util.*; - -import java.util.*; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement; +import org.uddi4j.datatype.tmodel.TModel; +import org.uddi4j.util.CategoryBag; +import org.uddi4j.util.IdentifierBag; public class ServiceInterfaceDetailsTool extends DetailsTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java index bddcad28d..b3fca7c49 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java @@ -11,11 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceInterfaceGetBusinessesAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceInterfaceGetServicesAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public class ServiceInterfaceNode extends UDDINavigatorNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java index d732b078d..f2c0a5717 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java @@ -11,11 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceGetBusinessAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceGetServiceInterfacesAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public class ServiceNode extends UDDINavigatorNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java index 74a8fac08..acd82748d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java @@ -11,10 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import java.util.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool; public class SubQueryTransferTarget { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java index d621f8e28..97a68a3c0 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java @@ -11,8 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIAddToWSDLPerspectiveAction; public class UDDIAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool { public UDDIAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java index fe9f7f802..cba7ba0e0 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java @@ -11,8 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIImportWSDLToFileSystemAction; public class UDDIImportWSDLToFileSystemTool extends ImportToFileSystemTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java index 2752ad811..627683b9c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java @@ -11,8 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; public class UDDIImportWSDLToWorkbenchTool extends ImportToWorkbenchTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java index ee99d18f4..3f432c28f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java @@ -11,8 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; public class UDDILaunchWebServiceWizardTool extends LaunchWebServiceWizardTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java index a8773d3ee..f2ed89ee8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java @@ -11,13 +11,17 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; - -import java.util.*; +import java.util.Enumeration; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement; // Root node for the UDDI Navigator Tree View public class UDDIMainNode extends UDDINavigatorNode diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java index 63f6a2bd8..6bbf4cc5d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FolderNode; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectNavigatorNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleNavigatorNodeAction; public abstract class UDDINavigatorFolderNode extends FolderNode { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java index 2490287f7..bf59abf1d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java @@ -11,10 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectNavigatorNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleNavigatorNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public abstract class UDDINavigatorNode extends Node { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java index ba5e87085..0fac1251d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java @@ -17,9 +17,7 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; import java.util.Vector; - import javax.servlet.ServletContext; - import org.eclipse.wst.ws.internal.datamodel.BasicModel; import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java index a0dd6ae3e..8cfcd0575 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java @@ -11,10 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; public class UnpublishTool extends FormTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java index 5dfca9ebe..10e3b8c88 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java @@ -11,26 +11,25 @@ package org.eclipse.wst.ws.internal.explorer.platform.uddi.util; import java.util.Hashtable; -import java.util.Vector; -import java.util.List; import java.util.Iterator; +import java.util.List; +import java.util.Vector; +import javax.wsdl.Binding; import javax.wsdl.Definition; -import javax.wsdl.Service; +import javax.wsdl.Import; +import javax.wsdl.Message; import javax.wsdl.Port; -import javax.wsdl.Binding; import javax.wsdl.PortType; -import javax.wsdl.Message; -import javax.wsdl.Import; +import javax.wsdl.Service; import javax.wsdl.WSDLException; import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.soap.SOAPAddress; import javax.wsdl.extensions.http.HTTPAddress; - -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.CharacterData; +import javax.wsdl.extensions.soap.SOAPAddress; +import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; import org.uddi4j.UDDIException; import org.uddi4j.client.UDDIProxy; +import org.uddi4j.datatype.OverviewDoc; +import org.uddi4j.datatype.OverviewURL; import org.uddi4j.datatype.binding.AccessPoint; import org.uddi4j.datatype.binding.BindingTemplate; import org.uddi4j.datatype.binding.BindingTemplates; @@ -39,14 +38,13 @@ import org.uddi4j.datatype.binding.TModelInstanceDetails; import org.uddi4j.datatype.binding.TModelInstanceInfo; import org.uddi4j.datatype.service.BusinessService; import org.uddi4j.datatype.tmodel.TModel; -import org.uddi4j.datatype.OverviewDoc; -import org.uddi4j.datatype.OverviewURL; import org.uddi4j.response.TModelDetail; import org.uddi4j.transport.TransportException; import org.uddi4j.util.CategoryBag; import org.uddi4j.util.KeyedReference; - -import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; +import org.w3c.dom.CharacterData; +import org.w3c.dom.Element; +import org.w3c.dom.Node; public class Uddi4jHelper { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java index ff74f6717..d54f81c26 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java @@ -11,9 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.util; -import javax.servlet.http.*; - -import java.io.*; +import java.io.CharArrayWriter; +import java.io.PrintWriter; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; public class CharArrayWrapper extends HttpServletResponseWrapper { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java index f084d3cbf..7ebcb0ab9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java @@ -11,8 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.util; -import javax.servlet.http.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import javax.servlet.http.HttpServletResponse; public final class HTMLUtils { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java index d442218ec..193036d21 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java @@ -10,10 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.util; -import java.io.*; -import java.util.*; - -import javax.servlet.http.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; +import javax.servlet.http.HttpServletRequest; public final class MultipartFormDataParser { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java index 085151316..9fa7e2e08 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.util; -import java.text.*; +import java.text.Collator; import java.util.Vector; public class QuickSort diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java index 3f3fc03d0..03160dd53 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java @@ -11,10 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.util; -import javax.servlet.http.*; -import javax.servlet.*; - -import java.io.*; +import java.io.IOException; +import java.io.OutputStreamWriter; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; public class TrimFilter implements Filter { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java index bcbe4d487..df2e1207a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java @@ -10,17 +10,22 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.util; -import org.w3c.dom.*; -import org.xml.sax.*; - -import javax.xml.parsers.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; - -import java.io.*; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentFragment; +import org.w3c.dom.Element; +import org.xml.sax.SAXException; public final class XMLUtils { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java index 4c16789d0..51f2c29d6 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; +import javax.servlet.http.HttpServletRequest; import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode; -import javax.servlet.http.*; - public class ClearWSDLAction extends ClearNodeAction { public ClearWSDLAction(Controller controller) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java index abca81e9d..cf0d25bcd 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java @@ -10,7 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import java.util.Iterator; +import javax.wsdl.Part; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; @@ -20,9 +25,6 @@ import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragme import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; -import javax.wsdl.Part; -import java.util.Iterator; - public class CreateInstanceAction extends WSDLPropertiesFormAction { public CreateInstanceAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java index d069e4312..3b4f8b1a2 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java @@ -13,7 +13,6 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; import java.io.IOException; import java.net.URLConnection; - import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java index d85832a19..6a6168ed8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java @@ -10,19 +10,23 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*; - -import javax.wsdl.*; - -import java.util.*; -import java.net.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URLConnection; +import java.util.Iterator; +import javax.wsdl.Part; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.HTTPUtil; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool; public abstract class InvokeWSDLHttpOperationFormAction extends WSDLPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java index 981c4307f..4d7562b5e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java @@ -14,7 +14,6 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; import java.io.IOException; import java.io.PrintWriter; import java.net.URLConnection; - import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java index b3668d9f7..bdca4ed43 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java @@ -10,29 +10,44 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPException; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.*; -import org.eclipse.wst.ws.internal.parser.discovery.*; - -import org.apache.axis.Constants; - -import org.w3c.dom.*; - -import javax.xml.parsers.*; -import javax.wsdl.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; +import javax.servlet.http.HttpServletResponse; +import javax.wsdl.BindingInput; +import javax.wsdl.BindingOperation; +import javax.wsdl.Definition; +import javax.wsdl.Part; import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.soap.SOAPBody; -import javax.servlet.http.HttpServletResponse; - -import java.util.*; -import java.io.*; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import org.apache.axis.Constants; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.Endpoint; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.SOAPMessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPException; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SoapHelper; +import org.eclipse.wst.ws.internal.parser.discovery.NetUtils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; public abstract class InvokeWSDLSOAPOperationAction extends WSDLPropertiesFormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java index db7653225..105363956 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java @@ -10,18 +10,19 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; +import java.util.Iterator; +import javax.wsdl.Part; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transformer.FragmentTransformer; -import javax.wsdl.*; -import java.util.*; - public class InvokeWSDLSOAPOperationFormAction extends InvokeWSDLSOAPOperationAction { public InvokeWSDLSOAPOperationFormAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java index 6ed599247..1257f406b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java @@ -10,15 +10,25 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.*; -import org.w3c.dom.*; -import javax.xml.parsers.*; -import java.util.*; -import java.io.*; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.util.Hashtable; +import java.util.Vector; +import javax.xml.parsers.ParserConfigurationException; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SoapHelper; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; public class InvokeWSDLSOAPOperationSourceAction extends InvokeWSDLSOAPOperationAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java index 338281506..764f15b5a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java @@ -11,18 +11,22 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import java.util.Vector; +import javax.wsdl.WSDLException; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; -import javax.wsdl.WSDLException; -import java.util.Vector; - public class OpenWSDLAction extends WSDLPropertiesFormAction { public OpenWSDLAction(Controller controller) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java index c12cfd50a..dd38afcd4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java @@ -11,11 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; - -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.actions.Action; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs; public class OpenXSDInfoDialogAction extends Action { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java index 8cb9062b8..a522eff88 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java @@ -11,16 +11,20 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*; - import java.util.Vector; +import javax.servlet.http.HttpServletRequest; import javax.wsdl.Definition; import javax.wsdl.WSDLException; -import javax.servlet.http.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; public class RefreshWSDLAction extends LinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java index e7fdbb512..db773fa3f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java @@ -11,12 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; public class ResizeWSDLFramesAction extends ResizeFramesAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java index a6e52fc3f..02b9fc74a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java @@ -12,8 +12,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; public class SelectWSDLNavigatorNodeAction extends SelectNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java index 89d53cafd..aedd18c7f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; public class SelectWSDLPropertiesToolAction extends SelectNodeToolAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java index 920c57352..7b5574885 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java @@ -11,12 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; public final class SwitchPerspectiveFromWSDLAction extends ShowPerspectiveAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java index 8ed578f9f..7c531e446 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java @@ -10,16 +10,19 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*; - -import javax.wsdl.*; -import java.util.*; - +import java.util.Iterator; +import java.util.Vector; +import javax.wsdl.Part; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java index 42a6e4b82..d4e680102 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java @@ -11,9 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; public class ToggleWSDLNavigatorNodeAction extends ToggleNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java index eaf6bffb9..c02dc5b32 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java @@ -10,8 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs; @@ -20,10 +27,6 @@ import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDL import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLBindingNode; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; -import java.util.Vector; -import java.util.List; -import java.util.Iterator; - public class UpdateWSDLBindingAction extends WSDLPropertiesFormAction { public UpdateWSDLBindingAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java index 8f00ab1c5..16bcb04c1 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java @@ -11,20 +11,20 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; +import java.util.Enumeration; +import java.util.Hashtable; +import javax.servlet.http.HttpServletRequest; import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement; import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; -import java.util.Enumeration; -import java.util.Hashtable; -import javax.servlet.http.*; - public class WSDLAddToFavoritesAction extends LinkAction { public WSDLAddToFavoritesAction(Controller controller) { super(controller); diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java index 30e314f93..403fcc3bb 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java @@ -11,16 +11,17 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; +import java.io.OutputStream; +import javax.wsdl.Definition; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; -import javax.wsdl.Definition; -import java.io.OutputStream; - public class WSDLImportWSDLToFileSystemAction extends ImportToFileSystemAction { private Definition definition_; private String defaultWSDLFileName_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java index ed9c54bf7..d7d8b0202 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java @@ -11,14 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; +import java.util.Hashtable; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; -import java.util.Hashtable; - public class WSDLImportWSDLToWorkbenchAction extends ImportToWorkbenchAction { public WSDLImportWSDLToWorkbenchAction(Controller controller) { super(controller); diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java index 681b90aef..b4ade72a8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java @@ -12,7 +12,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java index cf6685d53..f2c3cf4a0 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java @@ -10,8 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java index babdcb68e..e10fe7e6f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java @@ -10,17 +10,24 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; - +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; +import javax.wsdl.Binding; +import javax.wsdl.Input; +import javax.wsdl.Operation; +import javax.wsdl.Output; +import javax.wsdl.PortType; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.http.HTTPBinding; +import javax.wsdl.extensions.soap.SOAPBinding; import javax.xml.namespace.QName; -import javax.wsdl.extensions.soap.*; -import javax.wsdl.extensions.http.*; -import javax.wsdl.extensions.*; -import javax.wsdl.*; - -import java.util.*; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; public class WSDLBindingElement extends WSDLCommonElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java index 5016477fa..ef90e3b09 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java @@ -10,15 +10,16 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; - -import org.w3c.dom.*; - -import javax.xml.parsers.*; +import javax.xml.parsers.ParserConfigurationException; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentFragment; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; public class WSDLCommonElement extends TreeElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java index 777ddb419..d24b594de 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java @@ -10,24 +10,37 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.parser.discovery.*; +import java.io.InputStream; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Vector; +import javax.wsdl.Definition; +import javax.wsdl.Import; +import javax.wsdl.Service; +import javax.wsdl.Types; +import javax.wsdl.WSDLException; +import javax.wsdl.extensions.UnknownExtensibilityElement; +import javax.xml.namespace.QName; +import org.eclipse.emf.common.util.EList; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; +import org.eclipse.wst.ws.internal.parser.discovery.NetUtils; +import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl; - -import org.eclipse.xsd.util.*; -import org.eclipse.xsd.impl.*; -import org.eclipse.xsd.*; -import org.eclipse.emf.common.util.EList; - -import javax.xml.namespace.QName; -import javax.wsdl.extensions.*; -import javax.wsdl.*; -import java.util.*; -import java.io.*; +import org.eclipse.xsd.XSDDiagnostic; +import org.eclipse.xsd.XSDDiagnosticSeverity; +import org.eclipse.xsd.XSDSchema; +import org.eclipse.xsd.XSDSchemaDirective; +import org.eclipse.xsd.impl.XSDSchemaImpl; +import org.eclipse.xsd.util.XSDParser; public class WSDLElement extends WSDLCommonElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java index b6b444ea4..36c434289 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java @@ -10,16 +10,27 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*; -import org.eclipse.xsd.*; - -import javax.wsdl.extensions.soap.*; -import javax.wsdl.extensions.*; -import javax.wsdl.*; - -import java.util.*; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; +import javax.wsdl.Binding; +import javax.wsdl.BindingInput; +import javax.wsdl.BindingOperation; +import javax.wsdl.Input; +import javax.wsdl.Operation; +import javax.wsdl.Output; +import javax.wsdl.Part; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.soap.SOAPBinding; +import javax.wsdl.extensions.soap.SOAPBody; +import javax.wsdl.extensions.soap.SOAPOperation; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; +import org.eclipse.xsd.XSDNamedComponent; public class WSDLOperationElement extends WSDLCommonElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java index 7d3045679..e6d1a2fdb 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java @@ -10,17 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; - +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import javax.wsdl.Binding; +import javax.wsdl.Port; +import javax.wsdl.Service; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.http.HTTPAddress; +import javax.wsdl.extensions.soap.SOAPAddress; import javax.xml.namespace.QName; -import javax.wsdl.extensions.soap.*; -import javax.wsdl.extensions.http.*; -import javax.wsdl.extensions.*; -import javax.wsdl.*; - -import java.util.*; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; public class WSDLServiceElement extends WSDLCommonElement { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java index 114e13d29..6695a41fa 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; -import java.util.Vector; - public interface IFragment { public void setID(String id); public String getID(); diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java index e15ae7694..42926b3f1 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; +import java.util.Hashtable; import org.eclipse.xsd.XSDTypeDefinition; -import org.w3c.dom.Element; import org.w3c.dom.Document; -import java.util.Hashtable; +import org.w3c.dom.Element; public interface IXSDFragment extends IFragment { public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config); diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java index b44174a4d..ce5bac7a4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java @@ -10,11 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexRangeFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*; -import org.eclipse.xsd.XSDComplexTypeDefinition; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; import org.eclipse.xsd.XSDComplexTypeContent; +import org.eclipse.xsd.XSDComplexTypeDefinition; public class XSDComplexTypeToFragmentMapper extends XSDToFragmentMapper { public XSDComplexTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java index bee204e91..939623b6e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDElementFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; import org.eclipse.xsd.XSDComponent; import org.eclipse.xsd.XSDConcreteComponent; import org.eclipse.xsd.XSDElementDeclaration; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java index 55e440883..31aa8316e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; +import org.eclipse.xsd.XSDComplexTypeDefinition; import org.eclipse.xsd.XSDComponent; import org.eclipse.xsd.XSDElementDeclaration; -import org.eclipse.xsd.XSDSimpleTypeDefinition; -import org.eclipse.xsd.XSDComplexTypeDefinition; import org.eclipse.xsd.XSDParticle; import org.eclipse.xsd.XSDParticleContent; +import org.eclipse.xsd.XSDSimpleTypeDefinition; public class XSDLiteralXMLEncodingToFragmentMapper extends XSDToFragmentMapper { private XSDSimpleTypeToFragmentMapper xsdSimpleMapper_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java index 3e4765e57..bd4579730 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java @@ -11,15 +11,19 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupAllFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupChoiceFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupChoiceRangeFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupSeqFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupSeqRangeFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; import org.eclipse.xsd.XSDComponent; +import org.eclipse.xsd.XSDCompositor; import org.eclipse.xsd.XSDConcreteComponent; -import org.eclipse.xsd.XSDParticle; -import org.eclipse.xsd.XSDParticleContent; import org.eclipse.xsd.XSDModelGroup; import org.eclipse.xsd.XSDModelGroupDefinition; -import org.eclipse.xsd.XSDCompositor; +import org.eclipse.xsd.XSDParticle; +import org.eclipse.xsd.XSDParticleContent; import org.eclipse.xsd.XSDWildcard; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java index e43c8b802..5fafacc4c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java @@ -10,20 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; +import org.eclipse.emf.common.util.EList; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncArrayFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncArrayRangeFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncodingWrapperFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; +import org.eclipse.xsd.XSDAttributeGroupContent; +import org.eclipse.xsd.XSDComplexTypeContent; +import org.eclipse.xsd.XSDComplexTypeDefinition; import org.eclipse.xsd.XSDComponent; +import org.eclipse.xsd.XSDModelGroup; import org.eclipse.xsd.XSDParticle; import org.eclipse.xsd.XSDParticleContent; -import org.eclipse.xsd.XSDComplexTypeDefinition; -import org.eclipse.xsd.XSDComplexTypeContent; import org.eclipse.xsd.XSDTypeDefinition; -import org.eclipse.xsd.XSDAttributeGroupContent; -import org.eclipse.xsd.XSDModelGroup; -import org.eclipse.emf.common.util.EList; - import org.w3c.dom.Element; public class XSDSOAPEncodingToFragmentMapper extends XSDToFragmentMapper { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java index ba752ea83..e62489231 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java @@ -11,12 +11,24 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; import org.eclipse.emf.common.util.EList; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*; -import org.eclipse.xsd.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicDateTimeFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicDateTimeRangeFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicEnumFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicEnumRangeFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicRangeFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleListFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleListRangeFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleUnionFixFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleUnionRangeFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; +import org.eclipse.xsd.XSDSimpleTypeDefinition; +import org.eclipse.xsd.XSDVariety; public class XSDSimpleTypeToFragmentMapper extends XSDToFragmentMapper { public XSDSimpleTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java index e6f934247..ce323c1ec 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java @@ -10,10 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*; - import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; public class XSDToFragmentController { private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java index abe31ae30..1cfc58fe3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java @@ -10,7 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDefaultFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDEmptyFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper; import org.eclipse.xsd.XSDComponent; import org.eclipse.xsd.XSDNamedComponent; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java index 3217007dc..5371e2501 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java @@ -10,14 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment; -import java.util.Vector; -import java.util.Hashtable; -import java.util.Enumeration; - public abstract class Fragment implements IFragment { private String id_; private String name_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java index 911c4fc04..d085dff16 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java @@ -10,22 +10,22 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; +import org.eclipse.emf.common.util.EList; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncArrayFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; +import org.eclipse.xsd.XSDElementDeclaration; import org.eclipse.xsd.XSDModelGroup; import org.eclipse.xsd.XSDParticle; import org.eclipse.xsd.XSDParticleContent; -import org.eclipse.xsd.XSDElementDeclaration; -import org.eclipse.emf.common.util.EList; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.NodeList; import org.w3c.dom.Node; -import java.util.Vector; -import java.util.Hashtable; +import org.w3c.dom.NodeList; public abstract class SOAPEncArrayFragment extends XSDGroupSeqFragment implements ISOAPEncArrayFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java index 66d20de75..fb8abf22d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java @@ -10,13 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncodingWrapperFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.xsd.XSDTypeDefinition; - -import org.w3c.dom.*; -import java.util.Vector; -import java.util.Hashtable; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; public class SOAPEncodingWrapperFragment extends XSDDelegationFragment implements ISOAPEncodingWrapperFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java index 0d12f82ff..34cba83a5 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java @@ -10,27 +10,27 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.List; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDComplexFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil; -import org.eclipse.xsd.XSDComplexTypeDefinition; +import org.eclipse.xsd.XSDComplexFinal; import org.eclipse.xsd.XSDComplexTypeContent; -import org.eclipse.xsd.XSDNamedComponent; -import org.eclipse.xsd.XSDTypeDefinition; +import org.eclipse.xsd.XSDComplexTypeDefinition; import org.eclipse.xsd.XSDModelGroup; -import org.eclipse.xsd.XSDComplexFinal; +import org.eclipse.xsd.XSDModelGroupDefinition; +import org.eclipse.xsd.XSDNamedComponent; import org.eclipse.xsd.XSDParticle; import org.eclipse.xsd.XSDParticleContent; -import org.eclipse.xsd.XSDModelGroupDefinition; +import org.eclipse.xsd.XSDTypeDefinition; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import java.util.Vector; -import java.util.Hashtable; -import java.util.List; public abstract class XSDComplexFragment extends XSDMapFragment implements IXSDComplexFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java index 981aca99f..bdce00449 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java @@ -10,18 +10,17 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import java.util.Vector; -import java.util.Hashtable; public class XSDDefaultFragment extends XSDFragment { public XSDDefaultFragment(String id, String name, XSDToFragmentConfiguration config) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java index dc03c29e2..43b229e53 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDDelegationFragment; @@ -17,8 +19,6 @@ import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.w3c.dom.Document; import org.w3c.dom.Element; -import java.util.Vector; -import java.util.Hashtable; public class XSDDelegationFragment extends XSDFragment implements IXSDDelegationFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java index 1baaff75d..99590766b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; @@ -22,8 +24,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import java.util.Vector; -import java.util.Hashtable; public class XSDElementFragment extends XSDDelegationFragment implements IXSDElementFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java index 0f164220e..67abf8bf3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java @@ -10,15 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; - import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import java.util.Vector; public class XSDEmptyFragment extends XSDFragment { private int occurance_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java index ecdda4a49..822442ac0 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java @@ -10,22 +10,22 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.xsd.XSDComponent; +import org.eclipse.xsd.XSDForm; import org.eclipse.xsd.XSDNamedComponent; -import org.eclipse.xsd.XSDTypeDefinition; import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.XSDForm; -import java.util.Vector; -import java.util.Hashtable; +import org.eclipse.xsd.XSDTypeDefinition; +import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Attr; public abstract class XSDFragment extends Fragment implements IXSDFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java index 414e3fe97..6ed6df191 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; @@ -17,9 +18,7 @@ import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupAllF import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; import org.eclipse.xsd.XSDModelGroup; - import org.w3c.dom.Element; -import java.util.Vector; public class XSDGroupAllFragment extends XSDGroupFragment implements IXSDGroupAllFragment { private String groupID_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java index d755cf9e7..bd8edc753 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.emf.common.util.EList; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; @@ -18,13 +20,10 @@ import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupChoiceFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; -import org.eclipse.xsd.XSDParticle; import org.eclipse.xsd.XSDModelGroup; - +import org.eclipse.xsd.XSDParticle; import org.w3c.dom.Document; import org.w3c.dom.Element; -import java.util.Hashtable; -import java.util.Vector; public abstract class XSDGroupChoiceFragment extends XSDGroupFragment implements IXSDGroupChoiceFragment { private XSDParticle[] choices_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java index 485716ed5..682a2f363 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java @@ -11,6 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.emf.common.util.EList; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; @@ -19,16 +21,13 @@ import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; +import org.eclipse.xsd.XSDComponent; import org.eclipse.xsd.XSDModelGroup; import org.eclipse.xsd.XSDParticle; -import org.eclipse.xsd.XSDWildcard; -import org.eclipse.xsd.XSDComponent; import org.eclipse.xsd.XSDParticleContent; - +import org.eclipse.xsd.XSDWildcard; import org.w3c.dom.Document; import org.w3c.dom.Element; -import java.util.Hashtable; -import java.util.Vector; public abstract class XSDGroupFragment extends XSDMapFragment implements IXSDGroupFragment { private XSDModelGroup xsdModelGroup_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java index 1cd330cf1..1c5404f49 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java @@ -10,6 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; @@ -17,11 +21,6 @@ import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragme import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; -import java.util.Vector; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.Enumeration; - public abstract class XSDMapFragment extends XSDFragment implements IXSDMapFragment { private XSDToFragmentController controller_; private Vector fragmentsOrder_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java index ebf6ba524..3be533708 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; public class XSDSimpleAtomicDateTimeFixFragment extends XSDSimpleAtomicFixFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java index add26d0af..6fb2f2cc4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; public class XSDSimpleAtomicDateTimeRangeFragment extends XSDSimpleAtomicRangeFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java index 1e0155eaa..796bd862a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*; import org.eclipse.emf.common.util.EList; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector; public class XSDSimpleAtomicEnumFixFragment extends XSDSimpleAtomicEnumFragment { public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java index 919cd4af1..96387f551 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java @@ -12,8 +12,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; import org.eclipse.emf.common.util.EList; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*; -import org.eclipse.xsd.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector; +import org.eclipse.xsd.XSDEnumerationFacet; public abstract class XSDSimpleAtomicEnumFragment extends XSDSimpleAtomicFragment { private OptionVector optionVector_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java index 5a74bbd62..4ed3c814b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*; import org.eclipse.emf.common.util.EList; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector; public class XSDSimpleAtomicEnumRangeFragment extends XSDSimpleAtomicEnumFragment { public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java index d82a1d83f..132f6f6db 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java @@ -10,8 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*; -import org.eclipse.xsd.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleAtomicFragment; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; +import org.eclipse.xsd.XSDSimpleTypeDefinition; public abstract class XSDSimpleAtomicFragment extends XSDFragment implements IXSDSimpleAtomicFragment { public XSDSimpleAtomicFragment(String id, String name, XSDToFragmentConfiguration config) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java index 3246215df..764f84255 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java @@ -10,21 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.StringTokenizer; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; -import org.eclipse.xsd.XSDSimpleTypeDefinition; import org.eclipse.xsd.XSDLengthFacet; -import org.eclipse.xsd.XSDMinLengthFacet; import org.eclipse.xsd.XSDMaxLengthFacet; +import org.eclipse.xsd.XSDMinLengthFacet; +import org.eclipse.xsd.XSDSimpleTypeDefinition; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import java.util.StringTokenizer; -import java.util.Hashtable; public abstract class XSDSimpleListFragment extends XSDMapFragment implements IXSDSimpleListFragment { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java index a5a06a6c0..1a20e373e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java @@ -11,17 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl; +import java.util.Hashtable; +import java.util.Vector; import org.eclipse.emf.common.util.EList; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleUnionFragment; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController; import org.eclipse.xsd.XSDSimpleTypeDefinition; - import org.w3c.dom.Document; import org.w3c.dom.Element; -import java.util.Vector; -import java.util.Hashtable; public abstract class XSDSimpleUnionFragment extends XSDMapFragment implements IXSDSimpleUnionFragment { private XSDSimpleTypeDefinition[] memberTypes_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java index 5519e744d..1d487e333 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java @@ -11,9 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util; import java.util.Hashtable; - import javax.xml.parsers.ParserConfigurationException; - import org.apache.axis.Constants; import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils; import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java index 1d165c097..412881df3 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util; -import java.util.*; +import java.util.Vector; public class OptionVector { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java index ed9622d2d..a8e250f87 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java @@ -11,9 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; -import org.eclipse.xsd.XSDTypeDefinition; -import org.eclipse.xsd.XSDComplexTypeDefinition; import org.eclipse.xsd.XSDComplexTypeContent; +import org.eclipse.xsd.XSDComplexTypeDefinition; +import org.eclipse.xsd.XSDTypeDefinition; public class XSDTypeDefinitionUtil { private XSDTypeDefinitionUtil() { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java index 77c8ef9f4..17cc13ea4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java @@ -11,10 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement; public class InvokeWSDLOperationTool extends FormTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java index 470babde4..c854ebeb2 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java @@ -11,9 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; - -import java.util.*; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; public class SOAPMessageQueue extends MessageQueue { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java index f3315139e..93c04b961 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java @@ -11,10 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; // WSDL binding node for the WSDL Navigator Tree View public class WSDLBindingNode extends WSDLNavigatorNode diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java index 39af7e79c..5d54922fb 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java @@ -11,10 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; // Root node for the WSDL Navigator Tree View public class WSDLMainNode extends WSDLNavigatorNode diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java index 45db89bb7..45ef58b8f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java @@ -11,9 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLNavigatorNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.ToggleWSDLNavigatorNodeAction; public abstract class WSDLNavigatorNode extends Node { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java index c5ffb765f..4144a86c9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java @@ -11,10 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; // WSDL node for the WSDL Navigator Tree View public class WSDLNode extends WSDLNavigatorNode diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java index 611c96efd..c03a0263a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java @@ -11,9 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; // WSDL operation node for the WSDL Navigator Tree View public class WSDLOperationNode extends WSDLNavigatorNode diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java index 18202cf92..9f69b2f3c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java @@ -13,10 +13,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; import java.util.Hashtable; import java.util.Iterator; import java.util.Vector; - import javax.servlet.ServletContext; import javax.wsdl.Service; - import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl; import org.eclipse.wst.ws.internal.datamodel.BasicModel; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java index 5937378b8..ae9268678 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java @@ -11,10 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants; // WSDL service node for the WSDL Navigator Tree View public class WSDLServiceNode extends WSDLNavigatorNode diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java index 8b85259db..beb4bf25c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java @@ -15,7 +15,6 @@ import java.util.Iterator; import java.util.Vector; import javax.wsdl.Part; import javax.xml.parsers.ParserConfigurationException; - import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java index e35296562..81d6935d9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java @@ -10,17 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport; -import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; - -import sun.misc.BASE64Encoder; - -import org.w3c.dom.Element; - -import java.net.Socket; -import java.net.SocketTimeoutException; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.Hashtable; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,7 +17,15 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.net.Socket; +import java.net.SocketTimeoutException; +import java.net.URL; +import java.net.UnknownHostException; +import java.util.Hashtable; import javax.net.ssl.SSLSocketFactory; +import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils; +import org.w3c.dom.Element; +import sun.misc.BASE64Encoder; public class HTTPTransport { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java index 96259e20e..9fe9f2d51 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java @@ -11,12 +11,10 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.util; -import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils; - import java.util.Enumeration; import java.util.Hashtable; - import org.apache.axis.Constants; +import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java index 47b452dc1..13f3d7ec1 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java @@ -10,12 +10,17 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd; -import org.eclipse.xsd.*; - +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; +import javax.wsdl.Part; import javax.xml.namespace.QName; -import javax.wsdl.*; - -import java.util.*; +import org.eclipse.xsd.XSDComponent; +import org.eclipse.xsd.XSDElementDeclaration; +import org.eclipse.xsd.XSDModelGroupDefinition; +import org.eclipse.xsd.XSDNamedComponent; +import org.eclipse.xsd.XSDSchema; +import org.eclipse.xsd.XSDTypeDefinition; public class WSDLPartsToXSDTypeMapper { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java index 589481a5c..242458e32 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java @@ -10,17 +10,18 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Hashtable; - public class AddBusinessToFavoritesAction extends AddToFavoritesAction { public AddBusinessToFavoritesAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java index 22b34b0b9..f262b83fd 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java @@ -10,19 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction; import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Hashtable; - public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction { public AddBusinessToUDDIPerspectiveAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java index b79d4e1e0..466d94574 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java @@ -10,17 +10,18 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Hashtable; - public class AddServiceToFavoritesAction extends AddToFavoritesAction { public AddServiceToFavoritesAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java index 621f73d71..e37eab15b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java @@ -10,19 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction; import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Hashtable; - public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction { public AddServiceToUDDIPerspectiveAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java index 9808c3ff8..575882402 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java @@ -10,16 +10,19 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import java.util.Enumeration; +import java.util.Hashtable; +import javax.servlet.http.HttpServletRequest; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement; import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*; - -import java.util.Enumeration; -import java.util.Hashtable; -import javax.servlet.http.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool; public abstract class AddToFavoritesAction extends MultipleLinkAction { protected NodeManager nodeManager_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java index a3572247b..246fea5af 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java @@ -10,20 +10,23 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; +import java.util.Hashtable; +import java.util.Vector; +import javax.servlet.http.HttpServletRequest; import org.eclipse.wst.ws.internal.explorer.platform.actions.Action; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction; import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement; import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode; import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*; - -import java.util.Hashtable; -import java.util.Vector; -import javax.servlet.http.*; +import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool; public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java index 9fa0a0f4e..a39cfece8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java @@ -10,17 +10,18 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Hashtable; - public class AddWSDLServiceToFavoritesAction extends AddToFavoritesAction { public AddWSDLServiceToFavoritesAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java index bb622d690..81be94bfa 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; -import java.util.Hashtable; - public class AddWSILToFavoritesAction extends AddToFavoritesAction { public AddWSILToFavoritesAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java index 3615086cc..d789c0340 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java @@ -11,8 +11,8 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; public class ClearWSILAction extends ClearNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java index f6e63c7c7..bd0ffb4b7 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java @@ -10,16 +10,24 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*; - import java.io.OutputStream; import javax.wsdl.Definition; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; +import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.uddi4j.client.UDDIProxy; public class ImportWSDLToFileSystemAction extends ImportToFileSystemAction diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java index 14ed0c31b..3335c1050 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java @@ -11,14 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; - -import org.apache.wsil.WSILDocument; import java.io.OutputStream; +import org.apache.wsil.WSILDocument; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; public class ImportWSILToFileSystemAction extends ImportToFileSystemAction { private WSILDocument wsilDoc_; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java index b2b89c441..3ee054349 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java @@ -10,12 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; +import javax.servlet.http.HttpServletRequest; import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; - -import javax.servlet.http.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs; public abstract class MultipleLinkAction extends LinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java index ce471544b..038296a39 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java @@ -11,10 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; +import javax.servlet.http.HttpServletRequest; import org.eclipse.wst.ws.internal.explorer.platform.actions.Action; -import javax.servlet.http.*; - public class NullAction extends Action { public NullAction() diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java index e384f80b9..0ca36009d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java @@ -11,25 +11,30 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.wsil.WSILDocument; import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.apache.wsil.WSILDocument; - -import java.util.Enumeration; -import java.util.List; -import java.util.Iterator; - public class OpenWSILAction extends FormAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java index 4c9fe13a1..b2a88124a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java @@ -10,17 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import java.util.Hashtable; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsilLinkElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Hashtable; - public class OpenWSILLinkAction extends MultipleLinkAction { public OpenWSILLinkAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java index 216ee1705..9e5e18698 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java @@ -10,12 +10,16 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; +import javax.servlet.http.HttpServletRequest; import org.eclipse.wst.ws.internal.explorer.platform.actions.Action; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*; - -import javax.servlet.http.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WsilNode; public abstract class RefreshAction extends MultipleLinkAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java index 2596cc824..02193d098 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java @@ -10,19 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import java.util.Iterator; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Vector; -import java.util.Iterator; - public class RefreshUDDIBusinessAction extends RefreshAction { public RefreshUDDIBusinessAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java index 587b8e57b..e918c3ad9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java @@ -10,19 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import java.util.Iterator; +import java.util.Vector; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Vector; -import java.util.Iterator; - public class RefreshUDDIServiceAction extends RefreshAction { public RefreshUDDIServiceAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java index 1b3c6340b..7f55d9534 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java index b37555f0e..9a52a14f6 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java @@ -11,12 +11,14 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; public class ResizeWSILFramesAction extends ResizeFramesAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java index f064d57d1..201abad2a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java @@ -11,8 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; public class SelectWSILNodeAction extends SelectNodeAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java index dd54b1ee0..3e19c959d 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java @@ -11,9 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; public class SelectWSILToolAction extends SelectNodeToolAction diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java index 15cfc9e6d..0ebdb51fa 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java @@ -11,12 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.util.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException; +import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; public final class SwitchPerspectiveFromWSILAction extends ShowPerspectiveAction { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java index 537435b38..aff146f7a 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java @@ -11,14 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; +import java.util.Hashtable; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; -import java.util.Hashtable; - public class WSILImportWSILToWorkbenchAction extends ImportToWorkbenchAction { public WSILImportWSILToWorkbenchAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java index a08386e36..f534e5452 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java @@ -10,9 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; +import java.util.Hashtable; import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction; import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; @@ -20,8 +22,6 @@ import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServ import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer; -import java.util.Hashtable; - public class WsilAddToWSDLPerspectiveAction extends MultipleLinkAction { public WsilAddToWSDLPerspectiveAction(Controller controller) diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java index f5da54a97..95abee37c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java @@ -11,14 +11,16 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; +import java.util.Hashtable; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction; import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; -import java.util.Hashtable; - public class WsilImportWSDLToWorkbenchAction extends ImportToWorkbenchAction { public WsilImportWSDLToWorkbenchAction(Controller controller) { super(controller); diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java index 5bd264a13..a968afacf 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java @@ -12,10 +12,19 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective; public class WsilLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction { public WsilLaunchWebServiceWizardAction(Controller controller) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java index d9b4f0942..9ab8a22a4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java @@ -11,9 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; public class WsilToggleNodeAction extends ToggleNodeAction { public WsilToggleNodeAction(Controller controller) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java index 5655bd0e9..74828efbf 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java @@ -10,17 +10,24 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel; -import java.util.Vector; -import java.util.Iterator; +import java.net.URL; import java.util.HashMap; +import java.util.Iterator; import java.util.Properties; -import java.net.URL; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; +import java.util.Vector; +import org.apache.wsil.Abstract; +import org.apache.wsil.Description; +import org.apache.wsil.Inspection; +import org.apache.wsil.Link; +import org.apache.wsil.Service; +import org.apache.wsil.WSILDocument; +import org.eclipse.wst.ws.internal.datamodel.Model; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*; -import org.apache.wsil.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; import org.uddi4j.client.UDDIProxy; import org.uddi4j.datatype.business.BusinessEntity; import org.uddi4j.datatype.service.BusinessService; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java index a8e35bd0a..f3f72f1fd 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel; -import org.eclipse.wst.ws.internal.datamodel.Model; - import java.util.Vector; -import org.apache.wsil.*; +import org.apache.wsil.Abstract; +import org.apache.wsil.Link; +import org.eclipse.wst.ws.internal.datamodel.Model; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java index 035888c6f..a63a279e4 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java @@ -10,10 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel; -import org.eclipse.wst.ws.internal.datamodel.Model; - import java.util.Vector; -import org.apache.wsil.*; +import org.apache.wsil.Abstract; +import org.apache.wsil.Service; +import org.apache.wsil.ServiceName; +import org.eclipse.wst.ws.internal.datamodel.Model; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java index d4630dff4..182d33ab1 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java @@ -11,15 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.apache.wsil.Link; +import org.apache.wsil.extension.ExtensionElement; +import org.apache.wsil.extension.uddi.BusinessDescription; +import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; - -import org.apache.wsil.*; -import org.apache.wsil.extension.*; -import org.apache.wsil.extension.uddi.*; - -import org.uddi4j.util.DiscoveryURL; import org.uddi4j.datatype.business.BusinessEntity; +import org.uddi4j.util.DiscoveryURL; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java index 900f76b26..e7f9d643b 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java @@ -11,16 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.apache.wsil.Description; +import org.apache.wsil.Service; +import org.apache.wsil.extension.ExtensionElement; +import org.apache.wsil.extension.uddi.ServiceDescription; +import org.eclipse.wst.ws.internal.datamodel.Model; import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper; import org.eclipse.wst.ws.internal.explorer.platform.util.Validator; - -import org.apache.wsil.*; -import org.apache.wsil.extension.*; -import org.apache.wsil.extension.uddi.*; - -import org.uddi4j.util.DiscoveryURL; import org.uddi4j.datatype.service.BusinessService; +import org.uddi4j.util.DiscoveryURL; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java index 5ed15e27e..1966cd0c2 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java @@ -11,12 +11,13 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel; import java.util.Vector; - -import org.eclipse.wst.ws.internal.datamodel.*; - -import org.apache.wsil.*; -import org.apache.wsil.extension.*; -import org.apache.wsil.extension.wsdl.*; +import org.apache.wsil.Description; +import org.apache.wsil.Service; +import org.apache.wsil.extension.ExtensionElement; +import org.apache.wsil.extension.wsdl.ImplementedBinding; +import org.apache.wsil.extension.wsdl.Reference; +import org.apache.wsil.extension.wsdl.ReferencedService; +import org.eclipse.wst.ws.internal.datamodel.Model; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java index da1e92fd9..4ee2d55bc 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel; -import org.eclipse.wst.ws.internal.datamodel.*; -import org.apache.wsil.*; +import org.apache.wsil.Link; +import org.eclipse.wst.ws.internal.datamodel.Model; /** * The data model element that represents diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java index 1498669b0..1c7c092c0 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction; import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java index c65bc1680..18884f6a7 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java @@ -11,13 +11,12 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction; import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool; import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WsilSetDefaultViewTool; public class ListUDDIServicesTool extends ViewTool { public ListUDDIServicesTool(ToolManager toolManager, String alt) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java index 5e51f1900..1f7760880 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java @@ -16,7 +16,6 @@ import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool; import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WsilSetDefaultViewTool; public class ListWSDLServicesTool extends ViewTool { public ListWSDLServicesTool(ToolManager toolManager, String alt) { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java index 46f4a9ed6..3940f62ee 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java @@ -11,14 +11,15 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective; +import javax.servlet.ServletContext; import org.eclipse.wst.ws.internal.datamodel.BasicModel; -import org.eclipse.wst.ws.internal.explorer.platform.constants.*; -import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; +import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; +import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective; import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*; - -import javax.servlet.*; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SwitchPerspectiveFromWSILAction; public class WSILPerspective extends Perspective { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java index a7bcaa5ad..b8fba6bd9 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java @@ -11,8 +11,11 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective; -import org.eclipse.wst.ws.internal.explorer.platform.perspective.*; -import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node; +import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction; +import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilAddToWSDLPerspectiveAction; public class WsilAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool { diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java index 428929bde..3e55b4a5c 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java @@ -11,7 +11,9 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective; -import org.eclipse.wst.ws.internal.datamodel.*; +import org.eclipse.wst.ws.internal.datamodel.ElementAdapter; +import org.eclipse.wst.ws.internal.datamodel.RelAddEvent; +import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent; import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager; import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java index b265d2813..eb349ec89 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java @@ -11,7 +11,6 @@ package org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer; import java.util.Hashtable; - import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs; import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement; import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ViewSelectionTransformer; diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java index 393d12d45..6877bb9b1 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java @@ -11,7 +11,7 @@ package org.eclipse.wst.ws.internal.ext; -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** * All Extensions with exectutable extensions should implement this diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java index 27a1e99e6..7bd46ac1d 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java @@ -26,10 +26,10 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.StatusException; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor; import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy; import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore; diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java index e703fc1af..6eb7cb915 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java @@ -47,11 +47,11 @@ 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.command.internal.provisional.env.core.AbstractDataModelOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Environment; import org.eclipse.wst.common.environment.uri.URIException; import org.eclipse.wst.common.environment.uri.URIFactory; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.IllegalArgumentsException; import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException; import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationHandler; |