From ba91cf7ea1d028e8eeeb21ae19b8758e673ba41a Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Tue, 3 Apr 2007 08:58:21 +0000 Subject: [PATCH] [180562] [api] Classes should not implement interfaces just to bring constants into namespace. Do not implement IUniversalProcessDataStoreConstants. --- .../processes/UniversalProcessMiner.java | 36 +++++++++---------- .../processes/DStoreProcessService.java | 14 ++++---- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/UniversalProcessMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/UniversalProcessMiner.java index aa07c6dd5e9..c1205d7fe40 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/UniversalProcessMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/UniversalProcessMiner.java @@ -44,7 +44,7 @@ import org.eclipse.rse.services.clientserver.processes.handlers.UniversalServerP * Miner for getting process information from a remote system. * @author mjberger */ -public class UniversalProcessMiner extends Miner implements IUniversalProcessDataStoreConstants, IUniversalDataStoreConstants +public class UniversalProcessMiner extends Miner implements IUniversalDataStoreConstants { public static final String MINER_ID = UniversalProcessMiner.class.getName(); @@ -92,49 +92,49 @@ public class UniversalProcessMiner extends Miner implements IUniversalProcessDat if (subject == null) { - UniversalServerUtilities.logError(UNIVERSAL_PROCESS_MINER, "Subject for UniversalProcessMiner command " + name + " is null", null); //$NON-NLS-1$ //$NON-NLS-2$ + UniversalServerUtilities.logError(IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_MINER, "Subject for UniversalProcessMiner command " + name + " is null", null); //$NON-NLS-1$ //$NON-NLS-2$ status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$ return status; } String subjectType = (String) subject.getElementProperty(DE.P_TYPE); - if (name.equals(C_PROCESS_QUERY_USERNAME)) + if (name.equals(IUniversalProcessDataStoreConstants.C_PROCESS_QUERY_USERNAME)) { return handleQueryUserName(subject, status); } - if (subjectType.equals(UNIVERSAL_PROCESS_FILTER)) + if (subjectType.equals(IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_FILTER)) { - if (name.equals(C_PROCESS_FILTER_QUERY_ALL)) + if (name.equals(IUniversalProcessDataStoreConstants.C_PROCESS_FILTER_QUERY_ALL)) { status = handleQuery(subject, status); } else { - UniversalServerUtilities.logError(UNIVERSAL_PROCESS_MINER, "Unknown filter command: " + name, null); //$NON-NLS-1$ + UniversalServerUtilities.logError(IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_MINER, "Unknown filter command: " + name, null); //$NON-NLS-1$ status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$ } } - else if (subjectType.equals(UNIVERSAL_PROCESS_DESCRIPTOR)) + else if (subjectType.equals(IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_DESCRIPTOR)) { - if (name.equals(C_PROCESS_QUERY_ALL_PROPERTIES)) + if (name.equals(IUniversalProcessDataStoreConstants.C_PROCESS_QUERY_ALL_PROPERTIES)) { handleQueryJobAllProperties(subject, status); } - else if (name.equals(C_PROCESS_KILL)) + else if (name.equals(IUniversalProcessDataStoreConstants.C_PROCESS_KILL)) { status = handleKill(subject, status); } else { - UniversalServerUtilities.logError(UNIVERSAL_PROCESS_MINER, "Unsupported process command: " + name, null); //$NON-NLS-1$ + UniversalServerUtilities.logError(IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_MINER, "Unsupported process command: " + name, null); //$NON-NLS-1$ status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$ } } else { - UniversalServerUtilities.logError(UNIVERSAL_PROCESS_MINER, "Unsupported subject for command: " + subject, null); //$NON-NLS-1$ + UniversalServerUtilities.logError(IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_MINER, "Unsupported subject for command: " + subject, null); //$NON-NLS-1$ status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$ } @@ -161,16 +161,16 @@ public class UniversalProcessMiner extends Miner implements IUniversalProcessDat // define process descriptors deUniversalProcessFilter = createObjectDescriptor(schemaRoot, - UNIVERSAL_PROCESS_FILTER); + IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_FILTER); deUniversalProcessObject = createObjectDescriptor(schemaRoot, - UNIVERSAL_PROCESS_DESCRIPTOR); - DataElement tempnode = createObjectDescriptor(schemaRoot, UNIVERSAL_PROCESS_TEMP); + IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_DESCRIPTOR); + DataElement tempnode = createObjectDescriptor(schemaRoot, IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_TEMP); // define command descriptors - createCommandDescriptor(deUniversalProcessFilter, "Filter", C_PROCESS_FILTER_QUERY_ALL); //$NON-NLS-1$ - createCommandDescriptor(deUniversalProcessObject, "Kill", C_PROCESS_KILL); //$NON-NLS-1$ - createCommandDescriptor(deUniversalProcessObject, "ProcessQueryAllProperties", C_PROCESS_QUERY_ALL_PROPERTIES); //$NON-NLS-1$ - createCommandDescriptor(tempnode, "QueryUsername", C_PROCESS_QUERY_USERNAME); //$NON-NLS-1$ + createCommandDescriptor(deUniversalProcessFilter, "Filter", IUniversalProcessDataStoreConstants.C_PROCESS_FILTER_QUERY_ALL); //$NON-NLS-1$ + createCommandDescriptor(deUniversalProcessObject, "Kill", IUniversalProcessDataStoreConstants.C_PROCESS_KILL); //$NON-NLS-1$ + createCommandDescriptor(deUniversalProcessObject, "ProcessQueryAllProperties", IUniversalProcessDataStoreConstants.C_PROCESS_QUERY_ALL_PROPERTIES); //$NON-NLS-1$ + createCommandDescriptor(tempnode, "QueryUsername", IUniversalProcessDataStoreConstants.C_PROCESS_QUERY_USERNAME); //$NON-NLS-1$ _dataStore.refresh(schemaRoot); } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java index eb01133da59..da20e403582 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java @@ -37,7 +37,7 @@ import org.eclipse.rse.services.processes.AbstractProcessService; import org.eclipse.rse.services.processes.IProcessService; -public class DStoreProcessService extends AbstractProcessService implements IProcessService, IUniversalProcessDataStoreConstants +public class DStoreProcessService extends AbstractProcessService implements IProcessService { protected IDataStoreProvider _provider; protected DataElement _minerElement = null; @@ -74,12 +74,12 @@ public class DStoreProcessService extends AbstractProcessService implements IPro // create filter descriptor DataElement deObj; - deObj = ds.find(universaltemp, DE.A_NAME, UNIVERSAL_PROCESS_ROOT, 1); - if (deObj == null) deObj = ds.createObject(universaltemp, UNIVERSAL_PROCESS_FILTER, UNIVERSAL_PROCESS_ROOT, "", "", false); //$NON-NLS-1$ //$NON-NLS-2$ + deObj = ds.find(universaltemp, DE.A_NAME, IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_ROOT, 1); + if (deObj == null) deObj = ds.createObject(universaltemp, IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_FILTER, IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_ROOT, "", "", false); //$NON-NLS-1$ //$NON-NLS-2$ deObj.setAttribute(DE.A_SOURCE, filter.toString()); // query - DataElement queryCmd = ds.localDescriptorQuery(deObj.getDescriptor(), C_PROCESS_FILTER_QUERY_ALL); + DataElement queryCmd = ds.localDescriptorQuery(deObj.getDescriptor(), IUniversalProcessDataStoreConstants.C_PROCESS_FILTER_QUERY_ALL); if (queryCmd != null) { @@ -198,7 +198,7 @@ public class DStoreProcessService extends AbstractProcessService implements IPro } DataElement deObj = (DataElement) process.getObject(); - DataElement killCmd = ds.localDescriptorQuery(deObj.getDescriptor(), C_PROCESS_KILL); + DataElement killCmd = ds.localDescriptorQuery(deObj.getDescriptor(), IUniversalProcessDataStoreConstants.C_PROCESS_KILL); deObj.setAttribute(DE.A_SOURCE, signal); if (killCmd != null) @@ -341,9 +341,9 @@ public class DStoreProcessService extends AbstractProcessService implements IPro { DataStore ds = getDataStore(); - DataElement encodingElement = ds.createObject(null, UNIVERSAL_PROCESS_TEMP, ""); //$NON-NLS-1$ + DataElement encodingElement = ds.createObject(null, IUniversalProcessDataStoreConstants.UNIVERSAL_PROCESS_TEMP, ""); //$NON-NLS-1$ - DataElement queryCmd = ds.localDescriptorQuery(encodingElement.getDescriptor(), C_PROCESS_QUERY_USERNAME); + DataElement queryCmd = ds.localDescriptorQuery(encodingElement.getDescriptor(), IUniversalProcessDataStoreConstants.C_PROCESS_QUERY_USERNAME); DStoreStatusMonitor monitor = getStatusMonitor(ds); DataElement status = ds.command(queryCmd, encodingElement, true); try