From b6714d9ff904a7381408040727471d3c74567f70 Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Fri, 11 Aug 2006 20:50:54 +0000 Subject: [PATCH] [cleanup] Some of the classes for persistance moved from org.eclipse.rse.ui plugin to org.eclipse.rse.core plugin. This is part 1 of more changes to come. --- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF | 2 ++ .../src/org/eclipse/rse/core}/model/IProperty.java | 4 +--- .../src/org/eclipse/rse/core}/model/IPropertySet.java | 5 +---- .../org/eclipse/rse/core}/model/IPropertySetContainer.java | 2 +- .../src/org/eclipse/rse/core}/model/IPropertyType.java | 2 +- .../src/org/eclipse/rse/core}/model/IRSEModelObject.java | 4 ++-- .../rse/core/persistance}/IRSEPersistableContainer.java | 2 +- .../dstore/subsystem/DStoreFileSubSystemConfiguration.java | 1 - .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../subsystems/shells/subsystems/RemoteCmdSubSystem.java | 2 +- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../eclipse/rse/ui/widgets/services/PropertyElement.java | 4 ++-- .../rse/ui/widgets/services/PropertySetServiceElement.java | 6 +++--- .../rse/ui/widgets/services/RSEModelServiceElement.java | 4 ++-- .../eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java | 2 +- .../filters/org/eclipse/rse/filters/ISystemFilter.java | 2 +- .../org/eclipse/rse/filters/ISystemFilterContainer.java | 2 +- .../filters/org/eclipse/rse/filters/ISystemFilterPool.java | 2 +- .../org/eclipse/rse/filters/ISystemFilterPoolManager.java | 2 +- .../org/eclipse/rse/filters/ISystemFilterPoolReference.java | 2 +- .../org/eclipse/rse/filters/ISystemFilterString.java | 2 +- .../model/org/eclipse/rse/internal/model/Property.java | 3 ++- .../model/org/eclipse/rse/internal/model/PropertySet.java | 5 +++-- .../eclipse/rse/internal/model/PropertySetContainer.java | 4 ++-- .../org/eclipse/rse/internal/model/RSEModelObject.java | 2 +- .../model/org/eclipse/rse/model/DummyHost.java | 1 + .../model/org/eclipse/rse/model/IHost.java | 1 + .../model/org/eclipse/rse/model/ISystemHostPool.java | 2 +- .../model/org/eclipse/rse/model/ISystemProfile.java | 1 + .../model/org/eclipse/rse/model/PropertyType.java | 2 +- .../rse/internal/persistence/dom/RSEDOMExporter.java | 6 +++--- .../rse/internal/persistence/dom/RSEDOMImporter.java | 6 +++--- .../org/eclipse/rse/persistence/dom/IRSEDOMExporter.java | 2 +- .../org/eclipse/rse/persistence/dom/IRSEDOMImporter.java | 4 ++-- .../rse/core/internal/subsystems/ServerLauncher.java | 2 +- .../org/eclipse/rse/core/subsystems/IConnectorService.java | 2 +- .../rse/core/subsystems/IServerLauncherProperties.java | 2 +- .../org/eclipse/rse/core/subsystems/ISubSystem.java | 4 ++-- .../rse/core/subsystems/ISubSystemConfiguration.java | 2 +- .../eclipse/rse/core/subsystems/RemoteServerLauncher.java | 6 +++--- .../org/eclipse/rse/core/subsystems/SubSystem.java | 2 +- 48 files changed, 65 insertions(+), 55 deletions(-) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse => org.eclipse.rse.core/src/org/eclipse/rse/core}/model/IProperty.java (93%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse => org.eclipse.rse.core/src/org/eclipse/rse/core}/model/IPropertySet.java (94%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse => org.eclipse.rse.core/src/org/eclipse/rse/core}/model/IPropertySetContainer.java (97%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/internal => org.eclipse.rse.core/src/org/eclipse/rse/core}/model/IPropertyType.java (96%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse => org.eclipse.rse.core/src/org/eclipse/rse/core}/model/IRSEModelObject.java (90%) rename rse/plugins/{org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence => org.eclipse.rse.core/src/org/eclipse/rse/core/persistance}/IRSEPersistableContainer.java (96%) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF index 01826b072af..0fe8ef2e4bf 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.services, + org.eclipse.rse.core, org.eclipse.rse.ui Eclipse-LazyStart: true Export-Package: org.eclipse.rse.connectorservice.local diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF index 20c10ad4549..54615033cb8 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.services.ssh, org.eclipse.rse.services, + org.eclipse.rse.core, org.eclipse.rse.ui, org.eclipse.team.cvs.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.team.cvs.ssh2;bundle-version="[3.2.0,4.0.0)", diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF index c96db44cd61..4bdd77db8e4 100644 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF @@ -9,5 +9,7 @@ Require-Bundle: org.eclipse.core.runtime Eclipse-LazyStart: true Export-Package: org.eclipse.rse.core, org.eclipse.rse.core.filters, + org.eclipse.rse.core.model, + org.eclipse.rse.core.persistance, org.eclipse.rse.core.references Bundle-Vendor: Eclipse.org diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IProperty.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java similarity index 93% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IProperty.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java index 567a84d91a0..ae7fd2a723b 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IProperty.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java @@ -14,9 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.model; - -import org.eclipse.rse.internal.model.IPropertyType; +package org.eclipse.rse.core.model; public interface IProperty { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IPropertySet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java similarity index 94% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IPropertySet.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java index 35adb70f33b..5a3cbc708b0 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IPropertySet.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java @@ -14,13 +14,10 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.model; import java.util.Map; -import org.eclipse.rse.internal.model.IPropertyType; - - public interface IPropertySet { public String getName(); diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IPropertySetContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IPropertySetContainer.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java index 13c53f778b9..64d05d1b631 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IPropertySetContainer.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.model; public interface IPropertySetContainer { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/IPropertyType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/IPropertyType.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java index 1e6ce4f247e..a6abb1d1d2d 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/IPropertyType.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.core.model; public interface IPropertyType { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IRSEModelObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java similarity index 90% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IRSEModelObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java index d3ef518dee0..7602d96d451 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IRSEModelObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java @@ -14,9 +14,9 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.model; -import org.eclipse.rse.persistence.IRSEPersistableContainer; +import org.eclipse.rse.core.persistance.IRSEPersistableContainer; public interface IRSEModelObject extends IPropertySetContainer, IRSEPersistableContainer { diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/IRSEPersistableContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/persistance/IRSEPersistableContainer.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/IRSEPersistableContainer.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/persistance/IRSEPersistableContainer.java index 35d95731ac8..55115849526 100644 --- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/IRSEPersistableContainer.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/persistance/IRSEPersistableContainer.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.persistence; +package org.eclipse.rse.core.persistance; public interface IRSEPersistableContainer { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java index f1d77ca0781..3b508df3dd9 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java @@ -20,7 +20,6 @@ import org.eclipse.rse.connectorservice.dstore.DStoreConnectorService; import org.eclipse.rse.connectorservice.dstore.DStoreConnectorServiceManager; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.internal.model.Host; import org.eclipse.rse.internal.subsystems.files.core.ILanguageUtilityFactory; import org.eclipse.rse.model.IHost; import org.eclipse.rse.services.clientserver.SystemSearchString; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF index 71ffcf8e519..6cbcb32ae1a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.services.files.ftp, org.eclipse.rse.files.ui, org.eclipse.rse.subsystems.files.core, + org.eclipse.rse.core, org.eclipse.rse.ui Eclipse-LazyStart: true Export-Package: org.eclipse.rse.subsystems.files.ftp, diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF index a037e11c655..5880dcdef75 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.connectorservice.ssh, org.eclipse.rse.services.ssh, org.eclipse.rse.subsystems.files.core, + org.eclipse.rse.core, org.eclipse.rse.ui, org.eclipse.rse.files.ui Eclipse-LazyStart: true diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF index 4fc7204e1e9..792655bec6e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.connectorservice.dstore, org.eclipse.rse.subsystems.processes.core, org.eclipse.rse.processes.ui, + org.eclipse.rse.core, org.eclipse.rse.ui Eclipse-LazyStart: true Bundle-Vendor: Eclipse.org diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF index 47387d1bc6a..7872c198430 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.connectorservice.local, org.eclipse.rse.subsystems.processes.core, org.eclipse.rse.processes.ui, + org.eclipse.rse.core, org.eclipse.rse.ui Eclipse-LazyStart: true Bundle-Vendor: Eclipse.org diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java index 05573d1c843..ae3d8aeeed1 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java @@ -26,13 +26,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.subsystems.CommunicationsEvent; import org.eclipse.rse.core.subsystems.ICommunicationsListener; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IRemoteSystemEnvVar; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IPropertySet; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemResourceChangeEvent; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF index 095088c343c..a5be44bf845 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.connectorservice.dstore, org.eclipse.rse.shells.ui, org.eclipse.rse.subsystems.shells.core, + org.eclipse.rse.core, org.eclipse.rse.ui, org.eclipse.rse.subsystems.files.core Eclipse-LazyStart: true diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF index 9fdce58c80b..d1920d6b176 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.connectorservice.local, org.eclipse.rse.shells.ui, org.eclipse.rse.subsystems.shells.core, + org.eclipse.rse.core, org.eclipse.rse.ui, org.eclipse.rse.subsystems.files.core Eclipse-LazyStart: true diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF index 90ac008d6a9..52fc7bd7226 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.subsystems.shells.core, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.shells.ui, + org.eclipse.rse.core, org.eclipse.rse.ui Eclipse-LazyStart: true Export-Package: org.eclipse.rse.subsystems.shells.ssh diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java index ac5b00afc5b..84a430d8e07 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java @@ -16,9 +16,9 @@ package org.eclipse.rse.ui.widgets.services; -import org.eclipse.rse.internal.model.IPropertyType; +import org.eclipse.rse.core.model.IProperty; +import org.eclipse.rse.core.model.IPropertyType; import org.eclipse.rse.internal.model.Property; -import org.eclipse.rse.model.IProperty; import org.eclipse.rse.ui.view.SystemComboBoxPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertySetServiceElement.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertySetServiceElement.java index f3b02ac13b3..3d0bd8539f2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertySetServiceElement.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertySetServiceElement.java @@ -19,11 +19,11 @@ package org.eclipse.rse.ui.widgets.services; import java.util.ArrayList; import java.util.List; -import org.eclipse.rse.internal.model.IPropertyType; +import org.eclipse.rse.core.model.IProperty; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IPropertyType; import org.eclipse.rse.internal.model.PropertySet; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IProperty; -import org.eclipse.rse.model.IPropertySet; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.swt.graphics.Image; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/RSEModelServiceElement.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/RSEModelServiceElement.java index 84b51a96121..970982b69c3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/RSEModelServiceElement.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/RSEModelServiceElement.java @@ -19,9 +19,9 @@ package org.eclipse.rse.ui.widgets.services; import java.util.ArrayList; import java.util.List; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IPropertySet; -import org.eclipse.rse.model.IRSEModelObject; public abstract class RSEModelServiceElement extends ServiceElement diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java index 2e459acfd06..92393b837cf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java @@ -22,6 +22,7 @@ import java.util.List; import org.eclipse.jface.wizard.IWizard; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; +import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.servicesubsystem.IServiceSubSystem; import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.IConnectorService; @@ -30,7 +31,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.model.DummyHost; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IPropertySet; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.widgets.services.ConnectorServiceElement; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilter.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilter.java index df84b0f0d95..ad0345bad66 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilter.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilter.java @@ -17,8 +17,8 @@ package org.eclipse.rse.filters; import java.util.Vector; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.references.IRSEReferencedObject; -import org.eclipse.rse.model.IRSEModelObject; /** diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterContainer.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterContainer.java index 966971ef78c..8925828d67e 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterContainer.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterContainer.java @@ -19,7 +19,7 @@ package org.eclipse.rse.filters; import java.util.Vector; -import org.eclipse.rse.persistence.IRSEPersistableContainer; +import org.eclipse.rse.core.persistance.IRSEPersistableContainer; /** * Filter containers are any objects that contain filters. diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java index 10fd026af1b..497194f150b 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java @@ -16,7 +16,7 @@ package org.eclipse.rse.filters; import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy; -import org.eclipse.rse.model.IRSEModelObject; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.references.ISystemPersistableReferencedObject; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolManager.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolManager.java index 769f2036199..906f6d5fd07 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolManager.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolManager.java @@ -17,8 +17,8 @@ package org.eclipse.rse.filters; import java.util.Vector; +import org.eclipse.rse.core.persistance.IRSEPersistableContainer; import org.eclipse.rse.model.ISystemProfile; -import org.eclipse.rse.persistence.IRSEPersistableContainer; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReference.java index 9cd0fb5c8ad..a037ad33360 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReference.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReference.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.filters; -import org.eclipse.rse.model.IRSEModelObject; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.references.ISystemPersistableReferencingObject; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterString.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterString.java index bddfeef5313..03b6a9a5f0d 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterString.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterString.java @@ -17,8 +17,8 @@ package org.eclipse.rse.filters; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.references.IRSEBaseReferencedObject; -import org.eclipse.rse.model.IRSEModelObject; /** diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Property.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Property.java index 5a0e429fd2e..d44c2c05365 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Property.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Property.java @@ -16,7 +16,8 @@ package org.eclipse.rse.internal.model; -import org.eclipse.rse.model.IProperty; +import org.eclipse.rse.core.model.IProperty; +import org.eclipse.rse.core.model.IPropertyType; public class Property implements IProperty { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySet.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySet.java index f246d1f0060..8bbd42b95b3 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySet.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySet.java @@ -20,8 +20,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.eclipse.rse.model.IProperty; -import org.eclipse.rse.model.IPropertySet; +import org.eclipse.rse.core.model.IProperty; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IPropertyType; import org.eclipse.rse.model.PropertyType; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySetContainer.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySetContainer.java index 81d9cc52198..573c702d3d5 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySetContainer.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySetContainer.java @@ -22,8 +22,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.rse.model.IPropertySet; -import org.eclipse.rse.model.IPropertySetContainer; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IPropertySetContainer; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/RSEModelObject.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/RSEModelObject.java index 345d56d1a6e..ba3ce419eb3 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/RSEModelObject.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/RSEModelObject.java @@ -16,7 +16,7 @@ package org.eclipse.rse.internal.model; -import org.eclipse.rse.model.IRSEModelObject; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.ui.SystemResources; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/DummyHost.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/DummyHost.java index 289a52de373..3ad74e6125f 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/DummyHost.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/DummyHost.java @@ -15,6 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.model; +import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IHost.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IHost.java index aa07780e15d..26c87df1816 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IHost.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/IHost.java @@ -19,6 +19,7 @@ package org.eclipse.rse.model; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemHostPool.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemHostPool.java index 0a300b06ca0..606df79d431 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemHostPool.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemHostPool.java @@ -18,7 +18,7 @@ package org.eclipse.rse.model; import java.util.List; -import org.eclipse.rse.persistence.IRSEPersistableContainer; +import org.eclipse.rse.core.persistance.IRSEPersistableContainer; // diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemProfile.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemProfile.java index 46adf389cce..714ff370331 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemProfile.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemProfile.java @@ -15,6 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.model; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.filters.ISystemFilterPool; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/PropertyType.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/PropertyType.java index 6ea5a256bf2..0388d71183a 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/PropertyType.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/PropertyType.java @@ -16,7 +16,7 @@ package org.eclipse.rse.model; -import org.eclipse.rse.internal.model.IPropertyType; +import org.eclipse.rse.core.model.IPropertyType; public class PropertyType implements IPropertyType diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java index 39d015189f3..896051576b9 100644 --- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java +++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java @@ -21,6 +21,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IPropertyType; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -29,10 +32,7 @@ import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolReference; import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.filters.ISystemFilterString; -import org.eclipse.rse.internal.model.IPropertyType; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IPropertySet; -import org.eclipse.rse.model.IRSEModelObject; import org.eclipse.rse.model.ISystemProfile; import org.eclipse.rse.persistence.dom.IRSEDOMConstants; import org.eclipse.rse.persistence.dom.IRSEDOMExporter; diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java index d31832e962e..96a67095f02 100644 --- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java +++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java @@ -19,6 +19,9 @@ package org.eclipse.rse.internal.persistence.dom; import java.util.Vector; import org.eclipse.rse.core.internal.subsystems.SubSystemFilterNamingPolicy; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IPropertyType; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.servicesubsystem.IServiceSubSystem; import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.IConnectorService; @@ -34,10 +37,7 @@ import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.filters.ISystemFilterString; import org.eclipse.rse.filters.SystemFilterStartHere; import org.eclipse.rse.internal.filters.SystemFilterPool; -import org.eclipse.rse.internal.model.IPropertyType; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IPropertySet; -import org.eclipse.rse.model.IRSEModelObject; import org.eclipse.rse.model.ISystemProfile; import org.eclipse.rse.model.ISystemProfileManager; import org.eclipse.rse.model.PropertyType; diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java index 974b43ef55e..947c8792a37 100644 --- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java +++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java @@ -17,6 +17,7 @@ package org.eclipse.rse.persistence.dom; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -25,7 +26,6 @@ import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolReference; import org.eclipse.rse.filters.ISystemFilterString; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IRSEModelObject; import org.eclipse.rse.model.ISystemProfile; diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java index 8f389b870cb..59a172e03fb 100644 --- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java +++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java @@ -17,6 +17,8 @@ package org.eclipse.rse.persistence.dom; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -25,8 +27,6 @@ import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolReference; import org.eclipse.rse.filters.ISystemFilterString; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IPropertySet; -import org.eclipse.rse.model.IRSEModelObject; import org.eclipse.rse.model.ISystemProfile; import org.eclipse.rse.model.ISystemProfileManager; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/ServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/ServerLauncher.java index bda3dfccafc..976b37d1d93 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/ServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/ServerLauncher.java @@ -15,10 +15,10 @@ ********************************************************************************/ package org.eclipse.rse.core.internal.subsystems; +import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.internal.model.RSEModelObject; -import org.eclipse.rse.model.IPropertySet; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java index 0e7aca88927..76c82c52f0b 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java @@ -16,8 +16,8 @@ package org.eclipse.rse.core.subsystems; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IRSEModelObject; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IServerLauncherProperties.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IServerLauncherProperties.java index c51785dd8be..d6dd7c913b9 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IServerLauncherProperties.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IServerLauncherProperties.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.core.subsystems; -import org.eclipse.rse.model.IRSEModelObject; +import org.eclipse.rse.core.model.IRSEModelObject; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java index a1668194e88..4e38c0bc23b 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java @@ -18,15 +18,15 @@ package org.eclipse.rse.core.subsystems; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.rse.core.model.IRSEModelObject; +import org.eclipse.rse.core.persistance.IRSEPersistableContainer; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.filters.ISystemFilterReference; import org.eclipse.rse.filters.ISystemFilterString; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IRSEModelObject; import org.eclipse.rse.model.ISystemProfile; -import org.eclipse.rse.persistence.IRSEPersistableContainer; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java index 34a0b762b14..14d7078bf1f 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java @@ -21,13 +21,13 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.rse.core.persistance.IRSEPersistableContainer; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemProfile; -import org.eclipse.rse.persistence.IRSEPersistableContainer; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.validators.ISystemValidator; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java index 0c6c31c7a91..e4ae8456d1e 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java @@ -20,9 +20,9 @@ import java.util.List; import org.eclipse.rse.core.internal.subsystems.RemoteServerLauncherConstants; import org.eclipse.rse.core.internal.subsystems.ServerLauncher; -import org.eclipse.rse.internal.model.IPropertyType; -import org.eclipse.rse.model.IProperty; -import org.eclipse.rse.model.IPropertySet; +import org.eclipse.rse.core.model.IProperty; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IPropertyType; import org.eclipse.rse.model.PropertyType; import org.eclipse.rse.ui.SystemResources; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index 47f33c14933..5a960648cbd 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -32,6 +32,7 @@ import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemPreferencesManager; +import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -42,7 +43,6 @@ import org.eclipse.rse.filters.ISystemFilterReference; import org.eclipse.rse.filters.ISystemFilterString; import org.eclipse.rse.internal.model.RSEModelObject; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.IPropertySet; import org.eclipse.rse.model.ISystemModelChangeEvents; import org.eclipse.rse.model.ISystemProfile; import org.eclipse.rse.model.ISystemRegistry;