From 4f31956e59e1a0f780e9aa562c3be2461745d23f Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Tue, 3 Apr 2007 08:25:42 +0000 Subject: [PATCH] [180562] [api] Classes should not implement interfaces just to bring constants into namespace. Do not implement IHostSearchConstants. --- .../services/search/AbstractSearchResultConfiguration.java | 4 ++-- .../services/search/IHostSearchResultConfiguration.java | 2 +- .../core/subsystems/RemoteSearchResultConfiguration.java | 7 ++++--- .../DStoreFileSubSystemSearchResultConfiguration.java | 3 ++- .../files/local/LocalSearchResultConfiguration.java | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/AbstractSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/AbstractSearchResultConfiguration.java index 53393f02f86..654601c1d3b 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/AbstractSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/AbstractSearchResultConfiguration.java @@ -55,7 +55,7 @@ public abstract class AbstractSearchResultConfiguration implements IHostSearchRe setParentResultSet(resultSet); setSearchTarget(searchObject); setSearchString(string); - setStatus(RUNNING); + setStatus(IHostSearchConstants.RUNNING); _searchService = searchService; _containedResults = new HashMap(); } @@ -184,7 +184,7 @@ public abstract class AbstractSearchResultConfiguration implements IHostSearchRe public void cancel() { // if not running, return - if (getStatus() != RUNNING) { + if (getStatus() != IHostSearchConstants.RUNNING) { return; } } diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java index 38bea0ab479..553012fe78f 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java @@ -21,7 +21,7 @@ import org.eclipse.rse.services.clientserver.SystemSearchString; /** * An interface representing a search result configuration. */ -public interface IHostSearchResultConfiguration extends IHostSearchConstants { +public interface IHostSearchResultConfiguration { /** * Sets the parent result set. diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultConfiguration.java index 6ca5cbefd50..96100838d0c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Vector; import org.eclipse.rse.services.clientserver.SystemSearchString; +import org.eclipse.rse.services.search.IHostSearchConstants; import org.eclipse.rse.services.search.IHostSearchResult; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultSet; @@ -48,14 +49,14 @@ public class RemoteSearchResultConfiguration implements IHostSearchResultConfigu * Constructor for a result set configuration. Sets status to RUNNING. * @param resultSet the parent result set. * @param searchObject the target of the search. - * @param searchString the search string. + * @param string the search string. */ public RemoteSearchResultConfiguration(IHostSearchResultSet resultSet, Object searchObject, SystemSearchString string) { results = new Vector(); setParentResultSet(resultSet); setSearchTarget(searchObject); setSearchString(string); - setStatus(RUNNING); + setStatus(IHostSearchConstants.RUNNING); _containedResults = new HashMap(); } @@ -170,7 +171,7 @@ public class RemoteSearchResultConfiguration implements IHostSearchResultConfigu public void cancel() { // if not running, return - if (getStatus() != RUNNING) { + if (getStatus() != IHostSearchConstants.RUNNING) { return; } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java index 7d0412e44ea..a2d6b399dfe 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java @@ -24,6 +24,7 @@ import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; import org.eclipse.rse.internal.services.dstore.search.DStoreSearchResultConfiguration; import org.eclipse.rse.services.clientserver.SystemSearchString; +import org.eclipse.rse.services.search.IHostSearchConstants; import org.eclipse.rse.services.search.IHostSearchResult; import org.eclipse.rse.services.search.IHostSearchResultSet; import org.eclipse.rse.services.search.ISearchService; @@ -131,7 +132,7 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe { if (_status.getValue().equals("done")) //$NON-NLS-1$ { - setStatus(FINISHED); + setStatus(IHostSearchConstants.FINISHED); _status.getDataStore().getDomainNotifier().removeDomainListener(this); } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalSearchResultConfiguration.java index 24beb36b172..9439e299907 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalSearchResultConfiguration.java @@ -20,6 +20,7 @@ package org.eclipse.rse.internal.subsystems.files.local; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.search.AbstractSearchResultConfiguration; +import org.eclipse.rse.services.search.IHostSearchConstants; import org.eclipse.rse.services.search.IHostSearchResult; import org.eclipse.rse.services.search.IHostSearchResultSet; import org.eclipse.rse.services.search.ISearchService; @@ -91,7 +92,7 @@ public class LocalSearchResultConfiguration extends AbstractSearchResultConfigur public void cancel() { // if not running, call super - if (getStatus() != RUNNING) { + if (getStatus() != IHostSearchConstants.RUNNING) { super.cancel(); return; }