1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-26 10:25:32 +02:00

[168870] stage 1 integration

This commit is contained in:
David Dykstal 2007-02-07 17:13:50 +00:00
parent d6ad1bdf1f
commit d4e96fd9dd
8 changed files with 74 additions and 71 deletions

View file

@ -163,7 +163,7 @@ public class RSECorePlugin extends Plugin {
public Logger getLogger() { public Logger getLogger() {
return logger; return logger;
} }
/** /**
* Log an unexpected exception that occurs during the functioning of this class. * Log an unexpected exception that occurs during the functioning of this class.
* @param t the exception to log * @param t the exception to log

View file

@ -70,7 +70,7 @@ public class RemoteSystemsProject extends PlatformObject
public void setProject(IProject project) public void setProject(IProject project)
{ {
SystemBasePlugin.logInfo("Inside setProject"); //$NON-NLS-1$ RSECorePlugin.getDefault().getLogger().logInfo("Inside setProject"); //$NON-NLS-1$
fProject= project; fProject= project;
} }
/** /**
@ -78,7 +78,7 @@ public class RemoteSystemsProject extends PlatformObject
*/ */
public void configure() throws CoreException 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. * Removes the Java nature from the project.

View file

@ -13,73 +13,76 @@
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * {Name} (company) - description of contribution.
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.ui; package org.eclipse.rse.ui;
/** /**
* Keys into preferences bundle. * Keys into preferences bundle.
*/ */
public interface ISystemPreferencesConstants public interface ISystemPreferencesConstants {
{ /*
* root
// root */
public static final String ROOT = "org.eclipse.rse.preferences."; //$NON-NLS-1$ public static final String ROOT = "org.eclipse.rse.preferences."; //$NON-NLS-1$
/*
// keys * 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 SYSTEMTYPE = ROOT + "systemtype"; //$NON-NLS-1$
public static final String USERIDPERKEY = ROOT + "useridperkey"; //$NON-NLS-1$ public static final String SYSTEMTYPE_VALUES = ROOT + "systemtype.info"; //$NON-NLS-1$
public static final String USERIDKEYS = ROOT + "userid.keys"; //$NON-NLS-1$ public static final String USERIDPERKEY = ROOT + "useridperkey"; //$NON-NLS-1$
public static final String SHOWFILTERPOOLS = ROOT + "filterpools.show"; //$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 ACTIVEUSERPROFILES = ROOT + "activeuserprofiles"; //$NON-NLS-1$
public static final String QUALIFY_CONNECTION_NAMES= ROOT + "qualifyconnectionnames"; //$NON-NLS-1$ public static final String USE_DEFERRED_QUERIES = ROOT + "useDeferredQueries"; //$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$
public static final String RESTORE_STATE_FROM_CACHE = ROOT + "restoreStateFromCache"; //$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$ /*
* core preference default values
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 DEFAULT_SYSTEMTYPE = ""; //$NON-NLS-1$
public static final String DEFAULT_USERID = ""; //$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
public static final boolean DEFAULT_RESTORE_STATE_FROM_CACHE = true; // yantzi: artemis 6.0 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 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$
public static final String DEFAULT_TEAMPROFILE = "Team"; //$NON-NLS-1$ /*
* dstore preference keys
*/
public static final boolean DEFAULT_DAEMON_AUTOSTART = false; public static final String DAEMON_AUTOSTART = ROOT + "daemon.autostart"; //$NON-NLS-1$
public static final int DEFAULT_DAEMON_PORT = 4300; 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 boolean DEFAULT_VERIFY_CONNECTION = true; public static final int DEFAULT_DAEMON_PORT = 4300;
/*
public static final boolean DEFAULT_ALERT_SSL = true; * uda preference keys
public static final boolean DEFAULT_ALERT_NON_SSL = true; */
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
} }

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution. * {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 * You own views launchable from the Remote System Explorer. You must register yourself

View file

@ -28,7 +28,6 @@ import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.ISystemViewSupplier;
import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.SystemResourceManager;

View file

@ -380,8 +380,9 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable
} }
/** /**
* Process all deltas * Process all deltas.
* CURRENTLY NOT USED. WILL FLESH OUT IN A FUTURE RELEASE AND TRY TO AVOID THE ATOM BOMB APPROACH WE TAKE NOW * 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) 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() public static void reloadRSE()
{ {
@ -760,7 +761,7 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable
// 1. Close all non-primary RSE perspectives // 1. Close all non-primary RSE perspectives
// -- For the primary (last one found with SystemRegistry as the input) RSE perspective, leave it open // -- 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 // 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 // 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 // 5. Give model change listeners (eg, views) an opportunity to re-load themselves if they need to