diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt index cc26cc58272..0ff4f0c4cca 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/options.txt +++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt @@ -32,7 +32,6 @@ ;../org.eclipse.rse.subsystems.shells.ssh/src ;../org.eclipse.rse.ui/filters ;../org.eclipse.rse.ui/persistence -;../org.eclipse.rse.ui/references ;../org.eclipse.rse.ui/model ;../org.eclipse.rse.ui/UI ;../org.eclipse.rse.ui/subsystems 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 db768510aa2..20cca714a6f 100644 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF @@ -13,5 +13,6 @@ 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 + org.eclipse.rse.core.references, + org.eclipse.rse.internal.references Bundle-Vendor: Eclipse.org diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java index 5b998b6560b..8aac088aca6 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java @@ -26,9 +26,11 @@ public class RSEModelResources extends NLS { private static String BUNDLE_NAME = "org.eclipse.rse.core.model.RSEModelResources"; //$NON-NLS-1$ public static String RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION; + public static String RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION; static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, RSEModelResources.class); } + } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties index ce42b423b11..e07fc98c53e 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties @@ -16,4 +16,5 @@ # NLS_MESSAGEFORMAT_NONE -RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION=An RSE Model Object represents any object in the Remote Systems Explorer. \ No newline at end of file +RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION=An RSE Model Object represents any object in the Remote Systems Explorer. +RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION=A Referencing Object encapsulates the operations required of an object which is merely a reference to another object. diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferencedObject.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencedObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferencedObject.java diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencedObjectHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferencedObjectHelper.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencedObjectHelper.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferencedObjectHelper.java diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencedObject.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencedObject.java diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObjectHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencedObjectHelper.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObjectHelper.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencedObjectHelper.java diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObject.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObject.java index 6ce5380116e..c0e8650433f 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObject.java @@ -16,9 +16,9 @@ package org.eclipse.rse.internal.references; import org.eclipse.rse.core.model.RSEModelObject; +import org.eclipse.rse.core.model.RSEModelResources; import org.eclipse.rse.core.references.IRSEBaseReferencedObject; import org.eclipse.rse.core.references.IRSEReferencingObject; -import org.eclipse.rse.ui.SystemResources; /** @@ -89,7 +89,7 @@ public abstract class SystemReferencingObject extends RSEModelObject implements public String getDescription() { - return SystemResources.RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION; + return RSEModelResources.RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION; } protected final SystemReferencingObjectHelper getHelper() { diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java diff --git a/rse/plugins/org.eclipse.rse.ui/.classpath b/rse/plugins/org.eclipse.rse.ui/.classpath index a16894a8371..fcd17436b57 100644 --- a/rse/plugins/org.eclipse.rse.ui/.classpath +++ b/rse/plugins/org.eclipse.rse.ui/.classpath @@ -2,7 +2,6 @@ - diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF index 99d9da07fa2..7ed7bf32334 100644 --- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF @@ -29,7 +29,6 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.internal.model, org.eclipse.rse.internal.persistence, org.eclipse.rse.internal.persistence.dom, - org.eclipse.rse.internal.references, org.eclipse.rse.model, org.eclipse.rse.persistence, org.eclipse.rse.persistence.dom, diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java index 50fba9a815b..da38d04cef9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java @@ -1224,7 +1224,6 @@ public class SystemResources extends NLS public static String RESID_MODELOBJECTS_HOSTPOOL_DESCRIPTION; public static String RESID_MODELOBJECTS_PROFILE_DESCRIPTION; public static String RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION; - public static String RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION; public static String RESID_MODELOBJECTS_FILTER_DESCRIPTION; public static String RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties index 34f7f6cf9fb..7c100f8a9cf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties @@ -1414,7 +1414,6 @@ RESID_MODELOBJECTS_FILTERSTRING_DESCRIPTION=A filter string is a single string i RESID_MODELOBJECTS_HOSTPOOL_DESCRIPTION=A host pool is a group of hosts. There is one host pool associated with each profile. RESID_MODELOBJECTS_PROFILE_DESCRIPTION=Your profile is the object with which all your unique settings and RSE objects such as connections are associated. RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION=The Server Launcher is an object for storing configuration details about how to launch servers on the remote host. -RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION=A Referencing Object encapsulates the operations required of an object which is merely a reference to another object. RESID_MODELOBJECTS_FILTER_DESCRIPTION=A filter is a collection of filter strings that determines which files will pass through it. RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION=A filter pool is a group of filters. There is one filter pool associated with each profile. diff --git a/rse/plugins/org.eclipse.rse.ui/build.properties b/rse/plugins/org.eclipse.rse.ui/build.properties index 46ff290ad79..7dc50033916 100644 --- a/rse/plugins/org.eclipse.rse.ui/build.properties +++ b/rse/plugins/org.eclipse.rse.ui/build.properties @@ -9,8 +9,7 @@ bin.includes = HelpContexts.xml,\ META-INF/,\ schema/ output.. = bin/ -source.. = references/,\ - filters/,\ +source.. = filters/,\ model/,\ subsystems/,\ systems/,\