diff options
Diffstat (limited to 'bundles')
154 files changed, 461 insertions, 489 deletions
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 ff2f2a9f3..dd77be000 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 @@ -20,7 +20,6 @@ import org.eclipse.wst.command.internal.provisional.env.core.common.Status; import org.eclipse.wst.server.core.IServer; 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.IWebService; 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 95fb7d73b..12b9ac1c8 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 @@ -11,16 +11,12 @@ package org.eclipse.jst.ws.internal.axis.consumption.ui.command; -import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; -import org.eclipse.wst.server.core.IServer; -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.IWebService; 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/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 d7d7ed052..7edd10a66 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 @@ -13,10 +13,7 @@ package org.eclipse.jst.ws.internal.axis.consumption.ui.task; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; -import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime; import org.eclipse.jst.ws.internal.common.EnvironmentUtils; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java index 4c41d0974..bf515af3a 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java @@ -11,9 +11,7 @@ package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets; import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand; -import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand; import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask; -import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand; import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand; import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand; import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java index 75e25a6c2..33b674c73 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java @@ -17,7 +17,6 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommand import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment.MappingFragment; import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer; import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand; import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; 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 48b556b9a..de3a51569 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 @@ -17,9 +17,6 @@ import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; public class AxisRunInputCommand extends SimpleCommand{ 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 39a66f898..64b89753f 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 @@ -16,8 +16,6 @@ import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; -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/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 db397f3ef..417e21b01 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 @@ -25,7 +25,6 @@ import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; 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/action/LaunchWSEAction.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java index 3e9277422..672f9609d 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; - import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; 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 e7da30a92..51d4f6f56 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 @@ -14,15 +14,15 @@ package org.eclipse.jst.ws.internal.consumption.ui.command; import java.util.Vector; import org.eclipse.core.resources.IProject; -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; -import org.eclipse.wst.ws.internal.ui.wsi.preferences.WSIComplianceUtils; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; +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; +import org.eclipse.wst.ws.internal.ui.wsi.preferences.WSIComplianceUtils; 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 a06d64481..2d71fde87 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 @@ -12,7 +12,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.extension; import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer; 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.SimpleCommand; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java index 629b9d343..e1f7be27e 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java @@ -24,7 +24,6 @@ import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; import org.eclipse.jst.ws.internal.consumption.ui.wsil.Arguments; import org.eclipse.jst.ws.internal.consumption.ui.wsil.TableViewerEditor; -import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand; import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser; import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter; import org.eclipse.swt.SWT; @@ -44,6 +43,7 @@ import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; +import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand; import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; import org.eclipse.wst.wsdl.util.WSDLResourceImpl; 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 4ac7c1fcd..856e0ced4 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 @@ -19,7 +19,6 @@ import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerC import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand; import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer; import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment; -import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand; @@ -58,7 +57,6 @@ import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceCon 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.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; 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 93096c0b8..d177d8d94 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,11 +10,6 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; 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 3377b5bdc..8ddff55a9 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 @@ -18,7 +18,6 @@ import org.eclipse.jst.ws.internal.common.ResourceUtils; 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.SimpleCommand; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; 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/extensions/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java index bd44a2db7..53e018631 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,21 +12,11 @@ */ package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jst.ws.internal.common.EnvironmentUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.AbstractStartServer; -import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.eclipse.wst.server.core.ServerCore; 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; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java index e3f21d34b..a86eddae2 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java @@ -23,9 +23,9 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.IWizardContainer; -import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink; import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.PortComponentImpl; import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.ServiceImplBeanImpl; +import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter; import org.eclipse.jst.ws.internal.ui.common.UIUtils; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java index 70dcf6947..87b31d70f 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.ui.widgets.object; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType; 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; 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 d68cb6dfc..5cab39f57 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 @@ -16,7 +16,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType; 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; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java index 87f6c8f58..b67224b8f 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java @@ -16,7 +16,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType; 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; 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 e6fa388c8..1d0e7fb15 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 @@ -19,7 +19,7 @@ import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.ServiceRefImpl; import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory; import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; +import org.eclipse.wst.wsdl.util.WSDLResourceImpl; public class WSDLSelectionTransformer implements Transformer { 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 0aa57350c..19be650c6 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 @@ -10,30 +10,22 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime; -import java.util.ArrayList; -import java.util.StringTokenizer; import java.util.Vector; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; 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.common.StringToIProjectTransformer; import org.eclipse.jst.ws.internal.consumption.ui.common.ClientServerSelectionUtils; import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils; -import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext; import org.eclipse.jst.ws.internal.consumption.ui.wizard.ClientProjectTypeRegistry; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.common.FileResourceUtils; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; @@ -47,7 +39,6 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; 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 708a27cb5..8bedf5849 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 @@ -19,7 +19,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Plugin; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; 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 789eba346..be7603a19 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 @@ -5,7 +5,6 @@ import java.util.Vector; import org.eclipse.core.resources.IProject; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; 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 227e11bda..4e146a7e8 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 @@ -11,12 +11,12 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsil; -import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand; import org.eclipse.ui.PlatformUI; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; +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/wsrt/Context.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java index 2955a8144..3abfb4489 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; +import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; /** * @author rsinha 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 af1cee213..2a6aa7bb4 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 @@ -18,7 +18,6 @@ import java.util.Hashtable; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; - import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceTypeImpl; import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java index f6f5d887f..c74de074f 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java @@ -15,13 +15,10 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModel; import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationOperation; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; -import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants; -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.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; 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 732cdab1e..f0459aad8 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 @@ -17,8 +17,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jst.j2ee.application.internal.operations.EARComponentCreationOperation; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.EARComponentCreationDataModel; -import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants; -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.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java index f80c8f687..2038f343f 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java @@ -20,7 +20,6 @@ import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; 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 ff5d1145d..43759bbe8 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 @@ -5,8 +5,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.application.internal.operations.EARComponentCreationOperation; import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationOperation; import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModel; import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationOperation; import org.eclipse.jst.j2ee.internal.earcreation.EARComponentCreationDataModel; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java index 3b9d3aa76..10fea454a 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java @@ -19,7 +19,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationOperation; import org.eclipse.jst.ws.internal.common.EnvironmentUtils; 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 af412948f..c2d06c15e 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 @@ -15,7 +15,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.ws.internal.common.EnvironmentUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; 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.SimpleCommand; 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 69f9def40..d9821631f 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 @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.ws.internal.common.EnvironmentUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; 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; 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 69e33f134..c1b6f711e 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 @@ -11,9 +11,8 @@ package org.eclipse.jst.ws.internal.creation.ui.extension; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; +import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java index f9123e05f..9d83f6fb4 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java @@ -23,7 +23,6 @@ import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment; import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment; import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand; import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment; import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget; import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand; @@ -35,7 +34,6 @@ import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExten import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionFragment; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.AddModuleDependenciesCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment; diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java index a10de26f2..88b528818 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java @@ -11,28 +11,19 @@ package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime; import java.util.ArrayList; -import java.util.StringTokenizer; import java.util.Vector; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; 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.common.StringToIProjectTransformer; import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext; import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceRuntime; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceType; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils; -import org.eclipse.jst.ws.internal.context.ProjectTopologyContext; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -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.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; @@ -44,7 +35,6 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java index d71fbcf21..9e6145ab2 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java @@ -47,7 +47,6 @@ import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifa import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit; -import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; import org.eclipse.wst.command.internal.env.eclipse.EclipseLog; import org.eclipse.wst.command.internal.provisional.env.core.common.Log; diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java index a8afc5af1..9dc1a6e16 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java @@ -10,9 +10,7 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.common; -import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.wst.command.internal.env.common.FileResourceUtils; import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java index e08393595..3e728c486 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java @@ -50,9 +50,7 @@ import org.eclipse.wst.wsdl.ui.internal.outline.ExtensibleOutlineProvider; import org.eclipse.wst.wsdl.ui.internal.outline.ModelAdapterContentProvider; import org.eclipse.wst.wsdl.ui.internal.outline.ModelAdapterLabelProvider; import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter; -import org.eclipse.wst.wsdl.ui.internal.typesystem.ExtensibleTypeSystemProvider; import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil; -import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil; import org.eclipse.wst.wsdl.ui.internal.util.WSDLNodeAssociationProvider; import org.eclipse.wst.wsdl.ui.internal.util.WSDLResourceUtil; import org.eclipse.wst.wsdl.ui.internal.viewers.WSDLDetailsViewer; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java index 3b51ea186..c6725d705 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java @@ -12,7 +12,9 @@ package org.eclipse.wst.wsdl.ui.internal; import java.util.Iterator; import java.util.List; + import javax.xml.namespace.QName; + import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java index 468980ce1..b3ea412b6 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java @@ -14,7 +14,6 @@ import java.util.Iterator; import java.util.List; import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingOperation; import org.eclipse.wst.wsdl.Definition; import org.eclipse.wst.wsdl.Fault; import org.eclipse.wst.wsdl.Input; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java index 76b4797fd..bca40e98d 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java @@ -11,7 +11,6 @@ package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui; import org.eclipse.swt.widgets.Composite; - import org.eclipse.wst.wsdl.internal.generator.BaseGenerator; public interface ContentGeneratorOptionsPage diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java index 4374258d4..62e4a2c6e 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java @@ -14,7 +14,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.ExtensibilityElement; import org.eclipse.wst.wsdl.WSDLElement; import org.eclipse.wst.wsdl.internal.util.WSDLSwitch; import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java index ea892bd0c..db8657d08 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java @@ -52,7 +52,6 @@ import org.eclipse.wst.wsdl.internal.impl.OperationImpl; import org.eclipse.wst.wsdl.internal.util.WSDLSwitch; import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; import org.eclipse.wst.wsdl.ui.internal.extension.ITreeChildProvider; -import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart; import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java index 4f93c9a28..e4d3fa94f 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; + import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.wsdl.Definition; import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java index 935b4a3db..d3a770b0e 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java @@ -10,31 +10,20 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.ui.internal.util; -import java.io.InputStream; import java.util.Iterator; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import org.eclipse.core.resources.IFile; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin; import org.eclipse.wst.wsdl.Definition; import org.eclipse.wst.wsdl.Import; import org.eclipse.wst.wsdl.Types; -import org.eclipse.wst.wsdl.WSDLFactory; import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement; -import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl; import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl; import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; import org.eclipse.wst.xml.uriresolver.internal.util.URIHelper; import org.eclipse.xsd.XSDSchema; import org.eclipse.xsd.XSDSchemaDirective; -import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java index b58c94ac6..382b06ee7 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java @@ -30,12 +30,11 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.part.PageBook; -import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; -import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage; - -import org.eclipse.wst.wsdl.internal.generator.extension.ContentGeneratorExtensionFactoryRegistry; import org.eclipse.wst.wsdl.internal.generator.BaseGenerator; import org.eclipse.wst.wsdl.internal.generator.ContentGenerator; +import org.eclipse.wst.wsdl.internal.generator.extension.ContentGeneratorExtensionFactoryRegistry; +import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; +import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage; public abstract class ProtocolComponentControl extends Composite implements SelectionListener, ModifyListener { diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java index 363508b2c..8aaf6248a 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java @@ -26,6 +26,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; import org.eclipse.wst.wsdl.Binding; import org.eclipse.wst.wsdl.Definition; +import org.eclipse.wst.wsdl.internal.generator.BindingGenerator; import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage; import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.HttpBindingOptionsPage; @@ -39,8 +40,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.eclipse.wst.wsdl.internal.generator.BindingGenerator; - public class BindingWizard extends Wizard { protected BindingGenerator bindingGenerator; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java index 24cd2d044..8258580a7 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java @@ -38,8 +38,11 @@ import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; import org.eclipse.wst.wsdl.Binding; import org.eclipse.wst.wsdl.Port; import org.eclipse.wst.wsdl.Service; +import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator; import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants; +import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator; import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; +import org.eclipse.wst.wsdl.internal.generator.BindingGenerator; import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl; import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl; import org.eclipse.wst.wsdl.ui.internal.WSDLEditor; @@ -62,10 +65,6 @@ import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor; import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo; import org.w3c.dom.Element; -import org.eclipse.wst.wsdl.internal.generator.BindingGenerator; -import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator; -import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator; - public class NewWSDLWizard extends Wizard implements INewWizard { private WSDLNewFilePage newFilePage; private WSDLNewFileOptionsPage optionsPage; diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java index 1c8e6d6a2..4ccf3c664 100644 --- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java +++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java @@ -19,6 +19,7 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IEditorPart; import org.eclipse.wst.wsdl.Service; +import org.eclipse.wst.wsdl.internal.generator.PortGenerator; import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage; import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapBindingOptionsPage; @@ -26,8 +27,6 @@ import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil; import org.eclipse.wst.wsdl.ui.internal.util.NameUtil; import org.eclipse.wst.wsdl.ui.internal.widgets.ProtocolComponentControl; -import org.eclipse.wst.wsdl.internal.generator.PortGenerator; - public class PortWizard extends Wizard { protected final static int STYLE_NEW_BINDING = 1; diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java index 341c30911..19d659b7b 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.http; -import org.eclipse.wst.wsdl.WSDLPackage; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.wst.wsdl.WSDLPackage; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java index 0b89fa142..05ce00521 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java @@ -11,23 +11,18 @@ package org.eclipse.wst.wsdl.binding.http.internal.impl; -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - import javax.xml.namespace.QName; import org.eclipse.emf.common.notify.Notification; - +import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - -import org.w3c.dom.Element; - -import org.eclipse.emf.ecore.EAttribute; import org.eclipse.wst.wsdl.binding.http.HTTPAddress; import org.eclipse.wst.wsdl.binding.http.HTTPPackage; import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants; +import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; +import org.w3c.dom.Element; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java index 5d866fe28..2c7f075e2 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java @@ -11,22 +11,17 @@ package org.eclipse.wst.wsdl.binding.http.internal.impl; -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - import javax.xml.namespace.QName; import org.eclipse.emf.common.notify.Notification; - +import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.EAttribute; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.wst.wsdl.binding.http.HTTPBinding; import org.eclipse.wst.wsdl.binding.http.HTTPPackage; import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants; -import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; - +import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; import org.w3c.dom.Element; /** diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java index 73ea60145..9c1e97e9d 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java @@ -13,9 +13,14 @@ package org.eclipse.wst.wsdl.binding.http.internal.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.impl.EFactoryImpl; -import org.eclipse.wst.wsdl.binding.http.*; +import org.eclipse.wst.wsdl.binding.http.HTTPAddress; +import org.eclipse.wst.wsdl.binding.http.HTTPBinding; +import org.eclipse.wst.wsdl.binding.http.HTTPFactory; +import org.eclipse.wst.wsdl.binding.http.HTTPOperation; +import org.eclipse.wst.wsdl.binding.http.HTTPPackage; +import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded; +import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java index f4ba0db26..521009f7d 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java @@ -11,21 +11,17 @@ package org.eclipse.wst.wsdl.binding.http.internal.impl; -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - import javax.xml.namespace.QName; import org.eclipse.emf.common.notify.Notification; - +import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.EAttribute; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.wst.wsdl.binding.http.HTTPOperation; import org.eclipse.wst.wsdl.binding.http.HTTPPackage; import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants; - +import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; import org.w3c.dom.Element; /** diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java index a7bba3c88..4c1adabe5 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java @@ -10,17 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.http.internal.impl; -import org.eclipse.wst.wsdl.WSDLPackage; - - -import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EPackageImpl; - +import org.eclipse.wst.wsdl.WSDLPackage; import org.eclipse.wst.wsdl.binding.http.HTTPAddress; import org.eclipse.wst.wsdl.binding.http.HTTPBinding; import org.eclipse.wst.wsdl.binding.http.HTTPFactory; @@ -28,6 +22,7 @@ import org.eclipse.wst.wsdl.binding.http.HTTPOperation; import org.eclipse.wst.wsdl.binding.http.HTTPPackage; import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded; import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement; +import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl; import org.eclipse.xsd.impl.XSDPackageImpl; /** diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java index 764f4c425..3e4a99e72 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java @@ -11,8 +11,6 @@ package org.eclipse.wst.wsdl.binding.http.internal.impl; -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - import javax.xml.namespace.QName; import org.eclipse.emf.ecore.EClass; @@ -20,7 +18,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.wst.wsdl.binding.http.HTTPPackage; import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded; import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants; - +import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; import org.w3c.dom.Element; /** diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java index dd18b1248..37731f1c3 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java @@ -11,8 +11,6 @@ package org.eclipse.wst.wsdl.binding.http.internal.impl; -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - import javax.xml.namespace.QName; import org.eclipse.emf.ecore.EClass; @@ -20,7 +18,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.wst.wsdl.binding.http.HTTPPackage; import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement; import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants; - +import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; import org.w3c.dom.Element; /** diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java index 7c86a464c..bf7481a1d 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java @@ -10,18 +10,19 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.http.internal.util; -import org.eclipse.wst.wsdl.WSDLElement; - - import javax.wsdl.extensions.ExtensibilityElement; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; -import org.eclipse.wst.wsdl.binding.http.*; +import org.eclipse.wst.wsdl.WSDLElement; +import org.eclipse.wst.wsdl.binding.http.HTTPAddress; +import org.eclipse.wst.wsdl.binding.http.HTTPBinding; +import org.eclipse.wst.wsdl.binding.http.HTTPOperation; +import org.eclipse.wst.wsdl.binding.http.HTTPPackage; +import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded; +import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java index d645a4a63..ef962d1ce 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java @@ -10,10 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.http.internal.util; -import org.eclipse.wst.wsdl.binding.http.HTTPFactory; - import org.eclipse.wst.wsdl.ExtensibilityElement; import org.eclipse.wst.wsdl.WSDLFactory; +import org.eclipse.wst.wsdl.binding.http.HTTPFactory; import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory; public class HTTPExtensibilityElementFactory implements ExtensibilityElementFactory diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java index 58284ef05..2dd03f2f9 100644 --- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java +++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java @@ -10,14 +10,17 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.http.internal.util; -import org.eclipse.wst.wsdl.WSDLElement; - - import javax.wsdl.extensions.ExtensibilityElement; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; -import org.eclipse.wst.wsdl.binding.http.*; +import org.eclipse.wst.wsdl.WSDLElement; +import org.eclipse.wst.wsdl.binding.http.HTTPAddress; +import org.eclipse.wst.wsdl.binding.http.HTTPBinding; +import org.eclipse.wst.wsdl.binding.http.HTTPOperation; +import org.eclipse.wst.wsdl.binding.http.HTTPPackage; +import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded; +import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java index 0254fd548..35a7b363f 100644 --- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java +++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java @@ -10,13 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.mime; -import org.eclipse.wst.wsdl.ExtensibilityElement; - import java.util.List; import javax.wsdl.extensions.mime.MIMEPart; import org.eclipse.emf.common.util.EList; +import org.eclipse.wst.wsdl.ExtensibilityElement; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java index ba2903deb..2f876e5e5 100644 --- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java +++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java @@ -10,13 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.mime; -import org.eclipse.wst.wsdl.WSDLPackage; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; +import org.eclipse.wst.wsdl.WSDLPackage; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java index 1aa6a3905..5d2f9268e 100644 --- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java @@ -10,27 +10,20 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.mime.internal.impl; -import org.eclipse.wst.wsdl.Part; - - -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - import javax.xml.namespace.QName; import org.eclipse.emf.common.notify.Notification; - +import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - -import org.w3c.dom.Element; - -import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.wst.wsdl.Part; import org.eclipse.wst.wsdl.binding.mime.MIMEContent; import org.eclipse.wst.wsdl.binding.mime.MIMEPackage; import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants; +import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; +import org.w3c.dom.Element; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java index 0138a5f2c..d6607aabe 100644 --- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java @@ -16,9 +16,13 @@ import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.impl.EFactoryImpl; -import org.eclipse.wst.wsdl.binding.mime.*; +import org.eclipse.wst.wsdl.binding.mime.MIMEContent; +import org.eclipse.wst.wsdl.binding.mime.MIMEFactory; +import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml; +import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated; +import org.eclipse.wst.wsdl.binding.mime.MIMEPackage; +import org.eclipse.wst.wsdl.binding.mime.MIMEPart; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java index 3754b41ae..645834d8e 100644 --- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java @@ -10,25 +10,19 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.mime.internal.impl; -import org.eclipse.wst.wsdl.Part; - - -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - import javax.xml.namespace.QName; import org.eclipse.emf.common.notify.Notification; - +import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.EAttribute; - import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.wst.wsdl.Part; import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml; import org.eclipse.wst.wsdl.binding.mime.MIMEPackage; import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants; - +import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; import org.w3c.dom.Element; /** diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java index 120618d0a..a40b33870 100644 --- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java @@ -11,29 +11,23 @@ package org.eclipse.wst.wsdl.binding.mime.internal.impl; -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - import java.util.Collection; - import java.util.List; import javax.xml.namespace.QName; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - +import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.EAttribute; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated; import org.eclipse.wst.wsdl.binding.mime.MIMEPackage; import org.eclipse.wst.wsdl.binding.mime.MIMEPart; - +import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; import org.w3c.dom.Element; /** diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java index 2016db18a..ea54c9186 100644 --- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java @@ -10,11 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.mime.internal.impl; -import org.eclipse.wst.wsdl.WSDLPackage; - - -import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl; - import java.util.List; import org.eclipse.emf.ecore.EAttribute; @@ -23,15 +18,15 @@ import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; - import org.eclipse.emf.ecore.impl.EPackageImpl; - +import org.eclipse.wst.wsdl.WSDLPackage; import org.eclipse.wst.wsdl.binding.mime.MIMEContent; import org.eclipse.wst.wsdl.binding.mime.MIMEFactory; import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml; import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated; import org.eclipse.wst.wsdl.binding.mime.MIMEPackage; import org.eclipse.wst.wsdl.binding.mime.MIMEPart; +import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl; import org.eclipse.xsd.impl.XSDPackageImpl; /** diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java index 4f8a0fe6c..8a5d7bb65 100644 --- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java +++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java @@ -10,10 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.mime.internal.util; -import org.eclipse.wst.wsdl.binding.mime.MIMEFactory; - import org.eclipse.wst.wsdl.ExtensibilityElement; import org.eclipse.wst.wsdl.WSDLFactory; +import org.eclipse.wst.wsdl.binding.mime.MIMEFactory; import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory; public class MIMEExtensibilityElementFactory implements ExtensibilityElementFactory diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java index 5d6e3d8be..e4e8e797a 100644 --- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java +++ b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java @@ -24,10 +24,8 @@ import org.eclipse.wst.wsdl.binding.soap.SOAPBody; import org.eclipse.wst.wsdl.binding.soap.SOAPFactory; import org.eclipse.wst.wsdl.binding.soap.SOAPFault; import org.eclipse.wst.wsdl.binding.soap.SOAPOperation; -import org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFactoryImpl; -import org.w3c.dom.Element; - import org.eclipse.wst.wsdl.internal.generator.ContentGenerator; +import org.w3c.dom.Element; public class SOAPContentGenerator implements ContentGenerator { diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java index 1a8b71bfc..0e25c5a77 100644 --- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java @@ -11,8 +11,12 @@ package org.eclipse.wst.wsdl.binding.soap.internal.impl; import java.util.Collection; +import java.util.Iterator; import java.util.List; +import java.util.StringTokenizer; + import javax.xml.namespace.QName; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EAttribute; @@ -21,19 +25,16 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; -import org.eclipse.wst.wsdl.binding.soap.SOAPBody; -import org.eclipse.wst.wsdl.binding.soap.SOAPPackage; -import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; -import org.w3c.dom.Element; import org.eclipse.wst.wsdl.BindingFault; import org.eclipse.wst.wsdl.BindingInput; import org.eclipse.wst.wsdl.BindingOutput; import org.eclipse.wst.wsdl.Message; import org.eclipse.wst.wsdl.Part; +import org.eclipse.wst.wsdl.binding.soap.SOAPBody; +import org.eclipse.wst.wsdl.binding.soap.SOAPPackage; +import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; - -import java.util.StringTokenizer; -import java.util.Iterator; +import org.w3c.dom.Element; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java index f81d2ef94..b4be22715 100644 --- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java +++ b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java @@ -10,18 +10,22 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.soap.internal.util; -import org.eclipse.wst.wsdl.WSDLElement; - -import org.eclipse.wst.wsdl.binding.soap.*; - import javax.wsdl.extensions.ExtensibilityElement; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; +import org.eclipse.wst.wsdl.WSDLElement; +import org.eclipse.wst.wsdl.binding.soap.SOAPAddress; +import org.eclipse.wst.wsdl.binding.soap.SOAPBinding; +import org.eclipse.wst.wsdl.binding.soap.SOAPBody; +import org.eclipse.wst.wsdl.binding.soap.SOAPFault; +import org.eclipse.wst.wsdl.binding.soap.SOAPHeader; +import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase; +import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault; +import org.eclipse.wst.wsdl.binding.soap.SOAPOperation; +import org.eclipse.wst.wsdl.binding.soap.SOAPPackage; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java index eef34013d..97149814c 100644 --- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java +++ b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java @@ -10,14 +10,20 @@ *******************************************************************************/ package org.eclipse.wst.wsdl.binding.soap.internal.util; -import org.eclipse.wst.wsdl.WSDLElement; - -import org.eclipse.wst.wsdl.binding.soap.*; - import javax.wsdl.extensions.ExtensibilityElement; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.wst.wsdl.WSDLElement; +import org.eclipse.wst.wsdl.binding.soap.SOAPAddress; +import org.eclipse.wst.wsdl.binding.soap.SOAPBinding; +import org.eclipse.wst.wsdl.binding.soap.SOAPBody; +import org.eclipse.wst.wsdl.binding.soap.SOAPFault; +import org.eclipse.wst.wsdl.binding.soap.SOAPHeader; +import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase; +import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault; +import org.eclipse.wst.wsdl.binding.soap.SOAPOperation; +import org.eclipse.wst.wsdl.binding.soap.SOAPPackage; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java index a4fd79513..924142c5b 100644 --- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java +++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java @@ -23,8 +23,6 @@ import org.eclipse.wst.wsdl.Port; import org.eclipse.wst.wsdl.PortType; import org.eclipse.wst.wsdl.Service; import org.eclipse.wst.wsdl.WSDLFactory; -import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl; - import org.eclipse.wst.wsdl.internal.generator.extension.ContentGeneratorExtensionFactoryRegistry; /* diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java index 4cec4c49e..2b3111bf9 100644 --- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java @@ -27,11 +27,6 @@ import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.impl.XSDPackageImpl; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - import org.eclipse.wst.wsdl.Binding; import org.eclipse.wst.wsdl.BindingFault; import org.eclipse.wst.wsdl.BindingInput; @@ -58,6 +53,10 @@ import org.eclipse.wst.wsdl.WSDLElement; import org.eclipse.wst.wsdl.WSDLFactory; import org.eclipse.wst.wsdl.WSDLPackage; import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement; +import org.eclipse.xsd.XSDPackage; +import org.eclipse.xsd.impl.XSDPackageImpl; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java index 18daec204..bef721527 100644 --- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java +++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java @@ -11,6 +11,7 @@ package org.eclipse.wst.wsdl.internal.impl; import javax.xml.namespace.QName; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EAttribute; diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java index c4638a182..1fb343339 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core; -import org.eclipse.wst.wsi.internal.core.xml.XMLTags; - import javax.xml.namespace.QName; +import org.eclipse.wst.wsi.internal.core.xml.XMLTags; + /** * WS-I constants. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java index 4d5e46cc8..80e3c1ce1 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java @@ -14,6 +14,11 @@ */ package org.eclipse.wst.wsi.internal.core.analyzer; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.List; +import java.util.Vector; + import org.eclipse.wst.wsi.internal.core.ToolInfo; import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.WSIException; @@ -26,11 +31,6 @@ import org.eclipse.wst.wsi.internal.core.report.Reporter; import org.eclipse.wst.wsi.internal.core.util.MessageList; import org.eclipse.wst.wsi.internal.core.util.TestUtils; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.List; -import java.util.Vector; - /** * The Analyzer will process all Profile conformance functions. * This class should be sub-classed for each profile. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java index 8f35c3447..3f3eb4d1c 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java @@ -10,11 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.util.XMLInfo; -import java.io.*; - /** * This class maintains the Environment information. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java index d92011560..7c364fb4e 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer.config; +import java.io.Reader; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.document.DocumentReader; import org.eclipse.wst.wsi.internal.core.util.MessageList; -import java.io.Reader; - /** * Defines the interface used to read the analyzer config documents. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java index f549cb264..2a3bcd215 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer.config; +import javax.xml.namespace.QName; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.document.DocumentElement; -import javax.xml.namespace.QName; - /** * The interface for a reference to a discovery artifact. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java index ad0870f89..2be33e22c 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer.config; +import javax.xml.namespace.QName; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.document.DocumentElement; -import javax.xml.namespace.QName; - /** * The base interface for WSDL definitions. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java index 2bf3dcc66..ec550c249 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer.config; +import javax.xml.namespace.QName; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.document.DocumentElement; -import javax.xml.namespace.QName; - /** * The interface for a reference to a description artifact. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java index 531cead21..95ee74a0d 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java @@ -10,6 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer.config.impl; +import java.io.File; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.analyzer.Analyzer; @@ -25,10 +29,6 @@ import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl; import org.eclipse.wst.wsi.internal.core.util.MessageList; import org.eclipse.wst.wsi.internal.core.util.Utils; -import java.io.File; -import java.io.PrintWriter; -import java.io.StringWriter; - /** * This class is an implementation of the analyzer configuration file interface. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java index 86129fa7d..fbe3d0f74 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java @@ -11,12 +11,13 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer.config.impl; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType; import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption; -import java.io.*; - /** * This class contains the assertion results option definition. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java index b983011ad..ff14b85d9 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java @@ -10,13 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer.config.impl; -import org.eclipse.wst.wsi.internal.core.WSIConstants; -import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement; -import org.eclipse.wst.wsi.internal.core.util.EntryType; +import java.io.PrintWriter; +import java.io.StringWriter; import javax.xml.namespace.QName; -import java.io.*; +import org.eclipse.wst.wsi.internal.core.WSIConstants; +import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement; +import org.eclipse.wst.wsi.internal.core.util.EntryType; /** * The implementation for WSDL definitions. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java index 63ac41f48..64bff4363 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java @@ -10,13 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.analyzer.config.impl; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement; import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; -import java.io.*; - /** * The implementation for a reference to a description artifact. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java index 5479fda1f..9965d1696 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java @@ -10,12 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.common.impl; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.TreeMap; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet; -import java.io.*; -import java.util.TreeMap; - /** * The implementation for AddStyleSheet element. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java index 19c3908c7..9c8892654 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.document; -import org.eclipse.wst.wsi.internal.core.WSIException; -import org.w3c.dom.Document; - import java.io.IOException; import java.io.Reader; import java.io.Writer; +import org.eclipse.wst.wsi.internal.core.WSIException; +import org.w3c.dom.Document; + /** * Defines the interface used to write the Conformance XML documents. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java index 9559e2120..a61e6d1f0 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java @@ -11,12 +11,20 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.document.impl; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.io.Writer; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.document.DocumentWriter; import org.w3c.dom.Document; -import java.io.*; - /** * Defines the implementation used to write the Conformance XML * documents. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java index 64eb9dc20..4c586b7e9 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.log; -import org.eclipse.wst.wsi.internal.core.WSIConstants; -import org.eclipse.wst.wsi.internal.core.WSIException; -import org.eclipse.wst.wsi.internal.core.document.WSIDocument; +import java.util.Vector; import javax.xml.namespace.QName; -import java.util.*; +import org.eclipse.wst.wsi.internal.core.WSIConstants; +import org.eclipse.wst.wsi.internal.core.WSIException; +import org.eclipse.wst.wsi.internal.core.document.WSIDocument; /** * The interface for the message log file. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java index f1b71ff89..cd6012844 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.log; +import java.io.Reader; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.document.DocumentReader; -import java.io.*; - /** * Defines the interface used to read the Log file. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java index 36ee6f36f..e8e33e896 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.log; +import java.io.Writer; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.document.DocumentWriter; -import org.eclipse.wst.wsi.internal.core.log.Log; - -import java.io.Writer; /** * Defines the interface used to write the Log file. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java index d67687a49..02d78ad98 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.log.impl; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.Vector; import org.eclipse.wst.wsi.internal.core.WSIConstants; @@ -19,8 +21,6 @@ import org.eclipse.wst.wsi.internal.core.log.MessageEntry; import org.eclipse.wst.wsi.internal.core.util.TestUtils; import org.eclipse.wst.wsi.internal.core.util.Utils; -import java.io.*; - /** * This class represents the message log file. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java index 8fb7efedc..f92971deb 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java @@ -10,6 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.log.impl; +import java.io.Reader; +import java.util.ArrayList; +import java.util.List; +import java.util.Vector; + import org.eclipse.wst.wsi.internal.core.ToolEnvironment; import org.eclipse.wst.wsi.internal.core.ToolInfo; import org.eclipse.wst.wsi.internal.core.WSIConstants; @@ -19,8 +24,6 @@ import org.eclipse.wst.wsi.internal.core.log.MessageEntry; import org.eclipse.wst.wsi.internal.core.log.MessageEntryHandler; import org.eclipse.wst.wsi.internal.core.log.MimePart; import org.eclipse.wst.wsi.internal.core.log.MimeParts; -import org.eclipse.wst.wsi.internal.core.log.impl.MimePartImpl; -import org.eclipse.wst.wsi.internal.core.log.impl.MimePartsImpl; import org.eclipse.wst.wsi.internal.core.monitor.config.Comment; import org.eclipse.wst.wsi.internal.core.monitor.config.impl.CommentImpl; import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext; @@ -32,12 +35,11 @@ import org.eclipse.wst.wsi.internal.core.util.EntryType; import org.eclipse.wst.wsi.internal.core.util.Utils; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; - -import org.xml.sax.*; -import org.xml.sax.helpers.*; - -import java.io.*; -import java.util.*; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.DefaultHandler; /** * Defines the implementation used to read the Log file. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java index e9ce32697..afc7a3f3e 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java @@ -10,6 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.log.impl; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Collection; +import java.util.Iterator; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.log.MessageEntry; import org.eclipse.wst.wsi.internal.core.log.MimePart; @@ -17,11 +22,6 @@ import org.eclipse.wst.wsi.internal.core.log.MimeParts; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Collection; -import java.util.Iterator; - /** * Message entry implementation. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java index 4754756b4..49cc049f6 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor; +import java.io.StringReader; +import java.util.Vector; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.log.Log; import org.eclipse.wst.wsi.internal.core.log.LogWriter; import org.eclipse.wst.wsi.internal.core.log.MessageEntry; -import java.io.*; -import java.util.*; - /** * This class is the queue that is used to write request and response messages * to the log file in the correct order. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java index f4976241c..f53a0331b 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java @@ -10,6 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor; +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Iterator; +import java.util.Vector; + import org.eclipse.wst.wsi.internal.core.ToolInfo; import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.WSIException; @@ -17,14 +26,12 @@ import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException; import org.eclipse.wst.wsi.internal.core.document.DocumentFactory; import org.eclipse.wst.wsi.internal.core.log.Log; import org.eclipse.wst.wsi.internal.core.log.LogWriter; -import org.eclipse.wst.wsi.internal.core.monitor.config.*; +import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle; +import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig; +import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect; import org.eclipse.wst.wsi.internal.core.util.MessageList; import org.eclipse.wst.wsi.internal.core.util.TestUtils; -import java.io.*; -import java.util.Iterator; -import java.util.Vector; - /** * Message Monitor. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java index 36d376064..7516c8c0b 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor; -import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect; - import java.net.ServerSocket; import java.net.Socket; import java.util.Iterator; import java.util.Vector; +import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect; + /** * A server socket listener. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java index 66b7b9d1e..fe2a0f4cf 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java @@ -10,15 +10,16 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor; +import java.net.Socket; +import java.util.Iterator; +import java.util.Vector; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.log.MessageEntry; import org.eclipse.wst.wsi.internal.core.log.MimeParts; import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect; import org.eclipse.wst.wsi.internal.core.util.Utils; -import java.net.Socket; -import java.util.*; // SS - /** * A socket connection. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java index 2a3485c12..b90045389 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java @@ -11,18 +11,17 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor; -import org.eclipse.wst.wsi.internal.core.WSIConstants; -import org.eclipse.wst.wsi.internal.core.WSIException; -import org.eclipse.wst.wsi.internal.core.log.MessageEntry; -import org.eclipse.wst.wsi.internal.core.util.Utils; - -import java.net.Socket; - +import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; -import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; +import java.net.Socket; + +import org.eclipse.wst.wsi.internal.core.WSIConstants; +import org.eclipse.wst.wsi.internal.core.WSIException; +import org.eclipse.wst.wsi.internal.core.log.MessageEntry; +import org.eclipse.wst.wsi.internal.core.util.Utils; /** * Socket Handler. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java index 11ad709c1..bde4ad6fe 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor.config; +import javax.xml.namespace.QName; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.document.DocumentElement; -import javax.xml.namespace.QName; - /** * The interface for monitor config Comment element. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java index 26f0d55d7..11df1ed52 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor.config; +import javax.xml.namespace.QName; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet; import org.eclipse.wst.wsi.internal.core.document.WSIDocument; import org.eclipse.wst.wsi.internal.core.util.MessageList; -import javax.xml.namespace.QName; - /** * This is the interface for the monitor configuration file. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java index 526f1a204..38fbd0753 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor.config; +import java.io.Reader; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.document.DocumentReader; import org.eclipse.wst.wsi.internal.core.util.MessageList; -import java.io.Reader; - /** * Defines the interface used to read the monitor config documents. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java index fbf00d03d..586966d83 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java @@ -10,16 +10,21 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor.config.impl; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet; import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl; import org.eclipse.wst.wsi.internal.core.monitor.Monitor; -import org.eclipse.wst.wsi.internal.core.monitor.config.*; +import org.eclipse.wst.wsi.internal.core.monitor.config.Comment; +import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle; +import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig; +import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader; +import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect; import org.eclipse.wst.wsi.internal.core.util.MessageList; -import java.io.*; - /** * This is the implementation for the monitor configuration file. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java index 83abcca01..004abca8e 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java @@ -10,21 +10,26 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor.config.impl; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.Reader; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException; import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet; import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl; -import org.eclipse.wst.wsi.internal.core.monitor.config.*; +import org.eclipse.wst.wsi.internal.core.monitor.config.Comment; +import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle; +import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig; +import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader; +import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect; import org.eclipse.wst.wsi.internal.core.util.MessageList; import org.eclipse.wst.wsi.internal.core.util.TestUtils; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; - import org.w3c.dom.Document; import org.w3c.dom.Element; -import java.io.*; - /** * Defines the implementation used to read the monitor config documents. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java index 8ddaa0e99..a1d169ca2 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java @@ -10,14 +10,16 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.monitor.config.impl; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.net.MalformedURLException; +import java.net.URL; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.monitor.config.Comment; import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; -import java.io.*; -import java.net.*; - /** * The implementation for monitor config Redirect element. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java index d4a0b768d..1934f2a87 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java @@ -10,13 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.profile; -import org.eclipse.wst.wsi.internal.core.WSIConstants; -import org.eclipse.wst.wsi.internal.core.document.DocumentElement; -import org.eclipse.wst.wsi.internal.core.util.ArtifactType; +import java.util.LinkedList; +import java.util.Vector; import javax.xml.namespace.QName; -import java.util.*; +import org.eclipse.wst.wsi.internal.core.WSIConstants; +import org.eclipse.wst.wsi.internal.core.document.DocumentElement; +import org.eclipse.wst.wsi.internal.core.util.ArtifactType; /** * An artifact contains a set of related test assertions. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java index 1e6231d53..3c6776166 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.profile; -import org.eclipse.wst.wsi.internal.core.WSIConstants; -import org.eclipse.wst.wsi.internal.core.document.WSIDocument; +import java.util.TreeMap; +import java.util.Vector; import javax.xml.namespace.QName; -import java.util.TreeMap; -import java.util.Vector; +import org.eclipse.wst.wsi.internal.core.WSIConstants; +import org.eclipse.wst.wsi.internal.core.document.WSIDocument; /** * This interface maintains profile assertions. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java index f0fe871d5..00b0a3de8 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.profile; +import java.io.Reader; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.document.DocumentReader; -import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions; - -import java.io.Reader; /** * Defines the interface used to read a profile assertions documents. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java index 0a1b8f638..ef5347554 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.profile; -import java.util.*; +import java.util.Vector; /** * A test assertion is one assertion in a profile definition. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java index bbc3c40e3..b4ab3be23 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.profile.impl; -import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact; -import org.eclipse.wst.wsi.internal.core.profile.TestAssertion; -import org.eclipse.wst.wsi.internal.core.util.ArtifactType; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.LinkedList; import java.util.TreeMap; import java.util.Vector; +import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact; +import org.eclipse.wst.wsi.internal.core.profile.TestAssertion; +import org.eclipse.wst.wsi.internal.core.util.ArtifactType; + /** * An artifact contains a set of related test assertions. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java index c4d8428dc..2c81419eb 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.profile.impl; +import java.util.Iterator; +import java.util.TreeMap; import java.util.Vector; import org.eclipse.wst.wsi.internal.core.profile.Profile; @@ -17,9 +19,6 @@ import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact; import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions; import org.eclipse.wst.wsi.internal.core.profile.TestAssertion; -import java.util.Iterator; -import java.util.TreeMap; - /** * This class ... * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java index c064f23ae..769757a12 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.profile.impl; +import java.util.Vector; + import org.eclipse.wst.wsi.internal.core.profile.EntryTypeList; import org.eclipse.wst.wsi.internal.core.profile.TestAssertion; -import java.util.Vector; - /** * This class ... * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java index e661c1020..7289ed0ee 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java @@ -11,7 +11,6 @@ package org.eclipse.wst.wsi.internal.core.profile.validator; import org.eclipse.wst.wsi.internal.core.WSIException; - import org.w3c.dom.Document; /** diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java index 34ce83d1d..08bb99adf 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java @@ -18,7 +18,6 @@ import org.eclipse.wst.wsi.internal.core.report.Entry; import org.eclipse.wst.wsi.internal.core.util.EntryType; import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; - import org.w3c.dom.Document; /** diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java index 11de6a798..a28800322 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java @@ -52,8 +52,7 @@ import org.eclipse.wst.wsi.internal.core.log.MessageEntry; import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact; import org.eclipse.wst.wsi.internal.core.profile.TestAssertion; import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext; -import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseValidatorImpl; -import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.*; +import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl; import org.eclipse.wst.wsi.internal.core.report.FailureDetail; import org.eclipse.wst.wsi.internal.core.report.ReportArtifact; import org.eclipse.wst.wsi.internal.core.report.Reporter; diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java index 23235e9e7..3df554d0c 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java @@ -19,7 +19,7 @@ import java.util.Iterator; import java.util.Vector; import javax.wsdl.Binding; -import javax.wsdl.*; +import javax.wsdl.WSDLException; import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext; @@ -46,6 +46,7 @@ import org.uddi4j.response.BindingDetail; import org.uddi4j.response.TModelDetail; import org.uddi4j.util.CategoryBag; import org.uddi4j.util.KeyedReference; + import com.ibm.wsdl.util.StringUtils; /** diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java index 32a01d161..dd467cd89 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java @@ -11,6 +11,7 @@ package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl; import javax.wsdl.Definition; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.WSITag; import org.eclipse.wst.wsi.internal.core.profile.TestAssertion; diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java index 28dd51bf2..89899de60 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.report; +import javax.xml.namespace.QName; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.document.DocumentElement; -import javax.xml.namespace.QName; - /** * An artifact reference. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java index 9bdcf0a0a..4c8acb3ad 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.report; +import javax.xml.namespace.QName; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.document.DocumentElement; import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; -import javax.xml.namespace.QName; - /** * Failure detail. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java index a493d51cc..81059d363 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.report; +import javax.xml.namespace.QName; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.document.DocumentElement; -import javax.xml.namespace.QName; - /** * This interface is used to maintain and access the Prerequisite Failed List. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java index 0b4fc1490..d4b46ba3a 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java @@ -10,12 +10,13 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.report.impl; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.document.DocumentElement; import org.eclipse.wst.wsi.internal.core.report.ArtifactReference; -import java.io.*; - /** * An artifact reference. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java index 15ea54567..61ffb72d9 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.report.impl; +import java.util.TreeMap; + import org.eclipse.wst.wsi.internal.core.report.AssertionResult; import org.eclipse.wst.wsi.internal.core.report.EntryResult; -import java.util.TreeMap; - /** * Result for a specific test assertion. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java index 71d070bc0..dc7dc5143 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java @@ -10,14 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.report.impl; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.report.FailureDetail; import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; import com.ibm.wsdl.util.xml.DOMUtils; -import java.io.*; - /** * This class will ... * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java index 5d3e19a50..eb1de2051 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java @@ -10,12 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.report.impl; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Iterator; +import java.util.Vector; + import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.report.PrereqFailedList; -import java.io.*; -import java.util.*; - /** * This interface is used to maintain and access the Prerequisite Failed List. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java index 1c40e2cb1..639a3f209 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java @@ -15,12 +15,28 @@ import java.util.LinkedList; import java.util.List; import javax.wsdl.Binding; +import javax.wsdl.BindingFault; +import javax.wsdl.BindingInput; import javax.wsdl.BindingOperation; +import javax.wsdl.BindingOutput; +import javax.wsdl.Definition; +import javax.wsdl.Fault; +import javax.wsdl.Import; +import javax.wsdl.Input; import javax.wsdl.Message; -import javax.wsdl.*; +import javax.wsdl.Operation; +import javax.wsdl.Output; +import javax.wsdl.Part; +import javax.wsdl.Port; +import javax.wsdl.PortType; +import javax.wsdl.Service; +import javax.wsdl.Types; import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.soap.*; +import javax.wsdl.extensions.soap.SOAPBinding; import javax.wsdl.extensions.soap.SOAPBody; +import javax.wsdl.extensions.soap.SOAPFault; +import javax.wsdl.extensions.soap.SOAPHeader; +import javax.wsdl.extensions.soap.SOAPHeaderFault; import javax.wsdl.extensions.soap.SOAPOperation; import javax.xml.namespace.QName; diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java index 46584360d..c0ae9459e 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.util; +import java.io.BufferedReader; +import java.io.InputStreamReader; + import org.eclipse.wst.wsi.internal.core.ToolInfo; import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; - import org.w3c.dom.Element; -import java.io.*; - /** * Test Utility class. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java index 01a389e15..c73d05ee5 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java @@ -18,12 +18,31 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.wsdl.*; +import javax.wsdl.Binding; +import javax.wsdl.BindingFault; +import javax.wsdl.BindingInput; +import javax.wsdl.BindingOperation; +import javax.wsdl.BindingOutput; +import javax.wsdl.Definition; +import javax.wsdl.Fault; import javax.wsdl.Import; +import javax.wsdl.Input; +import javax.wsdl.Message; +import javax.wsdl.Operation; +import javax.wsdl.Output; +import javax.wsdl.Part; +import javax.wsdl.Port; +import javax.wsdl.PortType; +import javax.wsdl.Service; import javax.wsdl.Types; import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.UnknownExtensibilityElement; -import javax.wsdl.extensions.soap.*; +import javax.wsdl.extensions.soap.SOAPBinding; +import javax.wsdl.extensions.soap.SOAPBody; +import javax.wsdl.extensions.soap.SOAPFault; +import javax.wsdl.extensions.soap.SOAPHeader; +import javax.wsdl.extensions.soap.SOAPHeaderFault; +import javax.wsdl.extensions.soap.SOAPOperation; import javax.xml.namespace.QName; import org.eclipse.wst.wsi.internal.core.WSITag; diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java index b02255801..ce366267e 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java @@ -31,9 +31,9 @@ import java.util.Collection; import java.util.Date; import java.util.Iterator; import java.util.ResourceBundle; +import java.util.StringTokenizer; import java.util.TimeZone; import java.util.Vector; -import java.util.StringTokenizer; import org.eclipse.wst.wsi.internal.core.WSIConstants; import org.eclipse.wst.wsi.internal.core.WSIException; diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java index ebfb29c23..ba1403362 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java @@ -10,9 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.util; -import org.uddi4j.transport.TransportFactory; +import java.util.Enumeration; +import java.util.MissingResourceException; +import java.util.Properties; +import java.util.ResourceBundle; -import java.util.*; +import org.uddi4j.transport.TransportFactory; /** * The WSI properties can be defined in one of three locations. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java index 9abed4946..75a77d895 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java @@ -10,9 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.wsdl; -import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; +import java.util.HashMap; +import java.util.Iterator; -import java.util.*; +import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; /** * This class maintains a WSDL element list. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java index 45b590a74..8325dca44 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java @@ -10,28 +10,47 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.wsdl; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Iterator; +import java.util.Map; + +import javax.wsdl.Binding; +import javax.wsdl.BindingFault; +import javax.wsdl.BindingInput; +import javax.wsdl.BindingOperation; +import javax.wsdl.BindingOutput; +import javax.wsdl.Definition; +import javax.wsdl.Fault; +import javax.wsdl.Import; +import javax.wsdl.Input; +import javax.wsdl.Message; +import javax.wsdl.Operation; +import javax.wsdl.Output; +import javax.wsdl.Part; +import javax.wsdl.Port; +import javax.wsdl.PortType; +import javax.wsdl.Service; +import javax.wsdl.Types; +import javax.wsdl.WSDLException; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.factory.WSDLFactory; +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + import org.apache.xerces.dom.ElementImpl; -import org.eclipse.wst.wsi.internal.core.WSIException; -import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.xml.sax.InputSource; -import com.ibm.wsdl.*; +import com.ibm.wsdl.Constants; import com.ibm.wsdl.util.StringUtils; -import com.ibm.wsdl.util.xml.*; - -import org.w3c.dom.*; -import org.xml.sax.*; - -import javax.wsdl.*; -import javax.wsdl.extensions.*; -import javax.wsdl.factory.*; -import javax.xml.namespace.*; -import javax.xml.parsers.*; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.*; +import com.ibm.wsdl.util.xml.DOMUtils; +import com.ibm.wsdl.util.xml.QNameUtils; +import com.ibm.wsdl.util.xml.XPathUtils; /** * This class is a specialization of com.ibm.wsdl.xml.WSDLReaderImpl in WSDL4J. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java index 2699390cd..9b408ff61 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.wsdl; -import org.eclipse.wst.wsi.internal.core.WSIConstants; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; import javax.wsdl.Binding; import javax.wsdl.BindingOperation; @@ -27,7 +29,7 @@ import javax.wsdl.extensions.soap.SOAPHeaderFault; import javax.wsdl.extensions.soap.SOAPOperation; import javax.xml.namespace.QName; -import java.util.*; +import org.eclipse.wst.wsi.internal.core.WSIConstants; /** * Set of XML related utilities. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java index b0a379797..4a3569a77 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java @@ -9,24 +9,27 @@ * IBM - Initial API and implementation *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.wsdl.traversal; -import javax.wsdl.Part; -import javax.wsdl.Service; -import javax.wsdl.Types; -import javax.wsdl.Operation; -import javax.wsdl.Input; -import javax.wsdl.Output; -import javax.wsdl.Fault; +import java.util.Iterator; +import java.util.Map; +import java.util.Vector; + import javax.wsdl.Binding; -import javax.wsdl.BindingOperation; +import javax.wsdl.BindingFault; import javax.wsdl.BindingInput; +import javax.wsdl.BindingOperation; import javax.wsdl.BindingOutput; -import javax.wsdl.BindingFault; +import javax.wsdl.Definition; +import javax.wsdl.Fault; import javax.wsdl.Import; -import org.w3c.dom.Element; +import javax.wsdl.Input; import javax.wsdl.Message; +import javax.wsdl.Operation; +import javax.wsdl.Output; +import javax.wsdl.Part; import javax.wsdl.Port; import javax.wsdl.PortType; -import javax.wsdl.Definition; +import javax.wsdl.Service; +import javax.wsdl.Types; import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.soap.SOAPBinding; import javax.wsdl.extensions.soap.SOAPBody; @@ -35,9 +38,7 @@ import javax.wsdl.extensions.soap.SOAPHeader; import javax.wsdl.extensions.soap.SOAPHeaderFault; import javax.wsdl.extensions.soap.SOAPOperation; -import java.util.Iterator; -import java.util.Map; -import java.util.Vector; +import org.w3c.dom.Element; /** * The class implements plain traverse over WSDL artifacts. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java index aed01c0e4..cd4dbe78f 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java @@ -13,32 +13,33 @@ package org.eclipse.wst.wsi.internal.core.wsdl.traversal; import java.util.Map; import java.util.TreeMap; -import javax.wsdl.Part; -import javax.wsdl.Service; -import javax.wsdl.Types; -import javax.wsdl.Operation; -import javax.wsdl.Input; -import javax.wsdl.Output; -import javax.wsdl.Fault; import javax.wsdl.Binding; -import javax.wsdl.BindingOperation; +import javax.wsdl.BindingFault; import javax.wsdl.BindingInput; +import javax.wsdl.BindingOperation; import javax.wsdl.BindingOutput; -import javax.wsdl.BindingFault; +import javax.wsdl.Definition; +import javax.wsdl.Fault; import javax.wsdl.Import; -import org.w3c.dom.Element; +import javax.wsdl.Input; import javax.wsdl.Message; +import javax.wsdl.Operation; +import javax.wsdl.Output; +import javax.wsdl.Part; import javax.wsdl.Port; import javax.wsdl.PortType; -import javax.wsdl.Definition; +import javax.wsdl.Service; +import javax.wsdl.Types; import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.soap.SOAPBinding; import javax.wsdl.extensions.soap.SOAPBody; +import javax.wsdl.extensions.soap.SOAPFault; import javax.wsdl.extensions.soap.SOAPHeader; import javax.wsdl.extensions.soap.SOAPHeaderFault; -import javax.wsdl.extensions.soap.SOAPFault; import javax.wsdl.extensions.soap.SOAPOperation; +import org.w3c.dom.Element; + /** * The class represents runtime context for the traversal process. * Context stores artifacts being processed. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java index 0e8161cd2..ab95d7ad7 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java @@ -10,24 +10,23 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.wsdl.traversal; -import javax.wsdl.Part; -import javax.wsdl.Service; -import javax.wsdl.Types; -import javax.wsdl.Operation; -import javax.wsdl.Input; -import javax.wsdl.Output; -import javax.wsdl.Fault; import javax.wsdl.Binding; -import javax.wsdl.BindingOperation; +import javax.wsdl.BindingFault; import javax.wsdl.BindingInput; +import javax.wsdl.BindingOperation; import javax.wsdl.BindingOutput; -import javax.wsdl.BindingFault; +import javax.wsdl.Definition; +import javax.wsdl.Fault; import javax.wsdl.Import; -import org.w3c.dom.Element; +import javax.wsdl.Input; import javax.wsdl.Message; +import javax.wsdl.Operation; +import javax.wsdl.Output; +import javax.wsdl.Part; import javax.wsdl.Port; import javax.wsdl.PortType; -import javax.wsdl.Definition; +import javax.wsdl.Service; +import javax.wsdl.Types; import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.soap.SOAPBinding; import javax.wsdl.extensions.soap.SOAPBody; @@ -36,6 +35,8 @@ import javax.wsdl.extensions.soap.SOAPHeader; import javax.wsdl.extensions.soap.SOAPHeaderFault; import javax.wsdl.extensions.soap.SOAPOperation; +import org.w3c.dom.Element; + /** * The interface defines callback methods during traverse WSDL. * WSDLVisitor could cancel artifact processing by using traversal context diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java index 5a00135c4..7b1df4807 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.xml; +import java.net.URL; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.w3c.dom.Document; -import java.net.URL; - /** * This is an abstract class that takes advantage of cached XML documents. * @author Peter Brittenham (peterbr@us.ibm.com) diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java index 2b2fe1eaa..2815a8890 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java @@ -28,6 +28,7 @@ import java.util.Vector; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; + import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; import org.eclipse.wst.wsi.internal.core.WSIException; diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java index cb5f90e9f..fc9ea3653 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java @@ -10,7 +10,18 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.xml; -import org.w3c.dom.*; +import org.w3c.dom.Attr; +import org.w3c.dom.CDATASection; +import org.w3c.dom.Comment; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentType; +import org.w3c.dom.Element; +import org.w3c.dom.Entity; +import org.w3c.dom.EntityReference; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Notation; +import org.w3c.dom.ProcessingInstruction; +import org.w3c.dom.Text; /** * We don't have access to the node source code, so this does diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java index e62a06ce0..420b65d4a 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java @@ -10,18 +10,16 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.xml.dom; -import org.w3c.dom.Element; - -import org.xml.sax.SAXNotSupportedException; -import org.xml.sax.SAXNotRecognizedException; - import org.apache.xerces.dom.ElementImpl; import org.apache.xerces.xni.Augmentations; import org.apache.xerces.xni.NamespaceContext; import org.apache.xerces.xni.QName; -import org.apache.xerces.xni.XMLLocator; import org.apache.xerces.xni.XMLAttributes; +import org.apache.xerces.xni.XMLLocator; import org.apache.xerces.xni.XNIException; +import org.w3c.dom.Element; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; /** * This class specializes org.apache.xerces.parsers.DOMParser. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java index 00cc74570..fa9053363 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java @@ -11,7 +11,6 @@ package org.eclipse.wst.wsi.internal.core.xml.dom; import org.eclipse.wst.wsi.internal.core.WSIConstants; - import org.xml.sax.Locator; /** diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java index 6806cea5a..cc519414c 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.xml.jaxp; +import java.util.Hashtable; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import java.util.Hashtable; - /** * This class defines a factory API that enables us to obtain a parser * that produces DOM object trees from XML documents. Note this class diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java index 997606f1a..2858dd7cd 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java @@ -11,12 +11,18 @@ package org.eclipse.wst.wsi.internal.core.xml.jaxp; -import org.apache.xerces.impl.Constants; -import org.apache.xerces.dom.DocumentImpl; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + import org.apache.xerces.dom.DOMImplementationImpl; +import org.apache.xerces.dom.DocumentImpl; +import org.apache.xerces.impl.Constants; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; import org.eclipse.wst.wsi.internal.core.xml.dom.DOMParser; - import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.xml.sax.EntityResolver; @@ -25,13 +31,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import java.io.IOException; -import java.util.Hashtable; -import java.util.Enumeration; - /** * Using this class, we can obtain a Document from XML. This class is a * specialization of javax.xml.parsers.DocumentBuilder. diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java index 26e2d62ee..0879aa301 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java @@ -16,7 +16,6 @@ import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.util.TestUtils; import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; - import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java index 90fb71ca6..cfa42a81c 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java @@ -10,21 +10,20 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.xml.schema; +import java.util.List; +import java.util.Vector; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.util.TestUtils; import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache; import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCacheUser; import org.eclipse.wst.wsi.internal.core.xml.XMLTags; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; - import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import java.util.List; -import java.util.Vector; - /** * This abstract class is used to process an XML Schema. * diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java index 865e51cea..d235d9680 100644 --- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java +++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java @@ -10,20 +10,20 @@ *******************************************************************************/ package org.eclipse.wst.wsi.internal.core.xml.schema; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.util.TestUtils; import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache; import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.ibm.wsdl.util.xml.DOM2Writer; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import com.ibm.wsdl.util.xml.DOM2Writer; /** * This class is used to validate an XML Schema. diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java index a389ed1e8..a18af8037 100644 --- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java +++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java @@ -11,11 +11,12 @@ package org.eclipse.wst.wsi.internal; -import java.io.ByteArrayOutputStream; import java.io.BufferedWriter; -import java.io.OutputStreamWriter; +import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.BitSet; /** diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java index a33e5de0a..9af73940e 100644 --- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java +++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java @@ -17,10 +17,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.wsi.internal.core.util.WSIProperties; - import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin; import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext; +import org.eclipse.wst.wsi.internal.core.util.WSIProperties; /** * WS-I test tools property. diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java index 653e318f2..141dd2bbb 100644 --- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java +++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java @@ -17,10 +17,9 @@ import java.util.Map; import java.util.Vector; import org.eclipse.wst.wsi.internal.URIEncoder; -import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.WSIPreferences; import org.eclipse.wst.wsi.internal.WSITestToolsProperties; -import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException; +import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig; import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType; import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption; @@ -33,12 +32,12 @@ import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet; import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl; import org.eclipse.wst.wsi.internal.core.document.DocumentFactory; import org.eclipse.wst.wsi.internal.core.profile.TestAssertion; -import org.eclipse.wst.wsi.internal.report.AssertionError; import org.eclipse.wst.wsi.internal.core.report.AssertionResult; import org.eclipse.wst.wsi.internal.core.report.Entry; import org.eclipse.wst.wsi.internal.core.report.impl.FailureDetailImpl; import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl; import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; +import org.eclipse.wst.wsi.internal.report.AssertionError; /** * MessageAnalyzer diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java index 5c6d408f9..2652f0ac1 100644 --- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java +++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java @@ -19,7 +19,6 @@ import java.util.Vector; import org.eclipse.wst.wsi.internal.URIEncoder; import org.eclipse.wst.wsi.internal.WSIPreferences; import org.eclipse.wst.wsi.internal.WSITestToolsProperties; -import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException; import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig; import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType; import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption; @@ -32,12 +31,12 @@ import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet; import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl; import org.eclipse.wst.wsi.internal.core.document.DocumentFactory; import org.eclipse.wst.wsi.internal.core.profile.TestAssertion; -import org.eclipse.wst.wsi.internal.report.AssertionError; import org.eclipse.wst.wsi.internal.core.report.AssertionResult; import org.eclipse.wst.wsi.internal.core.report.Entry; import org.eclipse.wst.wsi.internal.core.report.impl.FailureDetailImpl; import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl; import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation; +import org.eclipse.wst.wsi.internal.report.AssertionError; /** * WSDLAnalyzer diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java index 4d4074c10..fb9b92800 100644 --- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java +++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java @@ -15,10 +15,10 @@ import java.util.List; import org.eclipse.wst.wsi.internal.core.ToolInfo; import org.eclipse.wst.wsi.internal.core.WSIException; import org.eclipse.wst.wsi.internal.core.analyzer.BasicProfileAnalyzer; -import org.eclipse.wst.wsi.internal.document.DocumentFactoryImpl; import org.eclipse.wst.wsi.internal.core.profile.validator.ProfileValidatorFactory; import org.eclipse.wst.wsi.internal.core.report.Report; import org.eclipse.wst.wsi.internal.core.util.MessageList; +import org.eclipse.wst.wsi.internal.document.DocumentFactoryImpl; /** * WSIBasicProfileAnalyzer diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java index b86b422a2..d59c020d4 100644 --- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java +++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java @@ -32,7 +32,6 @@ import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidationInfoImpl; import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDLDocument; import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDLReaderImpl; import org.eclipse.wst.wsi.internal.WSIPreferences; -import org.eclipse.wst.wsi.internal.WSITestToolsPlugin; import org.eclipse.wst.wsi.internal.WSITestToolsProperties; import org.eclipse.wst.wsi.internal.analyzer.WSDLAnalyzer; import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException; |