From d4e96fd9dda41236d519e41b007952700ad70f03 Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Wed, 7 Feb 2007 17:13:50 +0000 Subject: [PATCH] [168870] stage 1 integration --- .../rse/core/IRemoteSystemsProject.java | 0 .../org/eclipse/rse/core/RSECorePlugin.java | 2 +- .../rse/core/RemoteSystemsProject.java | 4 +- .../core/RemoteSystemsTempProjectNature.java | 0 .../rse/ui/ISystemPreferencesConstants.java | 127 +++++++++--------- .../eclipse/rse/ui}/ISystemViewSupplier.java | 2 +- .../UI/org/eclipse/rse/ui/RSEUIPlugin.java | 1 - .../rse/core/SystemResourceListener.java | 9 +- 8 files changed, 74 insertions(+), 71 deletions(-) rename rse/plugins/{org.eclipse.rse.ui/systems => org.eclipse.rse.core/src}/org/eclipse/rse/core/IRemoteSystemsProject.java (100%) rename rse/plugins/{org.eclipse.rse.ui/systems => org.eclipse.rse.core/src}/org/eclipse/rse/core/RemoteSystemsProject.java (94%) rename rse/plugins/{org.eclipse.rse.ui/systems => org.eclipse.rse.core/src}/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java (100%) rename rse/plugins/org.eclipse.rse.ui/{systems/org/eclipse/rse/core => UI/org/eclipse/rse/ui}/ISystemViewSupplier.java (97%) diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/IRemoteSystemsProject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRemoteSystemsProject.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/IRemoteSystemsProject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRemoteSystemsProject.java diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java index 3f8acaeaac0..c131183e991 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java @@ -163,7 +163,7 @@ public class RSECorePlugin extends Plugin { public Logger getLogger() { return logger; } - + /** * Log an unexpected exception that occurs during the functioning of this class. * @param t the exception to log diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/RemoteSystemsProject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsProject.java similarity index 94% rename from rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/RemoteSystemsProject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsProject.java index f123172f610..06561b33788 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/RemoteSystemsProject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsProject.java @@ -70,7 +70,7 @@ public class RemoteSystemsProject extends PlatformObject public void setProject(IProject project) { - SystemBasePlugin.logInfo("Inside setProject"); //$NON-NLS-1$ + RSECorePlugin.getDefault().getLogger().logInfo("Inside setProject"); //$NON-NLS-1$ fProject= project; } /** @@ -78,7 +78,7 @@ public class RemoteSystemsProject extends PlatformObject */ public void configure() throws CoreException { - SystemBasePlugin.logInfo("Inside configure"); //$NON-NLS-1$ + RSECorePlugin.getDefault().getLogger().logInfo("Inside configure"); //$NON-NLS-1$ } /** * Removes the Java nature from the project. diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemPreferencesConstants.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemPreferencesConstants.java index c42f51f0bf8..a64d16b666e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemPreferencesConstants.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemPreferencesConstants.java @@ -13,73 +13,76 @@ * Contributors: * {Name} (company) - description of contribution. ********************************************************************************/ - package org.eclipse.rse.ui; + /** * Keys into preferences bundle. */ -public interface ISystemPreferencesConstants -{ - - // root +public interface ISystemPreferencesConstants { + /* + * root + */ public static final String ROOT = "org.eclipse.rse.preferences."; //$NON-NLS-1$ - - // keys - public static final String SYSTEMTYPE = ROOT + "systemtype"; //$NON-NLS-1$ - public static final String SYSTEMTYPE_VALUES = ROOT + "systemtype.info"; //$NON-NLS-1$ - public static final String USERIDPERKEY = ROOT + "useridperkey"; //$NON-NLS-1$ - public static final String USERIDKEYS = ROOT + "userid.keys"; //$NON-NLS-1$ - public static final String SHOWFILTERPOOLS = ROOT + "filterpools.show"; //$NON-NLS-1$ - public static final String ACTIVEUSERPROFILES = ROOT + "activeuserprofiles"; //$NON-NLS-1$ - public static final String QUALIFY_CONNECTION_NAMES= ROOT + "qualifyconnectionnames"; //$NON-NLS-1$ - public static final String ORDER_CONNECTIONS = ROOT + "order.connections"; //$NON-NLS-1$ - public static final String HISTORY_FOLDER = ROOT + "history.folder"; //$NON-NLS-1$ - public static final String HISTORY_QUALIFIED_FOLDER= ROOT + "history.qualified.folder"; //$NON-NLS-1$ - public static final String SHOWNEWCONNECTIONPROMPT = ROOT + "shownewconnection"; //$NON-NLS-1$ - public static final String REMEMBER_STATE = ROOT + "rememberState"; //$NON-NLS-1$ - public static final String USE_DEFERRED_QUERIES = ROOT + "useDeferredQueries"; //$NON-NLS-1$ + /* + * core preference keys + */ + public static final String SYSTEMTYPE = ROOT + "systemtype"; //$NON-NLS-1$ + public static final String SYSTEMTYPE_VALUES = ROOT + "systemtype.info"; //$NON-NLS-1$ + public static final String USERIDPERKEY = ROOT + "useridperkey"; //$NON-NLS-1$ + public static final String USERIDKEYS = ROOT + "userid.keys"; //$NON-NLS-1$ + public static final String ACTIVEUSERPROFILES = ROOT + "activeuserprofiles"; //$NON-NLS-1$ + public static final String USE_DEFERRED_QUERIES = ROOT + "useDeferredQueries"; //$NON-NLS-1$ public static final String RESTORE_STATE_FROM_CACHE = ROOT + "restoreStateFromCache"; //$NON-NLS-1$ - public static final String CASCADE_UDAS_BYPROFILE = ROOT + "uda.cascade"; //$NON-NLS-1$ - - public static final String DAEMON_AUTOSTART = ROOT + "daemon.autostart"; //$NON-NLS-1$ - public static final String DAEMON_PORT = ROOT + "daemon.port"; //$NON-NLS-1$ - - - - public static final String VERIFY_CONNECTION = ROOT + "verify.connection"; //$NON-NLS-1$ - - public static final String ALERT_SSL = ROOT + "alert.ssl"; //$NON-NLS-1$ - public static final String ALERT_NONSSL = ROOT + "alert.nonssl"; //$NON-NLS-1$ - - // DEFAULTS - public static final boolean DEFAULT_SHOWFILTERPOOLS = false; - public static final boolean DEFAULT_QUALIFY_CONNECTION_NAMES = false; - public static final String DEFAULT_SYSTEMTYPE = ""; //$NON-NLS-1$ - public static final String DEFAULT_USERID = ""; //$NON-NLS-1$ - //DKM public static final String DEFAULT_ACTIVEUSERPROFILES = "Team;Private"; - public static final String DEFAULT_ACTIVEUSERPROFILES = "Team"; //$NON-NLS-1$ - - public static final String DEFAULT_ORDER_CONNECTIONS = ""; //$NON-NLS-1$ - public static final String DEFAULT_HISTORY_FOLDER = ""; //$NON-NLS-1$ - - public static final boolean DEFAULT_SHOWNEWCONNECTIONPROMPT = false; - public static final boolean DEFAULT_REMEMBER_STATE = true; // changed in R2. Phil + /* + * core preference default values + */ + public static final String DEFAULT_SYSTEMTYPE = ""; //$NON-NLS-1$ + public static final String DEFAULT_USERID = ""; //$NON-NLS-1$ public static final boolean DEFAULT_RESTORE_STATE_FROM_CACHE = true; // yantzi: artemis 6.0 - public static final boolean DEFAULT_CASCADE_UDAS_BYPROFILE = false; - public static final boolean DEFAULT_USE_DEFERRED_QUERIES = true; - - public static final String DEFAULT_TEAMPROFILE = "Team"; //$NON-NLS-1$ - - - public static final boolean DEFAULT_DAEMON_AUTOSTART = false; - public static final int DEFAULT_DAEMON_PORT = 4300; - - - - - public static final boolean DEFAULT_VERIFY_CONNECTION = true; - - public static final boolean DEFAULT_ALERT_SSL = true; - public static final boolean DEFAULT_ALERT_NON_SSL = true; - + public static final boolean DEFAULT_USE_DEFERRED_QUERIES = true; + public static final String DEFAULT_TEAMPROFILE = "Team"; //$NON-NLS-1$ + public static final String DEFAULT_ACTIVEUSERPROFILES = "Team"; //$NON-NLS-1$ + /* + * dstore preference keys + */ + public static final String DAEMON_AUTOSTART = ROOT + "daemon.autostart"; //$NON-NLS-1$ + public static final String DAEMON_PORT = ROOT + "daemon.port"; //$NON-NLS-1$ + /* + * dstore preference default values + */ + public static final boolean DEFAULT_DAEMON_AUTOSTART = false; + public static final int DEFAULT_DAEMON_PORT = 4300; + /* + * uda preference keys + */ + public static final String CASCADE_UDAS_BYPROFILE = ROOT + "uda.cascade"; //$NON-NLS-1$ + /* + * uda preference default values + */ + public static final boolean DEFAULT_CASCADE_UDAS_BYPROFILE = false; + /* + * ui preference keys + */ + public static final String SHOWFILTERPOOLS = ROOT + "filterpools.show"; //$NON-NLS-1$ + public static final String QUALIFY_CONNECTION_NAMES = ROOT + "qualifyconnectionnames"; //$NON-NLS-1$ + public static final String ORDER_CONNECTIONS = ROOT + "order.connections"; //$NON-NLS-1$ + public static final String SHOWNEWCONNECTIONPROMPT = ROOT + "shownewconnection"; //$NON-NLS-1$ + public static final String VERIFY_CONNECTION = ROOT + "verify.connection"; //$NON-NLS-1$ + public static final String ALERT_SSL = ROOT + "alert.ssl"; //$NON-NLS-1$ + public static final String ALERT_NONSSL = ROOT + "alert.nonssl"; //$NON-NLS-1$ + public static final String HISTORY_FOLDER = ROOT + "history.folder"; //$NON-NLS-1$ + public static final String HISTORY_QUALIFIED_FOLDER = ROOT + "history.qualified.folder"; //$NON-NLS-1$ + public static final String REMEMBER_STATE = ROOT + "rememberState"; //$NON-NLS-1$ + /* + * ui preference default values + */ + public static final boolean DEFAULT_SHOWFILTERPOOLS = false; + public static final boolean DEFAULT_QUALIFY_CONNECTION_NAMES = false; + public static final String DEFAULT_ORDER_CONNECTIONS = ""; //$NON-NLS-1$ + public static final boolean DEFAULT_SHOWNEWCONNECTIONPROMPT = false; + public static final boolean DEFAULT_VERIFY_CONNECTION = true; + public static final boolean DEFAULT_ALERT_SSL = true; + public static final boolean DEFAULT_ALERT_NON_SSL = true; + public static final String DEFAULT_HISTORY_FOLDER = ""; //$NON-NLS-1$ + public static final boolean DEFAULT_REMEMBER_STATE = true; // changed in R2. Phil } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/ISystemViewSupplier.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemViewSupplier.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/ISystemViewSupplier.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemViewSupplier.java index f65c725c6fc..def5e643daf 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/ISystemViewSupplier.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemViewSupplier.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.core; +package org.eclipse.rse.ui; /** * You own views launchable from the Remote System Explorer. You must register yourself diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java index 54dadfa9ab5..b570a7afcdf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java @@ -28,7 +28,6 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.ISystemViewSupplier; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemResourceManager; diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java index f0659a46537..66097820431 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java @@ -380,8 +380,9 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable } /** - * Process all deltas - * CURRENTLY NOT USED. WILL FLESH OUT IN A FUTURE RELEASE AND TRY TO AVOID THE ATOM BOMB APPROACH WE TAKE NOW + * Process all deltas. + * Currently not used. + * WILL FLESH OUT IN A FUTURE RELEASE AND TRY TO AVOID THE ATOM BOMB APPROACH WE TAKE NOW */ protected boolean processDelta(String indent, IResourceDelta delta) { @@ -732,7 +733,7 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable } /** - * Re-load the whole RSE from the workspace. This is to be called after a team-sync, say + * Re-load the whole RSE from the workspace. This is to be called after a team synchronization. */ public static void reloadRSE() { @@ -760,7 +761,7 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable // 1. Close all non-primary RSE perspectives // -- For the primary (last one found with SystemRegistry as the input) RSE perspective, leave it open // 2. Close all non-primary views from the primary RSE perspective. Currently, a no-op - // 3. Reload the world! + // 3. Reload the model. // 4. Re-open non-primary views in primary RSE perspective. Currently a no-op // 5. Give model change listeners (eg, views) an opportunity to re-load themselves if they need to