mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 23:25:26 +02:00
[180525] moving resources to internal
This commit is contained in:
parent
a88217eb69
commit
a2897d03f8
75 changed files with 163 additions and 88 deletions
|
@ -1,3 +1,3 @@
|
|||
#Fri Mar 30 13:59:16 CDT 2007
|
||||
#Fri Mar 30 16:58:07 EST 2007
|
||||
eclipse.preferences.version=1
|
||||
encoding//src/org/eclipse/rse/internal/persistence/messages.properties=8859_1
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
/********************************************************************************
|
||||
* Copyright (c) 2007 IBM Corporation. All rights reserved.
|
||||
* This program and the accompanying materials are made available under the terms
|
||||
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
||||
* available at http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Initial Contributors:
|
||||
* The following IBM employees contributed to the Remote System Explorer
|
||||
* component that contains this file: David McKnight.
|
||||
*
|
||||
* Contributors:
|
||||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
package org.eclipse.rse.core.model;
|
||||
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
|
||||
public interface IRSECallback {
|
||||
|
||||
public void operationComplete(String operationName, ISubSystem subsystem, IProgressMonitor monitor);
|
||||
}
|
|
@ -16,6 +16,8 @@
|
|||
|
||||
package org.eclipse.rse.core.model;
|
||||
|
||||
import org.eclipse.rse.internal.core.model.RSEModelResources;
|
||||
|
||||
/**
|
||||
* Provides common support for local RSE model objects
|
||||
* Extenders inherit property set support
|
||||
|
|
|
@ -24,6 +24,7 @@ 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.model.IHost;
|
||||
import org.eclipse.rse.core.model.IRSECallback;
|
||||
import org.eclipse.rse.core.model.IRSEModelObject;
|
||||
import org.eclipse.rse.core.model.IRSEPersistableContainer;
|
||||
import org.eclipse.rse.core.model.ISystemProfile;
|
||||
|
@ -353,11 +354,14 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
|
|||
*/
|
||||
public void connect() throws Exception;
|
||||
|
||||
|
||||
/**
|
||||
* Connect to the remote system from a background job
|
||||
*
|
||||
* @param monitor the process monitor
|
||||
*/
|
||||
public void connect(IProgressMonitor monitor) throws Exception;
|
||||
|
||||
|
||||
/**
|
||||
* Connect to the remote system, optionally forcing a signon prompt even if the password
|
||||
* is cached in memory or on disk.
|
||||
|
@ -366,6 +370,28 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
|
|||
* in memory.
|
||||
*/
|
||||
public void connect(boolean forcePrompt) throws Exception;
|
||||
|
||||
/**
|
||||
* Connect to the remote system on a background job. The callback is
|
||||
* called when the connect is complete.
|
||||
*
|
||||
* @param callback to call after connect is complete
|
||||
* @throws Exception
|
||||
*/
|
||||
public void connect(IRSECallback callback) throws Exception;
|
||||
|
||||
/**
|
||||
* Connect to the remote system on a background job. The callback is
|
||||
* called when the connect is complete.
|
||||
*
|
||||
* @param forcePrompt forces the prompt dialog even if the password is in mem
|
||||
* @param callback to call after connect is complete
|
||||
* @throws Exception
|
||||
*/
|
||||
public void connect(boolean forcePrompt, IRSECallback callback) throws Exception;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Disconnect from the remote system.
|
||||
|
|
|
@ -22,7 +22,7 @@ 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.core.model.PropertyType;
|
||||
import org.eclipse.rse.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.internal.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.internal.core.subsystems.ServerLauncher;
|
||||
|
||||
|
||||
|
|
|
@ -33,8 +33,8 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
|
|||
import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
|
||||
import org.eclipse.rse.core.filters.ISystemFilterString;
|
||||
import org.eclipse.rse.core.filters.SystemFilterSimple;
|
||||
import org.eclipse.rse.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.core.references.IRSEReferencedObject;
|
||||
import org.eclipse.rse.internal.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.internal.references.SystemReferencedObject;
|
||||
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
|
|||
import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
|
||||
import org.eclipse.rse.core.filters.ISystemFilterSavePolicies;
|
||||
import org.eclipse.rse.core.filters.SystemFilterNamingPolicy;
|
||||
import org.eclipse.rse.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.internal.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.internal.references.SystemPersistableReferencedObject;
|
||||
|
||||
|
||||
|
|
|
@ -25,8 +25,8 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
|
|||
import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
|
||||
import org.eclipse.rse.core.filters.ISystemFilterString;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
||||
import org.eclipse.rse.internal.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.internal.references.SystemReferencedObjectHelper;
|
||||
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
* David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.core.model;
|
||||
package org.eclipse.rse.internal.core.model;
|
||||
|
||||
import org.eclipse.osgi.util.NLS;
|
||||
|
||||
|
@ -23,7 +23,7 @@ import org.eclipse.osgi.util.NLS;
|
|||
*/
|
||||
public class RSEModelResources extends NLS {
|
||||
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.core.model.RSEModelResources"; //$NON-NLS-1$
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.internal.core.model.RSEModelResources"; //$NON-NLS-1$
|
||||
|
||||
public static String RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION;
|
||||
public static String RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION;
|
|
@ -18,9 +18,9 @@ package org.eclipse.rse.internal.core.subsystems;
|
|||
import org.eclipse.rse.core.RSECorePlugin;
|
||||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.core.subsystems.IConnectorService;
|
||||
import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
|
||||
import org.eclipse.rse.internal.core.model.RSEModelResources;
|
||||
|
||||
|
||||
public abstract class ServerLauncher extends RSEModelObject implements IServerLauncherProperties
|
||||
|
|
|
@ -17,9 +17,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.internal.core.model.RSEModelResources;
|
||||
|
||||
/**
|
||||
* A class to encapsulate the operations required of an object which
|
||||
|
|
|
@ -18,7 +18,7 @@ package org.eclipse.rse.files.ui.dialogs;
|
|||
|
||||
import org.eclipse.rse.files.ui.widgets.SystemEnterOrSelectRemoteFileForm;
|
||||
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ import org.eclipse.rse.core.filters.ISystemFilter;
|
|||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.files.ui.widgets.SystemRemoteFolderCombo;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.ui.SystemWidgetHelpers;
|
||||
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
|
||||
import org.eclipse.swt.SWT;
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
package org.eclipse.rse.files.ui.dialogs;
|
||||
|
||||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
package org.eclipse.rse.files.ui.dialogs;
|
||||
|
||||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
package org.eclipse.rse.files.ui.dialogs;
|
||||
|
||||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
|
|
|
@ -19,10 +19,10 @@ import org.eclipse.jface.viewers.ViewerFilter;
|
|||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.files.ui.ISystemAddFileListener;
|
||||
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.ui.SystemResources;
|
||||
import org.eclipse.rse.internal.ui.view.SystemViewForm;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
|
||||
import org.eclipse.rse.ui.messages.ISystemMessageLine;
|
||||
|
|
|
@ -26,8 +26,8 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
|
|||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
|
||||
import org.eclipse.rse.internal.files.ui.actions.SystemSelectFileTypesAction;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
|
||||
|
|
|
@ -23,8 +23,8 @@ import org.eclipse.rse.core.model.ISystemProfile;
|
|||
import org.eclipse.rse.core.model.ISystemRegistry;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
|
||||
|
|
|
@ -22,8 +22,8 @@ import java.util.Vector;
|
|||
import org.eclipse.rse.core.SystemBasePlugin;
|
||||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
|
||||
import org.eclipse.rse.ui.ISystemPreferencesConstants;
|
||||
|
|
|
@ -34,11 +34,11 @@ import org.eclipse.rse.core.filters.SystemFilterSimple;
|
|||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.core.model.ISystemRegistry;
|
||||
import org.eclipse.rse.files.ui.ISystemAddFileListener;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.ui.view.SystemPropertySheetForm;
|
||||
import org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl;
|
||||
import org.eclipse.rse.internal.ui.view.SystemViewForm;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
|
||||
package org.eclipse.rse.internal.files.ui.actions;
|
||||
import org.eclipse.rse.files.ui.widgets.SystemFileFilterStringEditPane;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.ui.SystemResources;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction;
|
||||
import org.eclipse.rse.ui.filters.dialogs.SystemChangeFilterDialog;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
package org.eclipse.rse.internal.files.ui.actions;
|
||||
import org.eclipse.rse.core.filters.ISystemFilterPool;
|
||||
import org.eclipse.rse.files.ui.widgets.SystemFileFilterStringEditPane;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
|
||||
import org.eclipse.rse.ui.ISystemIconConstants;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
|
|
|
@ -23,7 +23,7 @@ import java.util.Iterator;
|
|||
import java.util.List;
|
||||
|
||||
import org.eclipse.jface.dialogs.Dialog;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
|
||||
import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
|
||||
import org.eclipse.rse.ui.dialogs.SystemSelectFileTypesDialog;
|
||||
|
|
|
@ -23,10 +23,10 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.model.ISystemResourceChangeEvents;
|
||||
import org.eclipse.rse.services.files.RemoteFileIOException;
|
||||
import org.eclipse.rse.services.files.RemoteFileSecurityException;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IVirtualRemoteFile;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileEncodingManager;
|
||||
|
|
|
@ -25,9 +25,9 @@ import org.eclipse.rse.core.filters.SystemFilterSimple;
|
|||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
|
||||
import org.eclipse.rse.internal.files.ui.FileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
|
|
|
@ -22,8 +22,8 @@ import org.eclipse.rse.core.filters.ISystemFilter;
|
|||
import org.eclipse.rse.core.filters.SystemFilterSimple;
|
||||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
|
|
|
@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.rse.services.dstore
|
||||
Bundle-Version: 2.0.0.qualifier
|
||||
Bundle-Activator: org.eclipse.rse.services.dstore.Activator
|
||||
Bundle-Activator: org.eclipse.rse.internal.services.dstore.Activator
|
||||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.rse.services,
|
||||
|
@ -17,13 +17,13 @@ Export-Package: org.eclipse.rse.dstore.universal.miners,
|
|||
org.eclipse.rse.dstore.universal.miners.filesystem,
|
||||
org.eclipse.rse.dstore.universal.miners.processes,
|
||||
org.eclipse.rse.internal.dstore.universal.miners.command.patterns,
|
||||
org.eclipse.rse.internal.services.dstore.files,
|
||||
org.eclipse.rse.internal.services.dstore.processes,
|
||||
org.eclipse.rse.internal.services.dstore.rmtservice,
|
||||
org.eclipse.rse.internal.services.dstore.search,
|
||||
org.eclipse.rse.internal.services.dstore.shell;x-internal:=true,
|
||||
org.eclipse.rse.internal.services.dstore.shells,
|
||||
org.eclipse.rse.services.dstore,
|
||||
org.eclipse.rse.services.dstore.files,
|
||||
org.eclipse.rse.services.dstore.processes,
|
||||
org.eclipse.rse.services.dstore.rmtservice,
|
||||
org.eclipse.rse.services.dstore.search,
|
||||
org.eclipse.rse.services.dstore.shells,
|
||||
org.eclipse.rse.services.dstore.util
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore;
|
||||
package org.eclipse.rse.internal.services.dstore;
|
||||
|
||||
import org.eclipse.core.runtime.Plugin;
|
||||
import org.osgi.framework.BundleContext;
|
|
@ -14,13 +14,13 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore;
|
||||
package org.eclipse.rse.internal.services.dstore;
|
||||
|
||||
import org.eclipse.osgi.util.NLS;
|
||||
|
||||
public class ServiceResources extends NLS
|
||||
{
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.services.dstore.ServiceResources";//$NON-NLS-1$
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.internal.services.dstore.ServiceResources";//$NON-NLS-1$
|
||||
|
||||
public static String DStore_Shell_Service_Label;
|
||||
public static String DStore_Search_Service_Label;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.files;
|
||||
package org.eclipse.rse.internal.services.dstore.files;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.File;
|
||||
|
@ -40,6 +40,7 @@ import org.eclipse.dstore.core.model.IDataStoreProvider;
|
|||
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
|
||||
import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalByteStreamHandler;
|
||||
import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner;
|
||||
import org.eclipse.rse.internal.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.clientserver.FileTypeMatcher;
|
||||
import org.eclipse.rse.services.clientserver.IMatcher;
|
||||
import org.eclipse.rse.services.clientserver.IServiceConstants;
|
||||
|
@ -51,7 +52,6 @@ import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
|
|||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
|
||||
import org.eclipse.rse.services.dstore.AbstractDStoreService;
|
||||
import org.eclipse.rse.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.dstore.util.DownloadListener;
|
||||
import org.eclipse.rse.services.dstore.util.FileSystemMessageUtil;
|
||||
import org.eclipse.rse.services.files.IFileService;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.files;
|
||||
package org.eclipse.rse.internal.services.dstore.files;
|
||||
|
||||
import java.io.File;
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
* Contributors:
|
||||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
package org.eclipse.rse.services.dstore.files;
|
||||
package org.eclipse.rse.internal.services.dstore.files;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
|
@ -11,7 +11,7 @@
|
|||
* Contributors:
|
||||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
package org.eclipse.rse.services.dstore.files;
|
||||
package org.eclipse.rse.internal.services.dstore.files;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.files;
|
||||
package org.eclipse.rse.internal.services.dstore.files;
|
||||
|
||||
import org.eclipse.dstore.core.model.DataElement;
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.processes;
|
||||
package org.eclipse.rse.internal.services.dstore.processes;
|
||||
|
||||
|
||||
import java.util.HashMap;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.processes;
|
||||
package org.eclipse.rse.internal.services.dstore.processes;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
@ -26,12 +26,12 @@ import org.eclipse.dstore.core.model.DataStore;
|
|||
import org.eclipse.dstore.core.model.IDataStoreProvider;
|
||||
import org.eclipse.rse.dstore.universal.miners.processes.IUniversalProcessDataStoreConstants;
|
||||
import org.eclipse.rse.dstore.universal.miners.processes.UniversalProcessMiner;
|
||||
import org.eclipse.rse.internal.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
|
||||
import org.eclipse.rse.services.clientserver.processes.IHostProcess;
|
||||
import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter;
|
||||
import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteConstants;
|
||||
import org.eclipse.rse.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.dstore.util.DStoreStatusMonitor;
|
||||
import org.eclipse.rse.services.processes.AbstractProcessService;
|
||||
import org.eclipse.rse.services.processes.IProcessService;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.rmtservice;
|
||||
package org.eclipse.rse.internal.services.dstore.rmtservice;
|
||||
|
||||
import org.eclipse.dstore.core.java.IRemoteClassInstance;
|
||||
import org.eclipse.dstore.core.model.IDataStoreProvider;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.search;
|
||||
package org.eclipse.rse.internal.services.dstore.search;
|
||||
|
||||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.dstore.extra.DomainEvent;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.search;
|
||||
package org.eclipse.rse.internal.services.dstore.search;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
@ -23,11 +23,11 @@ import org.eclipse.dstore.core.model.DataElement;
|
|||
import org.eclipse.dstore.core.model.DataStore;
|
||||
import org.eclipse.dstore.core.model.IDataStoreProvider;
|
||||
import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner;
|
||||
import org.eclipse.rse.internal.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile;
|
||||
import org.eclipse.rse.services.clientserver.SystemSearchString;
|
||||
import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
|
||||
import org.eclipse.rse.services.dstore.AbstractDStoreService;
|
||||
import org.eclipse.rse.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.dstore.files.DStoreHostFile;
|
||||
import org.eclipse.rse.services.files.IFileService;
|
||||
import org.eclipse.rse.services.search.IHostSearchConstants;
|
||||
import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
|
|
@ -19,7 +19,7 @@ package org.eclipse.rse.internal.services.dstore.shell;
|
|||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.dstore.extra.DomainEvent;
|
||||
import org.eclipse.dstore.extra.IDomainListener;
|
||||
import org.eclipse.rse.services.dstore.shells.DStoreHostOutput;
|
||||
import org.eclipse.rse.internal.services.dstore.shells.DStoreHostOutput;
|
||||
import org.eclipse.rse.services.shells.AbstractHostShellOutputReader;
|
||||
import org.eclipse.rse.services.shells.IHostOutput;
|
||||
import org.eclipse.rse.services.shells.IHostShell;
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.shells;
|
||||
package org.eclipse.rse.internal.services.dstore.shells;
|
||||
|
||||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.rse.services.shells.IHostOutput;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.shells;
|
||||
package org.eclipse.rse.internal.services.dstore.shells;
|
||||
|
||||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.dstore.core.model.DataStore;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.services.dstore.shells;
|
||||
package org.eclipse.rse.internal.services.dstore.shells;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
@ -26,10 +26,10 @@ import org.eclipse.dstore.core.model.DataStore;
|
|||
import org.eclipse.dstore.core.model.IDataStoreProvider;
|
||||
import org.eclipse.rse.dstore.universal.miners.command.CommandMiner;
|
||||
import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner;
|
||||
import org.eclipse.rse.internal.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.services.dstore.AbstractDStoreService;
|
||||
import org.eclipse.rse.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.dstore.util.DStoreStatusMonitor;
|
||||
import org.eclipse.rse.services.shells.IHostShell;
|
||||
import org.eclipse.rse.services.shells.IShellService;
|
|
@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
|
|||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.dstore.core.model.DataStore;
|
||||
import org.eclipse.dstore.core.model.IDataStoreProvider;
|
||||
import org.eclipse.rse.internal.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.services.dstore.util.DStoreStatusMonitor;
|
||||
|
|
|
@ -28,8 +28,8 @@ import org.eclipse.dstore.core.model.DataStore;
|
|||
import org.eclipse.dstore.extra.DomainEvent;
|
||||
import org.eclipse.dstore.extra.IDomainListener;
|
||||
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
|
||||
import org.eclipse.rse.internal.services.dstore.ServiceResources;
|
||||
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
|
||||
import org.eclipse.rse.services.dstore.ServiceResources;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
|
||||
public class DownloadListener implements IDomainListener,IUniversalDataStoreConstants
|
||||
|
|
|
@ -20,7 +20,7 @@ import java.io.FileWriter;
|
|||
|
||||
import org.eclipse.rse.internal.shells.ui.ShellResources;
|
||||
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
|
||||
import org.eclipse.rse.ui.ISystemIconConstants;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
|
|
|
@ -21,7 +21,7 @@ import java.io.FileWriter;
|
|||
import org.eclipse.core.runtime.IAdaptable;
|
||||
import org.eclipse.rse.internal.shells.ui.ShellResources;
|
||||
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
|
||||
import org.eclipse.rse.ui.ISystemIconConstants;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
|
|
|
@ -15,14 +15,14 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.rse.subsystems.files.core;
|
||||
package org.eclipse.rse.internal.subsystems.files.core;
|
||||
|
||||
import org.eclipse.osgi.util.NLS;
|
||||
|
||||
|
||||
public class SystemFileResources extends NLS
|
||||
{
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.subsystems.files.core.SystemFileResources"; //$NON-NLS-1$
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.internal.subsystems.files.core.SystemFileResources"; //$NON-NLS-1$
|
||||
|
||||
// -------------------
|
||||
// DEFAULT FILTERS...
|
|
@ -20,10 +20,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
|
|||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.core.runtime.jobs.Job;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.services.files.IFileService;
|
||||
import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
|
||||
import org.eclipse.rse.services.search.ISearchService;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage;
|
|||
import org.eclipse.rse.core.subsystems.IFileConstants;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
|
||||
import org.eclipse.rse.subsystems.files.core.util.ValidatorFileFilterString;
|
||||
import org.eclipse.rse.ui.validators.ISystemValidator;
|
||||
|
|
|
@ -21,7 +21,7 @@ import org.eclipse.dstore.core.model.DataElement;
|
|||
import org.eclipse.dstore.core.model.DataStore;
|
||||
import org.eclipse.rse.core.SystemBasePlugin;
|
||||
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
|
||||
import org.eclipse.rse.services.dstore.files.DStoreHostFile;
|
||||
import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile;
|
||||
import org.eclipse.rse.subsystems.files.core.servicesubsystem.AbstractRemoteFile;
|
||||
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
|
|
|
@ -23,8 +23,8 @@ import java.util.List;
|
|||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.rse.connectorservice.dstore.DStoreConnectorService;
|
||||
import org.eclipse.rse.core.subsystems.SubSystem;
|
||||
import org.eclipse.rse.services.dstore.files.DStoreHostFile;
|
||||
import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile;
|
||||
import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile;
|
||||
import org.eclipse.rse.internal.services.dstore.files.DStoreVirtualHostFile;
|
||||
import org.eclipse.rse.services.files.IHostFile;
|
||||
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
|
||||
|
|
|
@ -22,8 +22,8 @@ import java.util.List;
|
|||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.dstore.extra.DomainEvent;
|
||||
import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
|
||||
import org.eclipse.rse.internal.services.dstore.search.DStoreSearchResultConfiguration;
|
||||
import org.eclipse.rse.services.clientserver.SystemSearchString;
|
||||
import org.eclipse.rse.services.dstore.search.DStoreSearchResultConfiguration;
|
||||
import org.eclipse.rse.services.search.IHostSearchResult;
|
||||
import org.eclipse.rse.services.search.IHostSearchResultSet;
|
||||
import org.eclipse.rse.services.search.ISearchService;
|
||||
|
|
|
@ -22,8 +22,8 @@ import org.eclipse.dstore.core.model.DataElement;
|
|||
import org.eclipse.dstore.core.model.DataStore;
|
||||
import org.eclipse.rse.core.SystemBasePlugin;
|
||||
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
|
||||
import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.AbstractJavaLanguageUtility;
|
||||
import org.eclipse.rse.services.dstore.files.DStoreHostFile;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
package org.eclipse.rse.internal.subsystems.files.dstore;
|
||||
|
||||
import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile;
|
||||
import org.eclipse.rse.internal.services.dstore.files.DStoreVirtualHostFile;
|
||||
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext;
|
||||
|
|
|
@ -34,9 +34,9 @@ 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.dstore.universal.miners.IUniversalDataStoreConstants;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.model.ISystemResourceChangeEvents;
|
||||
import org.eclipse.rse.model.SystemRegistry;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
|
||||
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
|
|
|
@ -22,13 +22,13 @@ import org.eclipse.rse.connectorservice.dstore.DStoreConnectorServiceManager;
|
|||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.core.subsystems.IConnectorService;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.internal.services.dstore.files.DStoreFileService;
|
||||
import org.eclipse.rse.internal.services.dstore.search.DStoreSearchService;
|
||||
import org.eclipse.rse.internal.subsystems.files.dstore.DStoreFileAdapter;
|
||||
import org.eclipse.rse.internal.subsystems.files.dstore.DStoreFileSubSystemSearchResultConfiguration;
|
||||
import org.eclipse.rse.internal.subsystems.files.dstore.DStoreLanguageUtilityFactory;
|
||||
import org.eclipse.rse.services.clientserver.SystemSearchString;
|
||||
import org.eclipse.rse.services.dstore.IDStoreService;
|
||||
import org.eclipse.rse.services.dstore.files.DStoreFileService;
|
||||
import org.eclipse.rse.services.dstore.search.DStoreSearchService;
|
||||
import org.eclipse.rse.services.files.IFileService;
|
||||
import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
|
||||
import org.eclipse.rse.services.search.IHostSearchResultSet;
|
||||
|
|
|
@ -23,7 +23,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
|
|||
import org.eclipse.rse.core.filters.ISystemFilter;
|
||||
import org.eclipse.rse.core.filters.ISystemFilterPool;
|
||||
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
|
||||
|
||||
public class DStoreWindowsFileSubSystemConfiguration extends DStoreFileSubSystemConfiguration
|
||||
|
|
|
@ -29,6 +29,7 @@ import org.eclipse.rse.internal.connectorservice.local.LocalConnectorServiceMana
|
|||
import org.eclipse.rse.internal.services.local.ILocalService;
|
||||
import org.eclipse.rse.internal.services.local.files.LocalFileService;
|
||||
import org.eclipse.rse.internal.services.local.search.LocalSearchService;
|
||||
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.internal.subsystems.files.local.LocalLanguageUtilityFactory;
|
||||
import org.eclipse.rse.internal.subsystems.files.local.LocalSearchResultConfiguration;
|
||||
import org.eclipse.rse.internal.subsystems.files.local.model.LocalFileAdapter;
|
||||
|
@ -38,7 +39,6 @@ import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
|
|||
import org.eclipse.rse.services.search.IHostSearchResultSet;
|
||||
import org.eclipse.rse.services.search.ISearchService;
|
||||
import org.eclipse.rse.subsystems.files.core.ILanguageUtilityFactory;
|
||||
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
|
||||
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
|
||||
import org.eclipse.rse.subsystems.files.core.model.SystemFileTransferModeRegistry;
|
||||
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
|
||||
|
|
|
@ -5,7 +5,9 @@ Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.core;singleton:=true
|
|||
Bundle-Version: 1.0.100.qualifier
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
Export-Package: org.eclipse.rse.subsystems.processes.core,
|
||||
Export-Package:
|
||||
org.eclipse.rse.internal.subsystems.processes.core;x-internal:=true,
|
||||
org.eclipse.rse.internal.subsystems.processes.core.subsystem;x-internal:=true,
|
||||
org.eclipse.rse.subsystems.processes.core.subsystem,
|
||||
org.eclipse.rse.subsystems.processes.core.subsystem.impl,
|
||||
org.eclipse.rse.subsystems.processes.servicesubsystem
|
||||
|
@ -16,6 +18,6 @@ Require-Bundle: org.eclipse.rse.services,
|
|||
org.eclipse.ui,
|
||||
org.eclipse.rse.core,
|
||||
org.eclipse.rse.ui
|
||||
Bundle-Activator: org.eclipse.rse.subsystems.processes.core.Activator
|
||||
Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.core.Activator
|
||||
Eclipse-LazyStart: true
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.subsystems.processes.core;
|
||||
package org.eclipse.rse.internal.subsystems.processes.core;
|
||||
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
import org.eclipse.ui.plugin.AbstractUIPlugin;
|
|
@ -14,14 +14,14 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.subsystems.processes.core.subsystem;
|
||||
package org.eclipse.rse.internal.subsystems.processes.core.subsystem;
|
||||
|
||||
import org.eclipse.osgi.util.NLS;
|
||||
|
||||
|
||||
public class SystemProcessesCoreResources extends NLS
|
||||
{
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.subsystems.processes.core.subsystem.SystemProcessesCoreResources"; //$NON-NLS-1$
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.internal.subsystems.processes.core.subsystem.SystemProcessesCoreResources"; //$NON-NLS-1$
|
||||
|
||||
// PROCESS PROPERTIES
|
||||
public static String RESID_PROPERTY_PROCESS_DEFAULTFILTER_LABEL;
|
|
@ -23,9 +23,9 @@ import org.eclipse.rse.core.filters.ISystemFilter;
|
|||
import org.eclipse.rse.core.filters.ISystemFilterPool;
|
||||
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
|
||||
import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
|
||||
import org.eclipse.rse.internal.subsystems.processes.core.subsystem.SystemProcessesCoreResources;
|
||||
import org.eclipse.rse.services.clientserver.processes.HostProcessFilterImpl;
|
||||
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration;
|
||||
import org.eclipse.rse.subsystems.processes.core.subsystem.SystemProcessesCoreResources;
|
||||
import org.eclipse.rse.ui.validators.ISystemValidator;
|
||||
import org.eclipse.rse.ui.validators.ValidatorServerPortInput;
|
||||
|
||||
|
|
|
@ -19,8 +19,8 @@ package org.eclipse.rse.internal.subsystems.processes.dstore;
|
|||
import java.util.ArrayList;
|
||||
|
||||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.rse.internal.services.dstore.processes.DStoreHostProcess;
|
||||
import org.eclipse.rse.services.clientserver.processes.IHostProcess;
|
||||
import org.eclipse.rse.services.dstore.processes.DStoreHostProcess;
|
||||
import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter;
|
||||
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess;
|
||||
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessContext;
|
||||
|
|
|
@ -21,9 +21,9 @@ import org.eclipse.rse.connectorservice.dstore.DStoreConnectorServiceManager;
|
|||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.core.subsystems.IConnectorService;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.internal.services.dstore.processes.DStoreProcessService;
|
||||
import org.eclipse.rse.internal.subsystems.processes.dstore.DStoreProcessAdapter;
|
||||
import org.eclipse.rse.services.dstore.IDStoreService;
|
||||
import org.eclipse.rse.services.dstore.processes.DStoreProcessService;
|
||||
import org.eclipse.rse.services.processes.IProcessService;
|
||||
import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter;
|
||||
import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem;
|
||||
|
|
|
@ -18,9 +18,9 @@ package org.eclipse.rse.internal.subsystems.shells.dstore;
|
|||
|
||||
import org.eclipse.dstore.core.model.DataElement;
|
||||
import org.eclipse.rse.internal.services.dstore.shell.DStoreShellOutputReader;
|
||||
import org.eclipse.rse.internal.services.dstore.shells.DStoreHostOutput;
|
||||
import org.eclipse.rse.internal.services.dstore.shells.DStoreHostShell;
|
||||
import org.eclipse.rse.internal.subsystems.shells.servicesubsystem.OutputRefreshJob;
|
||||
import org.eclipse.rse.services.dstore.shells.DStoreHostOutput;
|
||||
import org.eclipse.rse.services.dstore.shells.DStoreHostShell;
|
||||
import org.eclipse.rse.services.shells.IHostOutput;
|
||||
import org.eclipse.rse.services.shells.IHostShell;
|
||||
import org.eclipse.rse.services.shells.IHostShellChangeEvent;
|
||||
|
|
|
@ -22,9 +22,9 @@ import org.eclipse.rse.connectorservice.dstore.DStoreConnectorServiceManager;
|
|||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.core.subsystems.IConnectorService;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.internal.services.dstore.shells.DStoreShellService;
|
||||
import org.eclipse.rse.internal.subsystems.shells.dstore.DStoreServiceCommandShell;
|
||||
import org.eclipse.rse.services.dstore.IDStoreService;
|
||||
import org.eclipse.rse.services.dstore.shells.DStoreShellService;
|
||||
import org.eclipse.rse.services.shells.IHostShell;
|
||||
import org.eclipse.rse.services.shells.IShellService;
|
||||
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
|
||||
|
|
|
@ -30,7 +30,7 @@ import org.eclipse.rse.core.model.IHost;
|
|||
import org.eclipse.rse.core.model.ISystemHostPool;
|
||||
import org.eclipse.rse.core.model.ISystemProfile;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.internal.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.ui.RSESystemTypeAdapter;
|
||||
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@ import org.eclipse.rse.core.model.ISystemProfile;
|
|||
import org.eclipse.rse.core.model.ISystemProfileManager;
|
||||
import org.eclipse.rse.core.model.ISystemRegistry;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
|
||||
import org.eclipse.rse.internal.core.model.RSEModelResources;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
|
||||
/**
|
||||
|
|
|
@ -44,6 +44,7 @@ import org.eclipse.rse.core.filters.ISystemFilterReference;
|
|||
import org.eclipse.rse.core.filters.ISystemFilterString;
|
||||
import org.eclipse.rse.core.model.IHost;
|
||||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.IRSECallback;
|
||||
import org.eclipse.rse.core.model.ISystemModelChangeEvents;
|
||||
import org.eclipse.rse.core.model.ISystemProfile;
|
||||
import org.eclipse.rse.core.model.ISystemRegistry;
|
||||
|
@ -1569,10 +1570,13 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
|||
public class ConnectJob extends SubSystemOperationJob
|
||||
{
|
||||
private SubSystem _ss;
|
||||
public ConnectJob(SubSystem ss)
|
||||
private IRSECallback _callback;
|
||||
|
||||
public ConnectJob(SubSystem ss, IRSECallback callback)
|
||||
{
|
||||
super(GenericMessages.RSESubSystemOperation_Connect_message);
|
||||
_ss = ss;
|
||||
_callback = callback;
|
||||
}
|
||||
|
||||
public void performOperation(IProgressMonitor mon) throws InterruptedException, Exception
|
||||
|
@ -1588,6 +1592,11 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
|||
|
||||
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
|
||||
registry.connectedStatusChange(_ss, true, false);
|
||||
|
||||
if (_callback != null)
|
||||
{
|
||||
_callback.operationComplete(this.getName(), _ss, mon);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2357,6 +2366,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Required for Bug 176603
|
||||
*/
|
||||
|
@ -2400,6 +2411,17 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public void connect(IRSECallback callback) throws Exception
|
||||
{
|
||||
connect(false, callback);
|
||||
}
|
||||
|
||||
public void connect(boolean forcePrompt) throws Exception
|
||||
{
|
||||
connect(forcePrompt, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to the remote system, optionally forcing a signon prompt even if the password
|
||||
* is cached in memory or on disk.
|
||||
|
@ -2411,7 +2433,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
|||
* @param forcePrompt Forces the signon prompt to be displayed even if a valid password in cached in memory
|
||||
* or saved on disk.
|
||||
*/
|
||||
public void connect(boolean forcePrompt) throws Exception {
|
||||
public void connect(boolean forcePrompt, IRSECallback callback) throws Exception {
|
||||
// yantzi: artemis60, (defect 53082) check that the connection has not been deleted before continuing,
|
||||
// this is a defenisve measure to protect against code that stores a handle to subsystems but does
|
||||
// not do this check
|
||||
|
@ -2438,7 +2460,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
|||
//dwd ((ProgressMonitorDialog) runnableContext).setCancelable(true);
|
||||
//dwd }
|
||||
getConnectorService().acquireCredentials(forcePrompt); // prompt for userid and password
|
||||
ConnectJob job = new ConnectJob(this);
|
||||
ConnectJob job = new ConnectJob(this, callback);
|
||||
scheduleJob(job, null);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue