From e2f8aa16b525eeb7ccc4c9981dc26bbb9c86d1e3 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 29 Mar 2007 20:41:09 +0000 Subject: [PATCH] [178599] filter dialog refactorings --- .../eclipse/rse/internal/remotecdt/RemoteCMainTab.java | 2 +- .../ui/actions/SystemFilterAbstractFilterAction.java | 4 ++-- .../actions/SystemFilterAbstractFilterPoolAction.java | 4 ++-- .../SystemFilterAbstractFilterPoolWizardAction.java | 6 +++--- .../SystemFilterAbstractFilterWizardAction.java | 4 ++-- .../ui/actions/SystemFilterNewFilterPoolAction.java | 10 +++++----- .../actions/SystemFilterSelectFilterPoolsAction.java | 2 +- .../actions/SystemFilterWorkWithFilterPoolsAction.java | 6 +++--- .../ui/filters/SystemFilterDialogInputs.java | 2 +- .../ui/filters/SystemFilterDialogInterface.java | 2 +- .../ui/filters/SystemFilterDialogOutputs.java | 2 +- .../ui/filters/SystemFilterPoolDialogInputs.java | 2 +- .../ui/filters/SystemFilterPoolDialogInterface.java | 2 +- .../ui/filters/SystemFilterPoolDialogOutputs.java | 2 +- .../ui/filters/SystemFilterPoolManagerUIProvider.java | 2 +- .../SystemFilterWorkWithFilterPoolsTreeViewer.java | 4 ++-- .../dialogs/SystemFilterNewFilterPoolWizard.java | 4 ++-- ...SystemFilterNewFilterPoolWizardDefaultMainPage.java | 4 ++-- ...stemFilterNewFilterPoolWizardMainPageInterface.java | 4 ++-- .../filters/dialogs/SystemFilterPoolWizardDialog.java | 6 +++--- .../dialogs/SystemFilterPoolWizardInterface.java | 4 ++-- .../ui/filters/dialogs/SystemFilterWizardDialog.java | 7 ++++--- .../dialogs/SystemFilterWorkWithFilterPoolsDialog.java | 10 +++++----- .../filters/dialogs/SystemNewFilterWizardNamePage.java | 4 +++- .../ui/filters/dialogs/SystemUnNamedFilterDialog.java | 2 +- .../org/eclipse/rse/internal/ui/view/SystemView.java | 2 +- .../internal/ui/view/SystemViewConnectionAdapter.java | 2 +- .../eclipse/rse/internal/ui/view/SystemViewForm.java | 2 +- .../eclipse/rse/internal/ui/view/SystemViewPart.java | 2 +- .../ui/actions/SystemNewConnectionAction.java | 3 +-- .../rse/ui/filters/dialogs/ISystemFilterWizard.java | 2 +- .../dialogs/ISystemNewFilterWizardConfigurator.java | 1 + .../rse/ui/filters/dialogs/SystemNewFilterWizard.java | 1 + .../UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java | 2 +- .../model/SystemNewConnectionPromptObject.java | 2 +- 35 files changed, 62 insertions(+), 58 deletions(-) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/SystemFilterDialogInputs.java (96%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/SystemFilterDialogInterface.java (96%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/SystemFilterDialogOutputs.java (96%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/SystemFilterPoolDialogInputs.java (97%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/SystemFilterPoolDialogInterface.java (97%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/SystemFilterPoolDialogOutputs.java (96%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/SystemFilterPoolManagerUIProvider.java (96%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java (98%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java (98%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java (98%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java (95%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemFilterPoolWizardDialog.java (92%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemFilterPoolWizardInterface.java (89%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemFilterWizardDialog.java (90%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java (98%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemNewFilterWizardNamePage.java (98%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{ => internal}/ui/filters/dialogs/SystemUnNamedFilterDialog.java (99%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/{internal => }/ui/actions/SystemNewConnectionAction.java (98%) diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java index 8215b569c5f..4f1989b7acc 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java +++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java @@ -20,8 +20,8 @@ import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.internal.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterAction.java index 7336c4505da..30bbdaafea6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterAction.java @@ -16,9 +16,9 @@ package org.eclipse.rse.internal.ui.actions; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.rse.internal.ui.filters.SystemFilterDialogInputs; +import org.eclipse.rse.internal.ui.filters.SystemFilterDialogInterface; import org.eclipse.rse.ui.actions.SystemBaseDialogAction; -import org.eclipse.rse.ui.filters.SystemFilterDialogInputs; -import org.eclipse.rse.ui.filters.SystemFilterDialogInterface; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterPoolAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterPoolAction.java index cc18300204a..211971c2083 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterPoolAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterPoolAction.java @@ -29,10 +29,10 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.core.filters.ISystemFilterStringReference; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInputs; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; import org.eclipse.rse.ui.actions.SystemBaseDialogAction; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInputs; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterPoolWizardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterPoolWizardAction.java index 150b932a38c..1762aeea1c3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterPoolWizardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterPoolWizardAction.java @@ -19,10 +19,10 @@ package org.eclipse.rse.internal.ui.actions; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardInterface; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardDialog; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterWizardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterWizardAction.java index 3ff6cc870fc..0d3ef49466c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterWizardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterAbstractFilterWizardAction.java @@ -18,10 +18,10 @@ package org.eclipse.rse.internal.ui.actions; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.rse.internal.ui.filters.SystemFilterDialogInterface; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWizardDialog; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.filters.SystemFilterDialogInterface; import org.eclipse.rse.ui.filters.dialogs.ISystemFilterWizard; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterWizardDialog; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java index 83e8e5d00d0..b60c5e9a3d1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java @@ -21,16 +21,16 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.internal.ui.SystemResources; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterNewFilterPoolWizard; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardInterface; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.ISystemWizardAction; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterNewFilterPoolWizard; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardDialog; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java index 0ce0eb1b2ce..bf3e93c3d75 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java @@ -23,12 +23,12 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.internal.ui.SystemResources; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; import org.eclipse.rse.ui.dialogs.SystemSimpleSelectDialog; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; import org.eclipse.rse.ui.filters.SystemFilterUIHelpers; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java index d9ee88a15d9..f59f5279409 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java @@ -19,14 +19,14 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.internal.ui.SystemResources; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; -import org.eclipse.rse.ui.filters.SystemFilterPoolManagerUIProvider; import org.eclipse.rse.ui.filters.SystemFilterUIHelpers; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; import org.eclipse.rse.ui.validators.ValidatorFilterPoolName; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogInputs.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogInputs.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogInputs.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogInputs.java index 00671d49685..84c6b7eea8b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogInputs.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogInputs.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters; +package org.eclipse.rse.internal.ui.filters; /** * A class capturing the attributes commonly needed by dialogs that * work with filters. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogInterface.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogInterface.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogInterface.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogInterface.java index de2f09f9a5c..37c92002344 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogInterface.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogInterface.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters; +package org.eclipse.rse.internal.ui.filters; import org.eclipse.rse.internal.ui.actions.SystemFilterAbstractFilterAction; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogOutputs.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogOutputs.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogOutputs.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogOutputs.java index 4e92703cbf9..082d5dd1969 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterDialogOutputs.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterDialogOutputs.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters; +package org.eclipse.rse.internal.ui.filters; //import org.eclipse.rse.core.ui.actions.*; import org.eclipse.rse.core.filters.ISystemFilter; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInputs.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInputs.java index 603587dec8a..0d44a5972d0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInputs.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters; +package org.eclipse.rse.internal.ui.filters; //import org.eclipse.rse.core.*; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInterface.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInterface.java index c5a70c93cd4..c4a762cc027 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogInterface.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters; +package org.eclipse.rse.internal.ui.filters; import org.eclipse.rse.internal.ui.actions.SystemFilterAbstractFilterPoolAction; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogOutputs.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogOutputs.java index 634dffda3da..e556e79f504 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolDialogOutputs.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters; +package org.eclipse.rse.internal.ui.filters; //import org.eclipse.rse.core.*; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolManagerUIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolManagerUIProvider.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolManagerUIProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolManagerUIProvider.java index c1d7f0a4d62..77e4a64bb8e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolManagerUIProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolManagerUIProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters; +package org.eclipse.rse.internal.ui.filters; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java index 5d28199ddde..76c5d98920f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters; +package org.eclipse.rse.internal.ui.filters; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; @@ -23,11 +23,11 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.rse.internal.ui.actions.SystemSubMenuManager; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.ISystemAction; -import org.eclipse.rse.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java index cf91b8fd56a..163c2111f3a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java @@ -14,18 +14,18 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; +package org.eclipse.rse.internal.ui.filters.dialogs; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.actions.SystemFilterAbstractFilterPoolAction; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.validators.ValidatorFolderName; import org.eclipse.rse.ui.wizards.AbstractSystemWizard; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java index 3fae35b8229..53f3aaad046 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java @@ -14,14 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; +package org.eclipse.rse.internal.ui.filters.dialogs; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.actions.SystemFilterAbstractFilterPoolAction; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.SystemWidgetHelpers; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterPoolName; import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java similarity index 95% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java index bee623fce62..025d3345676 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java @@ -14,10 +14,10 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; +package org.eclipse.rse.internal.ui.filters.dialogs; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.wizards.ISystemWizardPage; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java similarity index 92% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardDialog.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java index a2da1c811df..89d1e8782c7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java @@ -14,11 +14,11 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; +package org.eclipse.rse.internal.ui.filters.dialogs; import org.eclipse.rse.internal.ui.actions.SystemFilterAbstractFilterPoolAction; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; import org.eclipse.rse.ui.dialogs.SystemWizardDialog; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardInterface.java similarity index 89% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardInterface.java index 155cd6a453b..5f2f24cd541 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardInterface.java @@ -14,8 +14,8 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; +package org.eclipse.rse.internal.ui.filters.dialogs; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; import org.eclipse.rse.ui.wizards.ISystemWizard; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWizardDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWizardDialog.java similarity index 90% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWizardDialog.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWizardDialog.java index 6b35acaa2bf..9d1dc67b548 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWizardDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWizardDialog.java @@ -14,11 +14,12 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; +package org.eclipse.rse.internal.ui.filters.dialogs; import org.eclipse.rse.internal.ui.actions.SystemFilterAbstractFilterAction; +import org.eclipse.rse.internal.ui.filters.SystemFilterDialogInterface; +import org.eclipse.rse.internal.ui.filters.SystemFilterDialogOutputs; import org.eclipse.rse.ui.dialogs.SystemWizardDialog; -import org.eclipse.rse.ui.filters.SystemFilterDialogInterface; -import org.eclipse.rse.ui.filters.SystemFilterDialogOutputs; +import org.eclipse.rse.ui.filters.dialogs.ISystemFilterWizard; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java index a79d92f851e..3e5a70e351c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; +package org.eclipse.rse.internal.ui.filters.dialogs; import java.util.Vector; import org.eclipse.core.runtime.IProgressMonitor; @@ -39,6 +39,10 @@ import org.eclipse.rse.internal.ui.actions.SystemFilterCopyFilterPoolAction; import org.eclipse.rse.internal.ui.actions.SystemFilterMoveFilterPoolAction; import org.eclipse.rse.internal.ui.actions.SystemFilterNewFilterPoolAction; import org.eclipse.rse.internal.ui.actions.SystemFilterWorkWithFilterPoolsRefreshAllAction; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs; +import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider; +import org.eclipse.rse.internal.ui.filters.SystemFilterWorkWithFilterPoolsTreeViewer; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemDeleteTarget; @@ -50,11 +54,7 @@ import org.eclipse.rse.ui.actions.ISystemAction; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; import org.eclipse.rse.ui.dialogs.SystemSimpleContentProvider; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface; -import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs; -import org.eclipse.rse.ui.filters.SystemFilterPoolManagerUIProvider; import org.eclipse.rse.ui.filters.SystemFilterUIHelpers; -import org.eclipse.rse.ui.filters.SystemFilterWorkWithFilterPoolsTreeViewer; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.validators.ValidatorFilterPoolName; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemNewFilterWizardNamePage.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemNewFilterWizardNamePage.java index 1a879d3ab85..ef1bc9cedff 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemNewFilterWizardNamePage.java @@ -14,13 +14,15 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; +package org.eclipse.rse.internal.ui.filters.dialogs; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolSelectionValidator; import org.eclipse.rse.core.filters.ISystemFilterPoolWrapper; import org.eclipse.rse.core.filters.ISystemFilterPoolWrapperInformation; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.SystemWidgetHelpers; +import org.eclipse.rse.ui.filters.dialogs.ISystemNewFilterWizardConfigurator; +import org.eclipse.rse.ui.filters.dialogs.SystemNewFilterWizard; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage; import org.eclipse.swt.events.ModifyEvent; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemUnNamedFilterDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemUnNamedFilterDialog.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemUnNamedFilterDialog.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemUnNamedFilterDialog.java index b42bb6c840b..69a8af4a29f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemUnNamedFilterDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemUnNamedFilterDialog.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.filters.dialogs; +package org.eclipse.rse.internal.ui.filters.dialogs; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.internal.ui.SystemResources; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 6a81c6b1f94..4ae49eaae10 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -91,7 +91,6 @@ import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction; import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction; import org.eclipse.rse.internal.ui.actions.SystemCommonSelectAllAction; import org.eclipse.rse.internal.ui.actions.SystemExpandAction; -import org.eclipse.rse.internal.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.internal.ui.actions.SystemOpenExplorerPerspectiveAction; import org.eclipse.rse.internal.ui.actions.SystemShowInMonitorAction; import org.eclipse.rse.internal.ui.actions.SystemShowInTableAction; @@ -116,6 +115,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.actions.ISystemAction; +import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java index c96b578cbaf..57e44e1f41d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java @@ -42,7 +42,6 @@ import org.eclipse.rse.internal.ui.actions.SystemDisconnectAllSubSystemsAction; import org.eclipse.rse.internal.ui.actions.SystemMoveConnectionAction; import org.eclipse.rse.internal.ui.actions.SystemMoveDownConnectionAction; import org.eclipse.rse.internal.ui.actions.SystemMoveUpConnectionAction; -import org.eclipse.rse.internal.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.internal.ui.actions.SystemOpenExplorerPerspectiveAction; import org.eclipse.rse.internal.ui.actions.SystemShowInMonitorAction; import org.eclipse.rse.internal.ui.actions.SystemShowInTableAction; @@ -53,6 +52,7 @@ import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSESystemTypeAdapter; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; +import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorSpecialChar; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java index d4431426374..db15a3d8b34 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java @@ -24,8 +24,8 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.actions.SystemCascadingPulldownMenuAction; -import org.eclipse.rse.internal.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.SystemWidgetHelpers; +import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.view.ISystemLongRunningRequestListener; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java index ab64b2848bb..afd5fe5a211 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java @@ -60,7 +60,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.ui.actions.SystemCascadingPreferencesAction; import org.eclipse.rse.internal.ui.actions.SystemCollapseAllAction; -import org.eclipse.rse.internal.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.internal.ui.actions.SystemPreferenceQualifyConnectionNamesAction; import org.eclipse.rse.internal.ui.actions.SystemPreferenceRestoreStateAction; import org.eclipse.rse.internal.ui.actions.SystemPreferenceShowFilterPoolsAction; @@ -77,6 +76,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; +import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.actions.SystemRefreshAllAction; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemNewConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemNewConnectionAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java index ca734a56db0..5b9bb1e704a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemNewConnectionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java @@ -14,7 +14,7 @@ * Uwe Stieber (Wind River) - Set action id for identification from plugin.xml menu extensions. ********************************************************************************/ -package org.eclipse.rse.internal.ui.actions; +package org.eclipse.rse.ui.actions; import java.util.LinkedList; import java.util.List; @@ -36,7 +36,6 @@ import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.actions.SystemBaseWizardAction; import org.eclipse.rse.ui.wizards.newconnection.RSEMainNewConnectionWizard; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemFilterWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemFilterWizard.java index 16cfab45ade..b2e508e51fc 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemFilterWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemFilterWizard.java @@ -16,7 +16,7 @@ package org.eclipse.rse.ui.filters.dialogs; -import org.eclipse.rse.ui.filters.SystemFilterDialogInterface; +import org.eclipse.rse.internal.ui.filters.SystemFilterDialogInterface; import org.eclipse.rse.ui.wizards.ISystemWizard; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemNewFilterWizardConfigurator.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemNewFilterWizardConfigurator.java index 474b895cf46..50af70ad5a2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemNewFilterWizardConfigurator.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemNewFilterWizardConfigurator.java @@ -16,6 +16,7 @@ package org.eclipse.rse.ui.filters.dialogs; + /** * Much of the new filter wizard is configurable, especially with respect to translated strings. * While there exists setters and overridable methods for most of it, sometimes that gets overwhelming. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java index 332adc6426a..ce93e0b9811 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java @@ -33,6 +33,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolWrapper; import org.eclipse.rse.core.filters.ISystemFilterPoolWrapperInformation; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.internal.ui.SystemResources; +import org.eclipse.rse.internal.ui.filters.dialogs.SystemNewFilterWizardNamePage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java index df2e612dfb0..861d4665223 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java @@ -25,12 +25,12 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.internal.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.model.ISystemResourceChangeEvent; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.SystemWidgetHelpers; +import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java index d82ca82e3f6..c5eae150460 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java @@ -30,12 +30,12 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.internal.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.model.ISystemPromptableObject; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSESystemTypeAdapter; import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.view.ISystemViewRunnableObject; import org.eclipse.swt.widgets.Shell;