mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-05 16:15:25 +02:00
Code Issues Wiki Activity

[196624] dstore miner IDs should be String constants rather than dynamic lookup

Browse source
This commit is contained in:
David McKnight 2007-12-03 17:07:22 +00:00
parent 903af81383
commit ec40e043f0
13 changed files with 45 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
View file

@ -19,6 +19,7 @@
* David McKnight (IBM) - [199565] taking out synchronize for internalConnect
* David McKnight (IBM) - [205986] attempt SSL before non-SSL for daemon connect
* David McKnight (IBM) - [186363] get rid of obsolete calls to SubSystem.connect()
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
********************************************************************************/
package org.eclipse.rse.connectorservice.dstore;
@ -63,7 +64,7 @@ import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ServerLaunchType;
import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.internal.connectorservice.dstore.RexecDstoreServer;
import org.eclipse.rse.internal.ui.SystemPropertyResources;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@ -204,7 +205,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
// Check if we have sysInfo cached already
if (sysInfo == null)
{
envMinerData = ds.findMinerInformation(EnvironmentMiner.MINER_ID);
envMinerData = ds.findMinerInformation(IUniversalDataStoreConstants.UNIVERSAL_ENVIRONMENT_MINER_ID);
if (envMinerData != null)
{
sysInfo = ds.find(envMinerData, DE.A_NAME, "systemInfo", 1); //$NON-NLS-1$

4
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java
View file

@ -14,6 +14,7 @@
* Contributors:
* David McKnight (IBM) - [191599] use specified encoding for shell
* David McKnight (IBM) - [202822] canceled output should be created before thread cleanup
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
*******************************************************************************/
package org.eclipse.rse.dstore.universal.miners;
@ -41,7 +42,6 @@ import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.Pattern
*/
public class CommandMiner extends Miner
{
public static final String MINER_ID = CommandMiner.class.getName();//"org.eclipse.rse.dstore.universal.miners.command.CommandMiner";
public class CommandMinerDescriptors
{
@ -121,7 +121,7 @@ public class CommandMiner extends Miner
protected ArrayList getDependencies()
{
ArrayList dependencies = new ArrayList();
dependencies.add(EnvironmentMiner.MINER_ID);
dependencies.add(IUniversalDataStoreConstants.UNIVERSAL_ENVIRONMENT_MINER_ID);
return dependencies;
}

3
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java
View file

@ -13,6 +13,7 @@
*
* Contributors:
* {Name} (company) - description of contribution.
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
*******************************************************************************/
package org.eclipse.rse.dstore.universal.miners;
@ -29,8 +30,6 @@ import org.eclipse.dstore.core.model.DataElement;
public class EnvironmentMiner extends Miner
{
public static final String MINER_ID = EnvironmentMiner.class.getName();//"org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner";
private DataElement _system;

11
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/IUniversalDataStoreConstants.java
View file

@ -12,6 +12,7 @@
*
* Contributors:
* Martin Oberhuber (Wind River) - [183165] Do not implement constant interfaces
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
********************************************************************************/
package org.eclipse.rse.dstore.universal.miners;
@ -23,6 +24,16 @@ public interface IUniversalDataStoreConstants
*/
public static final String UNIVERSAL_FILESYSTEM_MINER = "UniversalFileSystemMiner"; //$NON-NLS-1$
/*
* Miner IDs
*/
public static final String UNIVERSAL_FILESYSTEM_MINER_ID = "org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner"; //$NON-NLS-1$
public static final String UNIVERSAL_COMMAND_MINER_ID = "org.eclipse.rse.dstore.universal.miners.CommandMiner"; //$NON-NLS-1$
public static final String UNIVERSAL_ENVIRONMENT_MINER_ID = "org.eclipse.rse.dstore.universal.miners.EnvironmentMiner"; //$NON-NLS-1$
public static final String UNIVERSAL_PROCESS_MINER_ID = "org.eclipse.rse.dstore.universal.miners.UniversalProcessMiner"; //$NON-NLS-1$
//
// Universal File descriptors for DataStore DataElements
//

18
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java
View file

@ -25,6 +25,7 @@
* Kevin Doyle (IBM) - [191548] Deleting Read-Only directory removes it from view and displays no error
* Xuan Chen (IBM) - [202949] [archives] copy a folder from one connection to an archive file in a different connection does not work
* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
*******************************************************************************/
package org.eclipse.rse.dstore.universal.miners;
@ -63,28 +64,11 @@ import org.eclipse.rse.services.clientserver.archiveutils.VirtualChild;
import org.eclipse.rse.services.clientserver.java.ClassFileUtil;
public class UniversalFileSystemMiner extends Miner {
public static final String MINER_ID = UniversalFileSystemMiner.class.getName();
// private DataElement deUFSfilters;
private DataElement deUFSnode;
// private DataElement deUFStemp;
private DataElement deUFSuploadlog;
// private DataElement dePropertyQuery;
// private DataElement deFileClassificationQuery;
// private DataElement deFolderClassificationQuery;
protected String filterString = "*"; //$NON-NLS-1$
protected ArchiveHandlerManager _archiveHandlerManager;

4
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java
View file

@ -13,6 +13,7 @@
*
* Contributors:
* {Name} (company) - description of contribution.
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
*******************************************************************************/
package org.eclipse.rse.dstore.universal.miners;
@ -45,9 +46,6 @@ import org.eclipse.rse.services.clientserver.processes.handlers.UniversalServerP
*/
public class UniversalProcessMiner extends Miner
{
public static final String MINER_ID = UniversalProcessMiner.class.getName();
private ProcessHandler handler;
private static final String _minerVersion = "7.0.0"; //$NON-NLS-1$

5
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java
View file

@ -14,6 +14,7 @@
* Contributors:
* {Name} (company) - description of contribution.
* David McKnight (IBM) - [202822] updating cleanup
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
*******************************************************************************/
package org.eclipse.rse.internal.dstore.universal.miners.command;
@ -38,7 +39,7 @@ import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.core.model.DataStoreAttributes;
import org.eclipse.rse.dstore.universal.miners.CommandMiner;
import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.ParsedOutput;
import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.Patterns;
@ -648,7 +649,7 @@ public class CommandMinerThread extends MinerThread
private String[] getEnvironment(DataElement theSubject)
{
//Grab the system environment:
DataElement envMiner = _dataStore.findMinerInformation(EnvironmentMiner.MINER_ID);
DataElement envMiner = _dataStore.findMinerInformation(IUniversalDataStoreConstants.UNIVERSAL_ENVIRONMENT_MINER_ID);
DataElement systemEnv = _dataStore.find(envMiner, DE.A_NAME, "System Environment", 1); //$NON-NLS-1$
//Walk up until we find an element with an inhabits relationship.
DataElement theProject = theSubject;

5
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/QueryPathThread.java
View file

@ -13,6 +13,7 @@
*
* Contributors:
* {Name} (company) - description of contribution.
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
*******************************************************************************/
package org.eclipse.rse.internal.dstore.universal.miners.command;
@ -28,7 +29,7 @@ import java.util.StringTokenizer;
import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
/**
* QueryPathThread is used to determine available command completions
@ -54,7 +55,7 @@ public class QueryPathThread extends Thread
public List getPathEnvironment()
{
DataElement envMinerData = _dataStore.findMinerInformation(EnvironmentMiner.MINER_ID);
DataElement envMinerData = _dataStore.findMinerInformation(IUniversalDataStoreConstants.UNIVERSAL_ENVIRONMENT_MINER_ID);
if (envMinerData != null)
{
DataElement systemEnvironment = _dataStore.find(envMinerData, DE.A_NAME, "System Environment", 1); //$NON-NLS-1$

4
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
View file

@ -29,6 +29,7 @@
* David McKnight (IBM) - [210812] for text transfer, need to honour the preference (instead of straight binary)
* David McKnight (IBM) - [209704] [api] Ability to override default encoding conversion needed.
* Kevin Doyle (IBM) - [208778] [efs][api] RSEFileStore#getOutputStream() does not support EFS#APPEND
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
********************************************************************************/
package org.eclipse.rse.internal.services.dstore.files;
@ -56,7 +57,6 @@ import org.eclipse.dstore.core.model.DataStoreResources;
import org.eclipse.dstore.core.model.IDataStoreProvider;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.dstore.universal.miners.UniversalByteStreamHandler;
import org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner;
import org.eclipse.rse.internal.services.Activator;
import org.eclipse.rse.internal.services.dstore.ServiceResources;
import org.eclipse.rse.services.clientserver.FileTypeMatcher;
@ -154,7 +154,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
protected String getMinerId()
{
return UniversalFileSystemMiner.MINER_ID;
return IUniversalDataStoreConstants.UNIVERSAL_FILESYSTEM_MINER_ID;
}
protected String getByteStreamHandlerId()

9
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java
View file

@ -14,6 +14,7 @@
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* David McKnight (IBM) - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout
* David McKnight (IBM) - [159092] For to use correct process miner id
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
********************************************************************************/
package org.eclipse.rse.internal.services.dstore.processes;
@ -26,8 +27,8 @@ 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.IDataStoreProvider;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.dstore.universal.miners.IUniversalProcessDataStoreConstants;
import org.eclipse.rse.dstore.universal.miners.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;
@ -170,7 +171,7 @@ public class DStoreProcessService extends AbstractProcessService implements IPro
if (_minerElement == null || _minerElement.getDataStore() != getDataStore())
{
_minerElement = getDataStore()
.findMinerInformation(UniversalProcessMiner.MINER_ID);
.findMinerInformation(IUniversalDataStoreConstants.UNIVERSAL_PROCESS_MINER_ID);
}
return _minerElement;
}
@ -373,7 +374,7 @@ public class DStoreProcessService extends AbstractProcessService implements IPro
protected String getMinerId()
{
return UniversalProcessMiner.MINER_ID;
return IUniversalDataStoreConstants.UNIVERSAL_PROCESS_MINER_ID;
}
public int getServerVersion()
@ -388,6 +389,6 @@ public class DStoreProcessService extends AbstractProcessService implements IPro
protected String getProcessMinerId()
{
return UniversalProcessMiner.MINER_ID;
return IUniversalDataStoreConstants.UNIVERSAL_PROCESS_MINER_ID;
}
}

7
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java
View file

@ -13,7 +13,8 @@
* Contributors:
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* Kevin Doyle (IBM) - [187640] Removed setting status to finish when search not finished
* David McKnight [190010] Set the status to finish or cancelled depending on dstore status.
* David McKnight [190010] Set the status to finish or canceled depending on dstore status.
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
********************************************************************************/
package org.eclipse.rse.internal.services.dstore.search;
@ -24,7 +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.dstore.universal.miners.UniversalFileSystemMiner;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.internal.services.dstore.ServiceResources;
import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile;
import org.eclipse.rse.services.clientserver.SystemSearchString;
@ -51,7 +52,7 @@ public class DStoreSearchService extends AbstractDStoreService implements ISearc
protected String getMinerId()
{
return UniversalFileSystemMiner.MINER_ID;
return IUniversalDataStoreConstants.UNIVERSAL_FILESYSTEM_MINER_ID;
}
public void search(IHostSearchResultConfiguration searchConfig, IFileService fileService, IProgressMonitor monitor)

10
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java
View file

@ -12,7 +12,8 @@
*
* Contributors:
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* David McKnight (IBM) - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout
* David McKnight (IBM) - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
********************************************************************************/
package org.eclipse.rse.internal.services.dstore.shells;
@ -25,8 +26,7 @@ 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.IDataStoreProvider;
import org.eclipse.rse.dstore.universal.miners.CommandMiner;
import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.internal.services.dstore.ServiceResources;
import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@ -122,12 +122,12 @@ public class DStoreShellService extends AbstractDStoreService implements IShellS
protected String getMinerId()
{
return CommandMiner.MINER_ID;
return IUniversalDataStoreConstants.UNIVERSAL_COMMAND_MINER_ID;
}
protected String getEnvSystemMinerId()
{
return EnvironmentMiner.MINER_ID;
return IUniversalDataStoreConstants.UNIVERSAL_ENVIRONMENT_MINER_ID;
}

8
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellThread.java
View file

@ -13,6 +13,7 @@
*
* Contributors:
* {Name} (company) - description of contribution.
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
*******************************************************************************/
package org.eclipse.rse.internal.services.dstore.shells;
@ -23,8 +24,7 @@ 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.dstore.universal.miners.CommandMiner;
import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
@ -211,13 +211,13 @@ public class DStoreShellThread
protected String getCmdSystemMinerId()
{
return CommandMiner.MINER_ID;
return IUniversalDataStoreConstants.UNIVERSAL_COMMAND_MINER_ID;
}
protected String getEnvSystemMinerId()
{
return EnvironmentMiner.MINER_ID;
return IUniversalDataStoreConstants.UNIVERSAL_ENVIRONMENT_MINER_ID;
}
protected String getRunShellId()