Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrbrooks2010-09-23 22:42:17 -0400
committerRyan D. Brooks2010-09-23 22:42:17 -0400
commit8885710c96fd5a85058b3103cfd081169dfeea76 (patch)
tree89ee31e3336b77d248a20ad1f64d4850857704a1 /plugins/org.eclipse.osee.framework.database
parent47b4411c167982b9818e5f337a46ab02ad5f5708 (diff)
downloadorg.eclipse.osee-8885710c96fd5a85058b3103cfd081169dfeea76.tar.gz
org.eclipse.osee-8885710c96fd5a85058b3103cfd081169dfeea76.tar.xz
org.eclipse.osee-8885710c96fd5a85058b3103cfd081169dfeea76.zip
refactor: Make service accessor methods in server admin Activator static
Diffstat (limited to 'plugins/org.eclipse.osee.framework.database')
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/AbstractDbTxOperation.java13
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java6
2 files changed, 7 insertions, 12 deletions
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/AbstractDbTxOperation.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/AbstractDbTxOperation.java
index 4a62e2d365..b7f9b61ddd 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/AbstractDbTxOperation.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/AbstractDbTxOperation.java
@@ -15,26 +15,21 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider;
/**
* @author Roberto E. Escobar
*/
public abstract class AbstractDbTxOperation extends AbstractOperation {
- private final IOseeDatabaseServiceProvider provider;
+ private final IOseeDatabaseService databaseService;
- public AbstractDbTxOperation(IOseeDatabaseServiceProvider provider, String operationName, String pluginId) {
+ public AbstractDbTxOperation(IOseeDatabaseService databaseService, String operationName, String pluginId) {
super(operationName, pluginId);
- this.provider = provider;
+ this.databaseService = databaseService;
}
protected IOseeDatabaseService getDatabaseService() throws OseeDataStoreException {
- return provider.getOseeDatabaseService();
- }
-
- protected IOseeDatabaseServiceProvider getDatabaseServiceProvider() throws OseeDataStoreException {
- return provider;
+ return databaseService;
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java
index 2f164050e6..fb5752a973 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.operation.OperationReporter;
-import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.AbstractDbTxOperation;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.JoinUtility;
@@ -75,8 +75,8 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation
private int updateTxsCounter;
private int deleteTxsCounter;
- public ConsolidateArtifactVersionTxOperation(IOseeDatabaseServiceProvider provider, OperationReporter reporter) {
- super(provider, "Consolidate Artifact Versions", Activator.PLUGIN_ID);
+ public ConsolidateArtifactVersionTxOperation(IOseeDatabaseService databaseService, OperationReporter reporter) {
+ super(databaseService, "Consolidate Artifact Versions", Activator.PLUGIN_ID);
this.reporter = reporter;
}

Back to the top