diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.database')
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 4a62e2d3655..b7f9b61ddd0 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 2f164050e60..fb5752a9730 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; } |