mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

[178599] more refactorings

Browse source
This commit is contained in:
David McKnight 2007-03-28 18:19:48 +00:00
parent 5f85dc9a29
commit 58f046c8b2
50 changed files with 65 additions and 1212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemotePath.java → rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/RemotePath.java
View file

@ -15,7 +15,7 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.core.model;
package org.eclipse.rse.internal.subsystems.files.core.model;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.IHost;
@ -23,6 +23,8 @@ import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.subsystems.files.core.model.IRemotePath;
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;
import org.eclipse.rse.ui.RSEUIPlugin;

3
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemotePathUtil.java → rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/RemotePathUtil.java
View file

@ -15,10 +15,11 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.core.model;
package org.eclipse.rse.internal.subsystems.files.core.model;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.rse.subsystems.files.core.model.IRemotePath;
/**
* Singleton utility class for remote paths.

2
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
View file

@ -1766,6 +1766,6 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
* @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem#getRemoteEncoding()
*/
public String getRemoteEncoding() {
return System.getProperty("file.encoding");
return System.getProperty("file.encoding"); //$NON-NLS-1$
}
}

5
rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.subsystems.files.dstore;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.rse.subsystems.files.dstore.Activator
Bundle-Activator: org.eclipse.rse.internal.subsystems.files.dstore.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.rse.ui
Eclipse-LazyStart: true
Export-Package: org.eclipse.rse.subsystems.files.dstore,
org.eclipse.rse.subsystems.files.dstore.model,
org.eclipse.rse.subsystems.files.dstore.subsystem
org.eclipse.rse.subsystems.files.dstore
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4

4
rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml
View file

@ -27,7 +27,7 @@ Contributors:
iconlive="icons/full/obj16/systemfileslive_obj.gif"
icon="icons/full/obj16/systemfiles_obj.gif"
category="files"
class="org.eclipse.rse.subsystems.files.dstore.subsystem.DStoreFileSubSystemConfiguration"
class="org.eclipse.rse.subsystems.files.dstore.DStoreFileSubSystemConfiguration"
vendor="%providerName"
priority="100"
id="dstore.files">
@ -40,7 +40,7 @@ Contributors:
iconlive="icons/full/obj16/systemfileslive_obj.gif"
icon="icons/full/obj16/systemfiles_obj.gif"
category="files"
class="org.eclipse.rse.subsystems.files.dstore.subsystem.DStoreWindowsFileSubSystemConfiguration"
class="org.eclipse.rse.subsystems.files.dstore.DStoreWindowsFileSubSystemConfiguration"
vendor="%providerName"
priority="100"
id="dstore.windows.files">

2
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/Activator.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/Activator.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.files.dstore;
package org.eclipse.rse.internal.subsystems.files.dstore;
import org.eclipse.rse.core.SystemBasePlugin;
import org.osgi.framework.BundleContext;

2
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreFile.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFile.java
View file

@ -15,7 +15,7 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.model;
package org.eclipse.rse.internal.subsystems.files.dstore;
import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore;

3
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreFileAdapter.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileAdapter.java
View file

@ -15,7 +15,7 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.model;
package org.eclipse.rse.internal.subsystems.files.dstore;
import java.util.ArrayList;
import java.util.List;
@ -31,7 +31,6 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst
import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext;
import org.eclipse.rse.subsystems.files.dstore.subsystem.RemoteFilePropertyChangeListener;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.widgets.Shell;

3
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java
View file

@ -15,7 +15,7 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.subsystem;
package org.eclipse.rse.internal.subsystems.files.dstore;
import java.util.List;
@ -32,7 +32,6 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.OutputRefresh;
import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteSearchResultsContentsType;
import org.eclipse.rse.subsystems.files.dstore.model.DStoreSearchResult;
import org.eclipse.swt.widgets.Display;
public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchResultConfiguration

3
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreJavaLanguageUtility.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreJavaLanguageUtility.java
View file

@ -15,7 +15,7 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.subsystem;
package org.eclipse.rse.internal.subsystems.files.dstore;
import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement;
@ -26,7 +26,6 @@ import org.eclipse.rse.internal.subsystems.files.core.AbstractJavaLanguageUtilit
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;
import org.eclipse.rse.subsystems.files.dstore.model.DStoreFile;
/**
* This class is the Java language utility for universal.

2
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreLanguageUtilityFactory.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreLanguageUtilityFactory.java
View file

@ -15,7 +15,7 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.subsystem;
package org.eclipse.rse.internal.subsystems.files.dstore;
import java.util.HashMap;
import java.util.Map;

2
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreSearchResult.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreSearchResult.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.model;
package org.eclipse.rse.internal.subsystems.files.dstore;

2
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreVirtualFile.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreVirtualFile.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.model;
package org.eclipse.rse.internal.subsystems.files.dstore;
import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;

3
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java
View file

@ -15,7 +15,7 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.subsystem;
package org.eclipse.rse.internal.subsystems.files.dstore;
import java.util.ArrayList;
import java.util.HashMap;
@ -39,7 +39,6 @@ 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.subsystems.files.dstore.model.DStoreFile;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

6
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java
View file

@ -15,13 +15,16 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.subsystem;
package org.eclipse.rse.subsystems.files.dstore;
import org.eclipse.rse.connectorservice.dstore.DStoreConnectorService;
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.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;
@ -36,7 +39,6 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration;
import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.dstore.model.DStoreFileAdapter;
import org.eclipse.rse.ui.RSEUIPlugin;

2
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreWindowsFileSubSystemConfiguration.java → rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java
View file

@ -15,7 +15,7 @@
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.subsystem;
package org.eclipse.rse.subsystems.files.dstore;
import java.util.Vector;

124
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/FileTransferStatusListener.java
View file

@ -1,124 +0,0 @@
/*******************************************************************************
* Copyright (c) 2004, 2007 IBM Corporation and others.
* 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, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.old;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.core.model.DataStoreSchema;
import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.services.clientserver.IServiceConstants;
import org.eclipse.swt.widgets.Shell;
/**
* @author mjberger
*
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
public class FileTransferStatusListener extends StatusChangeListener
{
protected String _remotePath;
protected DataElement _log;
protected DataElement _statusElement;
public FileTransferStatusListener(String remotePath, Shell shell, IProgressMonitor monitor, IConnectorService system, DataStore ds, DataElement uploadLog) throws Exception
{
super(shell, monitor, system);
_remotePath = remotePath.replace('\\', '/');
_log = uploadLog;
if (_log == null)
{
throw new Exception("Could not find log in DataStore."); //$NON-NLS-1$
}
setStatus(findOrCreateUploadStatus(ds));
}
protected DataElement findOrCreateUploadStatus(DataStore ds)
{
DataElement result = ds.find(_log, DE.A_NAME, _remotePath,1);
// first upload, this will always ben null
// but also need to handle case where it's been uploaded before in the sessoin (i.e. for reseting values)
if (result == null)
{
result = _log.getDataStore().createObject(_log, "uploadstatus", _remotePath); //$NON-NLS-1$
result.setAttribute(DE.A_SOURCE, "running"); //$NON-NLS-1$
result.setAttribute(DE.A_VALUE, ""); //$NON-NLS-1$
DataElement cmd = ds.findCommandDescriptor(DataStoreSchema.C_SET);
ds.command(cmd, _log, true);
/*
try
{
StatusMonitorFactory.getInstance().getStatusMonitorFor(system, ds).waitForUpdate(setstatus);
}
catch (Exception e)
{
}
*/
// DKM: no need for this - turns out the problem was that we need to send the LOG not the result -
// since the server needs to know the parent!
//ds.waitUntil(setstatus, "done");
}
else
{
result.setAttribute(DE.A_SOURCE, "running"); //$NON-NLS-1$
result.setAttribute(DE.A_VALUE, ""); //$NON-NLS-1$
}
_statusElement = result;
return result;
}
/* (non-Javadoc)
* @see org.eclipse.rse.subsystems.files.dstore.old.StatusChangeListener#determineStatusDone()
*/
protected boolean determineStatusDone()
{
return getStatus().getAttribute(DE.A_SOURCE).equals(IServiceConstants.SUCCESS) || getStatus().getAttribute(DE.A_SOURCE).equals(IServiceConstants.FAILED);
}
public boolean uploadHasFailed()
{
return getStatus().getAttribute(DE.A_SOURCE).equals(IServiceConstants.FAILED);
}
public String getErrorMessage()
{
return getStatus().getAttribute(DE.A_VALUE);
}
public String getRemotePath()
{
return _remotePath;
}
public void setRemotePath(String remotePath)
{
_remotePath = remotePath;
}
}

397
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/SearchResultsChangeListener.java
View file

@ -1,397 +0,0 @@
/*******************************************************************************
* Copyright (c) 2002, 2007 IBM Corporation and others.
* 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, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.old;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.extra.DomainEvent;
import org.eclipse.dstore.extra.IDomainListener;
import org.eclipse.rse.core.subsystems.CommunicationsEvent;
import org.eclipse.rse.core.subsystems.ICommunicationsListener;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.SystemRegistry;
import org.eclipse.rse.model.SystemResourceChangeEvent;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
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;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteSearchConstants;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileContext;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteSearchResult;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteSearchResultsContentsType;
import org.eclipse.rse.subsystems.files.dstore.model.DStoreFile;
import org.eclipse.rse.subsystems.files.dstore.model.DStoreSearchResult;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
public class SearchResultsChangeListener implements IDomainListener, ICommunicationsListener {
private Shell _shell;
private UniversalSearchResultConfigurationImpl _searchConfig;
private DataElement _status;
private IRemoteFileSubSystem _subsys;
private DataStore _dataStore;
private IRemoteFileContext _defaultContext;
private IRemoteFileContext _currentContext;
//private IRemoteFileFactory _factory;
private long _lastUpdateTime;
private boolean _disconnected = false;
private boolean _cancelled = false;
private static int MAX_RESULTS = 10000;
public SearchResultsChangeListener(Shell shell, UniversalSearchResultConfigurationImpl searchConfig) {
_shell = shell;
_searchConfig = searchConfig;
IRemoteFile rmtFile = (IRemoteFile)_searchConfig.getSearchTarget();
_subsys = rmtFile.getParentRemoteFileSubSystem();
_status = _searchConfig.getStatusObject();
_dataStore = _status.getDataStore();
_dataStore.getDomainNotifier().addDomainListener(this);
_subsys.getConnectorService().addCommunicationsListener(this);
_lastUpdateTime = 0;
//_factory = ((FileServiceSubSystem)_subsys).getRemoteFileFactory();
if (_status.getValue().equals("done")) { //$NON-NLS-1$
setDone();
}
else if (_status.getValue().equals("cancelled")) { //$NON-NLS-1$
_cancelled = true;
setDone();
}
}
public IHostSearchResultConfiguration getSearchResults() {
return _searchConfig;
}
public DataElement getStatus() {
return _status;
}
/**
* @see IDomainListener#listeningTo(DomainEvent)
*/
public boolean listeningTo(DomainEvent event) {
DataElement parent = (DataElement)event.getParent();
if (_status == null) {
return false;
}
else if (_status == parent) {
return true;
}
else if (_status.getParent() == parent)
{
return true;
}
return false;
}
/**
* @see IDomainListener#domainChanged(DomainEvent)
*/
public void domainChanged(DomainEvent event) {
if (!_subsys.isConnected())
{
_disconnected = true;
setDone();
return;
}
if (_status.getValue().equals("done")) { //$NON-NLS-1$
setDone();
}
else if (_status.getValue().equals("cancelled")) { //$NON-NLS-1$
_cancelled = true;
setDone();
}
else {
long currentTime = System.currentTimeMillis();
long deltaTime = currentTime - _lastUpdateTime;
// update frequency is inversely proportional to the number of search results
if (deltaTime > _searchConfig.getResultsSize() && _searchConfig.getResultsSize() < MAX_RESULTS) {
_lastUpdateTime = currentTime;
handleSearchResults();
}
}
}
private void handleSearchResults() {
SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
// append new results to existing results
List results = _status.getNestedData();
if (results != null)
{
int totalSize = results.size();
int currentSize = _searchConfig.getResultsSize();
for (int loop = currentSize; loop < totalSize && loop < MAX_RESULTS; loop++) {
DataElement result = (DataElement)results.get(loop);
if (_defaultContext == null) {
_defaultContext = new RemoteFileContext(_subsys, null, null);
_currentContext = _defaultContext;
}
if (result.getName().length() > 0) {
// for defect 47414, this code changes the context used for creating IRemoteFiles
char slash = '/';
if (_subsys.getHost().getSystemType().equals("Windows")) { //$NON-NLS-1$
slash = '\\';
}
String parentPath = result.getValue();
// check if parent is an archive
boolean isParentArchive = ArchiveHandlerManager.getInstance().isRegisteredArchive(parentPath);
int lastSlash = parentPath.lastIndexOf(slash);
if (lastSlash > 0) {
String parentName = parentPath.substring(lastSlash + 1, parentPath.length());
String parentRoot = parentPath.substring(0, lastSlash);
if ((_currentContext.getParentRemoteFile() == null) || !_currentContext.getParentRemoteFile().getAbsolutePath().equals(parentPath)) {
// change the current context
DataElement parentElement = null;
if (ArchiveHandlerManager.isVirtual(parentRoot)) {
parentElement = result.getDataStore().createObject(null, IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR, parentName);
}
else {
if (!isParentArchive) {
parentElement = result.getDataStore().createObject(null, IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR, parentName);
}
else {
parentElement = result.getDataStore().createObject(null, IUniversalDataStoreConstants.UNIVERSAL_ARCHIVE_FILE_DESCRIPTOR, parentName);
}
}
parentElement.setAttribute(DE.A_VALUE, parentRoot);
try
{
IRemoteFile remoteFileParent = _subsys.getRemoteFileObject(parentPath);
//_factory.createRemoteFile(_defaultContext, parentElement, false, true);
// DKM - need to see why we're not checking the cache first...
//((RemoteFileSubSystemImpl)_subsys).cacheRemoteFile(remoteFileParent, parentPath);
_currentContext = new RemoteFileContext(_subsys, remoteFileParent, null);
}
catch (Exception e)
{
}
}
}
else {
_currentContext = _defaultContext;
}
if (!_subsys.isConnected())
{
_disconnected = true;
setDone();
return;
}
IRemoteFile remoteFile = null;
String remotePath = parentPath + slash + result.getName();
if (_subsys instanceof FileServiceSubSystem)
{
remoteFile = ((FileServiceSubSystem)_subsys).getCachedRemoteFile(remotePath);
}
if (remoteFile == null)
{
try
{
remoteFile = _subsys.getRemoteFileObject(remotePath);
//_factory.createRemoteFile(_currentContext, result, false, true);
((RemoteFileSubSystem)_subsys).cacheRemoteFile(remoteFile, remotePath);
((RemoteFile)remoteFile).setParentRemoteFile(_currentContext.getParentRemoteFile());
}
catch (Exception e)
{
}
}
if (remoteFile != null) {
if (result.getNestedSize() > 0) {
boolean isWindows = _subsys.getHost().getSystemType().equals("Windows"); //$NON-NLS-1$
char separator = isWindows ? '\\' : '/';
List contents = new ArrayList();
// go through search results
for (int i = 0; i < result.getNestedSize(); i++) {
DataElement resultElement = result.get(i);
// search result object
DStoreSearchResult searchResult = new DStoreSearchResult(_searchConfig, remoteFile, resultElement, _searchConfig.getSearchString());
// set the name which should be the line
searchResult.setText(resultElement.getName());
String source = resultElement.getSource().replace('\\', separator).replace('/', separator);
String lineNumStr = null;
int colonIndex = source.indexOf(":"); //$NON-NLS-1$
if (colonIndex > 2)
{
lineNumStr = source.substring(colonIndex);
}
int lineNum = 0;
if (lineNumStr != null && lineNumStr.length() > 0) {
Integer lineLocation = new Integer(lineNumStr);
lineNum = lineLocation.intValue();
}
// set the line number
searchResult.setLine(lineNum);
// set the index
searchResult.setIndex(i);
// add the search result
contents.add(searchResult);
}
// set search results to contents of remote file
((DStoreFile)remoteFile).setContents(RemoteSearchResultsContentsType.getInstance(), _searchConfig.getSearchString().toString(), contents.toArray());
}
// add remote file to search result set
_searchConfig.addResult(remoteFile);
}
}
}
if (totalSize >= MAX_RESULTS) {
RemoteSearchResult warning = new RemoteSearchResult(_searchConfig, _searchConfig, _searchConfig.getSearchString());
warning.setLine(0);
warning.setText(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELLED).getLevelOneText());
_searchConfig.addResult(warning);
}
registry.fireEvent(new SystemResourceChangeEvent(_searchConfig, ISystemResourceChangeEvents.EVENT_REFRESH, null));
}
}
/**
* Indicates search is done.
*/
public void setDone() {
_status.getDataStore().getDomainNotifier().removeDomainListener(this);
_subsys.getConnectorService().removeCommunicationsListener(this);
if (!_disconnected) {
handleSearchResults();
if (_cancelled) {
_searchConfig.setStatus(IRemoteSearchConstants.CANCELLED);
}
else {
_searchConfig.setStatus(IRemoteSearchConstants.FINISHED);
}
}
else {
_searchConfig.setStatusObject(null);
_searchConfig.setStatus(IRemoteSearchConstants.DISCONNECTED);
}
SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
registry.fireEvent(new SystemResourceChangeEvent(_searchConfig, ISystemResourceChangeEvents.EVENT_SEARCH_FINISHED, null));
}
/**
* @see IDomainListener#getShell()
*/
public Shell getShell() {
return _shell;
}
/**
*
*/
public boolean wasCancelled() {
return _cancelled;
}
/**
* @see ICommunicationsListener#communicationsStateChange(CommunicationsEvent)
*/
public void communicationsStateChange(CommunicationsEvent e) {
int connState = e.getState();
if (connState == CommunicationsEvent.CONNECTION_ERROR || connState == CommunicationsEvent.AFTER_DISCONNECT) {
_disconnected = true;
Display.getDefault().asyncExec(new Runnable() {
public void run() {
setDone();
}
});
}
}
/**
* @see ICommunicationsListener#isPassiveCommunicationsListener()
*/
public boolean isPassiveCommunicationsListener() {
return true;
}
}

479
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/StatusChangeListener.java
View file

@ -1,479 +0,0 @@
/*******************************************************************************
* Copyright (c) 2002, 2007 IBM Corporation and others.
* 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, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
*******************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.old;
import java.util.List;
import java.util.Vector;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.extra.DomainEvent;
import org.eclipse.dstore.extra.IDomainListener;
import org.eclipse.rse.connectorservice.dstore.util.ICommunicationsDiagnostic;
import org.eclipse.rse.connectorservice.dstore.util.ICommunicationsDiagnosticFactory;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.CommunicationsEvent;
import org.eclipse.rse.core.subsystems.ICommunicationsListener;
import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
/*
* Utility class for determining when a DataStore command is complete via the status.
*/
public class StatusChangeListener implements IDomainListener, ICommunicationsListener
{
protected DataElement target;
protected Shell shell;
protected IProgressMonitor monitor;
protected IConnectorService system;
protected boolean _networkDown = false;
protected boolean done = false;
protected boolean cancelled = false;
protected Vector historyOfTargets;
protected static class FindShell implements Runnable {
private Shell shell;
/**
* @see Runnable#run()
*/
public void run() {
try {
Shell[] shells = Display.getCurrent().getShells();
for (int loop = 0; loop < shells.length && shell == null; loop++) {
if (shells[loop].isEnabled()) {
shell = shells[loop];
}
}
} catch (Exception e) {
SystemBasePlugin.logError("StatusChangeListener.FindShell exception: ", e); //$NON-NLS-1$
}
}
}
/**
* Construct a StatusChangeListener
*
* @param shell A valid Shell object
*
* @param monitor A progress monitor if you want this object to check if
* the user presses cancel while waiting for the status object
* to be updated
*
* @param target The status DataElement for which you wish to wait for an update
*/
public StatusChangeListener(Shell shell, IProgressMonitor monitor, IConnectorService system, DataElement target) {
this.shell = shell;
this.monitor = monitor;
this.target = target;
this.system = system;
system.addCommunicationsListener(this);
historyOfTargets = new Vector();
}
// public StatusChangeListener(Shell shell, IProgressMonitor monitor, DataElement target) {
// this.shell = shell;
// this.monitor = monitor;
// this.target = target;
// historyOfTargets = new Vector();
// }
public StatusChangeListener(Shell shell, IProgressMonitor monitor, IConnectorService system) {
this(shell, monitor, system, null);
}
public StatusChangeListener(IConnectorService system) {
this (null, null, system, null);
}
// public StatusChangeListener(Shell shell, DataElement target) {
// this(shell, null, target);
// }
/**
*
*/
public void setStatus(DataElement p_target)
{
this.target = p_target;
for (int i = 0; i < historyOfTargets.size(); i++)
{
if (target == historyOfTargets.elementAt(i))
{
setDone( true );
historyOfTargets.clear();
return;
}
}
historyOfTargets.clear();
}
/**
*
*/
public DataElement getStatus()
{
return target;
}
/**
* @see IDomainListener#listeningTo(DomainEvent)
*/
public boolean listeningTo(DomainEvent event) {
if (target == null)
{
return true;
}
if (target == event.getParent()) {
return true;
}
return false;
}
/**
* @see IDomainListener#domainChanged(DomainEvent)
*/
public void domainChanged(DomainEvent event) {
if (target == null)
{
if (historyOfTargets.size() < 1000)
{
historyOfTargets.addElement(event.getParent());
}
}
if (target == event.getParent())
{
boolean isStatusDone = determineStatusDone();
if (isStatusDone)
{
setDone( true );
}
}
}
/**
* setDone(boolean)
*/
public void setDone(boolean done)
{
this.done = done;
}
public Shell getShell() {
// dy: DomainNotifier (which calls this method) requires the shell not be disposed
//if (shell == null) {
if (shell == null || shell.isDisposed())
{
FindShell findShell = new FindShell();
Display.getDefault().syncExec(findShell);
shell = findShell.shell;
}
return shell;
}
/**
*
*/
public boolean wasCancelled() {
return cancelled;
}
/**
* @see ICommunicationsListener#communicationsStateChange(CommunicationsEvent)
*/
public void communicationsStateChange(CommunicationsEvent e) {
if (e.getState() == CommunicationsEvent.CONNECTION_ERROR) {
_networkDown = true;
}
}
/**
* Wait for the the status DataElement to be refreshed
*
* @param
* ICommunicationsDiagnosticFactory factory : for creating system specific diagnostic class instance
* Int wait : threshold for starting diagnostic. Default is 60 seconds; a zero means to use the default.
* -1 means to force a timeout; mainly for testing purpose.
*
* @return The status DataElement after it has been updated, or the user
* has pressed cancel
*
* @throws InterruptedException if the thread was interrupted.
*/
public DataElement waitForUpdate() throws InterruptedException
{
return waitForUpdate(null, 0); //No diagnostic
}
public DataElement waitForUpdate(ICommunicationsDiagnosticFactory factory) throws InterruptedException
{
return waitForUpdate(factory, 0); //Use the default wait threshold
}
public DataElement waitForUpdate(ICommunicationsDiagnosticFactory factory, int wait) throws InterruptedException
{
boolean statusDone = determineStatusDone();
if (statusDone)
{
setDone(true);
}
else
{
Display display = Display.getCurrent();
// Prevent infinite looping by introducing a threshold for wait
int WaitThreshold = 600; //default. sleep(100ms) for 600 times
if ( wait > 0 )
WaitThreshold = wait*10; // 1 second means 10 sleep(100ms)
else if ( wait == -1 ) // force a diagnostic
WaitThreshold = -1;
ICommunicationsDiagnostic diagnostic = null;
boolean diagnosticStarted = false; //Flag to indicate diagnostic started
if (display != null) {
if (shell == null || shell.isDisposed()) {
shell = Display.getDefault().getActiveShell();
}
// Current thread is UI thread
while (!done && !cancelled) {
while (display.readAndDispatch()) {
//Process everything on event queue
}
if ((monitor != null) && (monitor.isCanceled())) {
cancelled = true;
target.getDataStore().getDomainNotifier().removeDomainListener(this);
system.removeCommunicationsListener(this);
throw new InterruptedException();
}
statusDone = determineStatusDone();
if (statusDone)
{
setDone(true);
}
else
{
Thread.sleep(100);
if (factory != null) {
if (WaitThreshold > 0) // update timer count if
// threshold not reached
--WaitThreshold; // decrement the timer count
//Check if timeout threshold reached @01
if ((WaitThreshold < 1) && !diagnosticStarted && (diagnostic == null))
{
diagnosticStarted = true;
diagnostic = whatIsGoingOn(factory, false);
}
else
{
if (diagnosticStarted && (diagnostic != null))
{
if (ICommunicationsDiagnostic.CANCEL_WAIT_REQUESTED == diagnostic.diagnosticStatus()) {
cancelled = true;
SystemBasePlugin.logError("StatusChangeListener.waitForUpdate cancelled by user."); //$NON-NLS-1$
}
}
}
}
else if (_networkDown)
{
target.getDataStore().getDomainNotifier().removeDomainListener(this);
system.removeCommunicationsListener(this);
throw new InterruptedException();
}
}
}
} else {
// Current thread is not UI thread
while (!done && !cancelled)
{
if ((monitor != null) && (monitor.isCanceled()))
{
cancelled = true;
target.getDataStore().getDomainNotifier().removeDomainListener(this);
system.removeCommunicationsListener(this);
throw new InterruptedException();
}
statusDone = determineStatusDone();
if (statusDone)
{
setDone(true);
}
else {
Thread.sleep(100);
if (factory != null) {
if (WaitThreshold > 0) // update timer count if
// threshold not reached
--WaitThreshold; // decrement the timer count
//Check if timeout threshold reached @01
if ((WaitThreshold < 1) && !diagnosticStarted && (diagnostic == null))
{
diagnosticStarted = true;
diagnostic = whatIsGoingOn(factory, false);
}
else
{
if (diagnosticStarted && (diagnostic != null))
{
if (ICommunicationsDiagnostic.CANCEL_WAIT_REQUESTED == diagnostic.diagnosticStatus())
{
cancelled = true;
SystemBasePlugin.logError("StatusChangeListener.waitForUpdate cancelled by user."); //$NON-NLS-1$
}
}
}
}
else if (_networkDown)
{
target.getDataStore().getDomainNotifier().removeDomainListener(this);
system.removeCommunicationsListener(this);
throw new InterruptedException();
}
}
}
}
}
// Reset done so we can detect the next event if waitForUpdate
// is called again
done = false;
system.removeCommunicationsListener(this);
return target;
}
/**
* Determines whether the status is done.
* @return <code>true</code> if status done, <code>false</code> otherwise.
*/
protected boolean determineStatusDone() {
return getStatus().getAttribute(DE.A_VALUE).equals("done") || getStatus().getAttribute(DE.A_NAME).equals("done"); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
* @see org.eclipse.rse.core.subsystems.ICommunicationsListener#isPassiveCommunicationsListener()
*/
public boolean isPassiveCommunicationsListener() {
return false;
}
/**
* Start diagnostic
*
* @param Class diagnostic is the an implementation of ICommunicationsDiagnostic
* @param quiet is the flag to indicate if user should be prompted
* - true for no prompt
* @return ICommunciationsDiagnostic class instance
*/
public ICommunicationsDiagnostic whatIsGoingOn(ICommunicationsDiagnosticFactory factory, boolean quiet ) throws InterruptedException //@01
{
if (target == null)
return null;
ICommunicationsDiagnostic d = null;
DataStore ds = null;
try {
String name = getStatus().getName(); /* Get the current element status name: started/working/done */
/* Log the current status */
SystemBasePlugin.logError("StatusChangeListener."+name+": " + "Communications Diagnostic started"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
SystemBasePlugin.logError("StatusChangeListener."+name + //$NON-NLS-1$
": done = " + done + //$NON-NLS-1$
"; cancelled = " + cancelled + //$NON-NLS-1$
"; _networkDown = " + _networkDown ); //$NON-NLS-1$
ds = target.getDataStore();
/* Log the status in DataStore */
SystemBasePlugin.logError("StatusChangeListener."+name+"(DataStore): " + " isConnected = " + ds.isConnected() + "; isWaiting = " + ds.isWaiting(target)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
/*Log all nested DataElement's in target's parent*/
List deList = target.getParent().getNestedData();
if (deList != null && !deList.isEmpty() ) {
int num = deList.size();
for ( int i = 0; i < num; i++)
{
DataElement child = (DataElement) deList.get(i);
if (child != null) {
SystemBasePlugin.logError("StatusChangeListener."+name+".child"+i+"(DataElement): " + child.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
DataElement descriptor = child.getDescriptor();
if (descriptor != null)
SystemBasePlugin.logError("StatusChangeListener."+name+".child"+i+"(Descriptor): " + descriptor.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
}
//Spawn off a diagnostic to check more stuff
if (factory != null) {
d = factory.createInstance();
//Initialize the diagnostic instance
//Set diagnostic id(name), server name(ds.getName()), this connection(system)
d.setUp(name, quiet, ds.getName(),system, null ,null, null);
new Thread(d).start();
}
}
catch (Exception e)
{
SystemBasePlugin.logError("StatusChangeListener.ICommunicationsDiagnostic exception: ", e); //$NON-NLS-1$
}
return d; // return the created diagnostic class instance
}
/**
* Test if the StatusChangeListener returned because the network connection to the
* remote system was broken.
*/
public boolean isNetworkDown() {
return _networkDown;
}
}

58
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/UniversalSearchResultConfigurationFactory.java
View file

@ -1,58 +0,0 @@
/********************************************************************************
* Copyright (c) 2006 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, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.old;
import org.eclipse.rse.services.clientserver.SystemSearchString;
import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
import org.eclipse.rse.services.search.IHostSearchResultConfigurationFactory;
import org.eclipse.rse.services.search.IHostSearchResultSet;
/**
* Singleton class that is a factory for creating search result configurations.
*/
public class UniversalSearchResultConfigurationFactory implements IHostSearchResultConfigurationFactory {
private static UniversalSearchResultConfigurationFactory instance;
/**
* Constructor for creating a search configuration factory.
*/
private UniversalSearchResultConfigurationFactory() {
}
/**
* Gets the singleton instance of the factory.
* @return the singleton instance of the factory.
*/
public static UniversalSearchResultConfigurationFactory getInstance() {
if (instance == null) {
instance = new UniversalSearchResultConfigurationFactory();
}
return instance;
}
/**
* Creates a config and adds it to the result set.
*/
public IHostSearchResultConfiguration createSearchConfiguration(IHostSearchResultSet resultSet, Object searchTarget, SystemSearchString searchString) {
IHostSearchResultConfiguration config = new UniversalSearchResultConfigurationImpl(resultSet, searchTarget, searchString);
resultSet.addSearchConfiguration(config);
return config;
}
}

62
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/UniversalSearchResultConfigurationImpl.java
View file

@ -1,62 +0,0 @@
/********************************************************************************
* Copyright (c) 2006 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, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.files.dstore.old;
import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.rse.services.clientserver.SystemSearchString;
import org.eclipse.rse.services.search.IHostSearchResultSet;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteSearchResultConfiguration;
public class UniversalSearchResultConfigurationImpl extends RemoteSearchResultConfiguration {
protected DataElement statusObject;
/**
* Constructor to create a universal search result configuration.
* @param resultSet the parent result set.
* @param searchObject the search target.
* @param string the search string.
*/
public UniversalSearchResultConfigurationImpl(IHostSearchResultSet resultSet, Object searchObject, SystemSearchString string) {
super(resultSet, searchObject, string);
}
public void setStatusObject(DataElement statusObject) {
this.statusObject = statusObject;
}
public DataElement getStatusObject() {
return statusObject;
}
/**
* @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#cancel()
*/
public void cancel() {
if (getStatus() != RUNNING) {
super.cancel();
return;
}
IRemoteFile remoteFile = (IRemoteFile)getSearchTarget();
IRemoteFileSubSystem subsys = remoteFile.getParentRemoteFileSubSystem();
subsys.cancelSearch(this);
}
}

2
rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.dstore;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.rse.subsystems.processes.dstore.Activator
Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.dstore.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,

2
rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/Activator.java → rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/internal/subsystems/processes/dstore/Activator.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.processes.dstore;
package org.eclipse.rse.internal.subsystems.processes.dstore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.processes.ui.ProcessesPlugin;

2
rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessAdapter.java → rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/internal/subsystems/processes/dstore/DStoreProcessAdapter.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.processes.dstore;
package org.eclipse.rse.internal.subsystems.processes.dstore;
import java.util.ArrayList;

1
rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java
View file

@ -21,6 +21,7 @@ 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.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;

5
rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.dstore;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.rse.subsystems.shells.dstore.Activator
Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.dstore.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@ -19,6 +19,5 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.rse.subsystems.files.core
Eclipse-LazyStart: true
Bundle-Vendor: %providerName
Export-Package: org.eclipse.rse.subsystems.shells.dstore,
org.eclipse.rse.subsystems.shells.dstore.model
Export-Package: org.eclipse.rse.subsystems.shells.dstore
Bundle-RequiredExecutionEnvironment: J2SE-1.4

2
rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/Activator.java → rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/Activator.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.shells.dstore;
package org.eclipse.rse.internal.subsystems.shells.dstore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;

2
rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/model/DStoreServiceCommandShell.java → rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.shells.dstore.model;
package org.eclipse.rse.internal.subsystems.shells.dstore;
import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.rse.internal.services.dstore.shell.DStoreShellOutputReader;

2
rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java
View file

@ -22,6 +22,7 @@ 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.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;
@ -30,7 +31,6 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IServiceCommandShell;
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystemConfiguration;
import org.eclipse.rse.subsystems.shells.dstore.model.DStoreServiceCommandShell;
import org.eclipse.rse.ui.RSEUIPlugin;
/**

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/MassagerAddQuotes.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/MassagerAddQuotes.java
View file

@ -14,7 +14,9 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
import org.eclipse.rse.ui.ISystemMassager;
/**
* This massager will take a string an add quotes to it by

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/MassagerFoldCase.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/MassagerFoldCase.java
View file

@ -14,7 +14,10 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
import org.eclipse.rse.ui.ISystemMassager;
/**
* This massager folds the input text into either uppercase or lowercase,
* depending on the value pass to the constructor or setter.

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/MassagerFoldCaseOutsideQuotes.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/MassagerFoldCaseOutsideQuotes.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
/**
* This massager folds the input text into either uppercase or lowercase,
* but ONLY for those portions of the string that are not inside delimiters.

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/MassagerFoldCaseUnlessQuoted.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/MassagerFoldCaseUnlessQuoted.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
/**
* This massager folds the input text into either uppercase or lowercase,
* but ONLY if the given input is not delimited. The default delimiter checked

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/MassagerRemoveQuotes.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/MassagerRemoveQuotes.java
View file

@ -14,7 +14,9 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
import org.eclipse.rse.ui.ISystemMassager;
/**
* Utility class used by UI widgets to format a srcpf or member Description string.<br>

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEAdapter.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEAdapter.java
View file

@ -13,8 +13,9 @@
* Contributors:
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
import org.eclipse.rse.ui.IRSEAdapter;
import org.eclipse.ui.model.WorkbenchAdapter;
/**

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemProfileForm.java
View file

@ -14,11 +14,14 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.internal.model.SystemProfileManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.validators.ISystemValidator;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemSortableSelection.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemSortableSelection.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
import java.util.Arrays;
import java.util.Iterator;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemTabFolderLayout.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemTabFolderLayout.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
package org.eclipse.rse.internal.ui;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SSLForm.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/widgets/SSLForm.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui.widgets;
package org.eclipse.rse.internal.ui.widgets;
import org.eclipse.rse.ui.SystemBaseForm;
import org.eclipse.rse.ui.SystemResources;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/ServerConnectionSecurityForm.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/widgets/ServerConnectionSecurityForm.java
View file

@ -15,7 +15,7 @@
********************************************************************************/
package org.eclipse.rse.ui.widgets;
package org.eclipse.rse.internal.ui.widgets;
import org.eclipse.rse.ui.SystemBaseForm;

39
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/AbstractElement.java
View file

@ -1,39 +0,0 @@
/********************************************************************************
* Copyright (c) 2002, 2006 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, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.ui;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
/**
* In order to populate the PropertySheet, an object must implement the
* IAdaptable interface. Thus, this is the minimum requirement for any
* object that we wish to represent in a tree or table viewer. We simply
* defer the request for an adapter to the platform, assuming that the
* adapter has been registered with it.
*/
public class AbstractElement implements IAdaptable
{
/**
* @see IAdaptable#getAdapter(Class)
*/
public Object getAdapter(Class adapterType)
{
return Platform.getAdapterManager().getAdapter(this, adapterType);
}
}

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java
View file

@ -34,6 +34,7 @@ import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.internal.ui.RSEAdapter;
import org.eclipse.rse.ui.actions.SystemClearAllPasswordsAction;
import org.eclipse.rse.ui.actions.SystemWorkOfflineAction;
import org.eclipse.rse.ui.wizards.registries.IRSEWizardDescriptor;
@ -156,7 +157,7 @@ public class RSESystemTypeAdapter extends RSEAdapter {
/**
* Returns the description of the system type if the object passed in is of type <code>IRSESystemType</code>.
* Otherwise, returns the value of the parent implementation.
* @see org.eclipse.rse.ui.RSEAdapter#getDescription(java.lang.Object)
* @see org.eclipse.rse.internal.ui.RSEAdapter#getDescription(java.lang.Object)
*/
public String getDescription(Object object) {

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveDownConnectionAction.java
View file

@ -21,11 +21,11 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.ui.SystemSortableSelection;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemSortableSelection;
import org.eclipse.swt.widgets.Shell;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveUpConnectionAction.java
View file

@ -21,11 +21,11 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.ui.SystemSortableSelection;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemSortableSelection;
import org.eclipse.swt.widgets.Shell;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveDownFilterAction.java
View file

@ -22,11 +22,11 @@ import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.filters.ISystemFilterContainer;
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
import org.eclipse.rse.core.filters.ISystemFilterReference;
import org.eclipse.rse.internal.ui.SystemSortableSelection;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemSortableSelection;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.swt.widgets.Shell;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveDownFilterPoolReferenceAction.java
View file

@ -20,11 +20,11 @@ import java.util.Iterator;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
import org.eclipse.rse.internal.ui.SystemSortableSelection;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemSortableSelection;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.swt.widgets.Shell;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveUpFilterAction.java
View file

@ -22,11 +22,11 @@ import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.filters.ISystemFilterContainer;
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
import org.eclipse.rse.core.filters.ISystemFilterReference;
import org.eclipse.rse.internal.ui.SystemSortableSelection;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemSortableSelection;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.swt.widgets.Shell;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveUpFilterPoolReferenceAction.java
View file

@ -20,11 +20,11 @@ import java.util.Iterator;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
import org.eclipse.rse.internal.ui.SystemSortableSelection;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemSortableSelection;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.swt.widgets.Shell;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerConnectionSecurityPropertyPage.java
View file

@ -21,10 +21,10 @@ import org.eclipse.rse.core.comm.SystemKeystoreProviderManager;
import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.internal.ui.widgets.ServerConnectionSecurityForm;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.widgets.ServerConnectionSecurityForm;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java
View file

@ -23,10 +23,10 @@ import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.internal.ui.SystemTabFolderLayout;
import org.eclipse.rse.ui.ISystemConnectionFormCaller;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemPropertyResources;
import org.eclipse.rse.ui.SystemTabFolderLayout;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.messages.ISystemMessageLineTarget;