3 files changed, 22 insertions, 25 deletions

diff --git a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/internal/OseeBranchService.java b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/internal/OseeBranchService.java
index a67e99ba2a3..d6ace2b6c9c 100644
--- a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/internal/OseeBranchService.java
+++ b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/internal/OseeBranchService.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.branch.management.internal;
 

 import java.util.ArrayList;

 import java.util.List;

-

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.NullProgressMonitor;

@@ -56,9 +55,8 @@ public class OseeBranchService implements IOseeBranchService {
    private final IOseeDatabaseServiceProvider oseeDatabaseProvider;

    private final IOseeCachingServiceProvider cachingService;

    private final IOseeModelFactoryServiceProvider modelFactory;

-   

-   public OseeBranchService(IOseeDatabaseServiceProvider oseeDatabaseProvider,

-         IOseeCachingServiceProvider cachingService, IOseeModelFactoryServiceProvider modelFactory) {

+

+   public OseeBranchService(IOseeDatabaseServiceProvider oseeDatabaseProvider, IOseeCachingServiceProvider cachingService, IOseeModelFactoryServiceProvider modelFactory) {

       super();

       this.oseeDatabaseProvider = oseeDatabaseProvider;

       this.cachingService = cachingService;

@@ -66,8 +64,7 @@ public class OseeBranchService implements IOseeBranchService {
    }

 

    @Override

-   public void commitBranch(IProgressMonitor monitor, BranchCommitRequest branchCommitData,

-         BranchCommitResponse response) throws OseeCoreException {

+   public void commitBranch(IProgressMonitor monitor, BranchCommitRequest branchCommitData, BranchCommitResponse response) throws OseeCoreException {

       int userId = branchCommitData.getUserArtId();

       BranchCache branchCache = cachingService.getOseeCachingService().getBranchCache();

       TransactionCache transactionCache = cachingService.getOseeCachingService().getTransactionCache();

@@ -93,7 +90,7 @@ public class OseeBranchService implements IOseeBranchService {
 

       String opName =

             String.format("Commit: [%s]->[%s]", sourceBranch.getShortName(), destinationBranch.getShortName());

-      IOperation op = new CompositeOperation(opName, InternalBranchActivator.PLUGIN_ID, ops);

+      IOperation op = new CompositeOperation(opName, Activator.PLUGIN_ID, ops);

 

       Operations.executeWorkAndCheckStatus(op, monitor, -1);

 

@@ -104,36 +101,36 @@ public class OseeBranchService implements IOseeBranchService {
    }

 

    @Override

-   public void createBranch(IProgressMonitor monitor, BranchCreationRequest request,

-         BranchCreationResponse response) throws OseeCoreException {

-      IOperation operation = new CreateBranchOperation(oseeDatabaseProvider, modelFactory, cachingService, request, response);

+   public void createBranch(IProgressMonitor monitor, BranchCreationRequest request, BranchCreationResponse response) throws OseeCoreException {

+      IOperation operation =

+            new CreateBranchOperation(oseeDatabaseProvider, modelFactory, cachingService, request, response);

       Operations.executeWorkAndCheckStatus(operation, new LogProgressMonitor(), -1);

    }

 

    @Override

-   public void getChanges(IProgressMonitor monitor, ChangeReportRequest request,

-         ChangeReportResponse response) throws OseeCoreException {

+   public void getChanges(IProgressMonitor monitor, ChangeReportRequest request, ChangeReportResponse response) throws OseeCoreException {

       TransactionCache txCache = cachingService.getOseeCachingService().getTransactionCache();

       TransactionRecord srcTx = txCache.getOrLoad(request.getSourceTx());

       TransactionRecord destTx = txCache.getOrLoad(request.getDestinationTx());

 

       List<IOperation> ops = new ArrayList<IOperation>();

       if (request.isHistorical()) {

-          ops.add(new LoadChangeDataOperation(oseeDatabaseProvider, srcTx.getId(), destTx, response.getChangeItems()));

+         ops.add(new LoadChangeDataOperation(oseeDatabaseProvider, srcTx.getId(), destTx, response.getChangeItems()));

       } else {

-          ops.add(new LoadChangeDataOperation(oseeDatabaseProvider, srcTx, destTx, null, response.getChangeItems()));

+         ops.add(new LoadChangeDataOperation(oseeDatabaseProvider, srcTx, destTx, null, response.getChangeItems()));

       }

       ops.add(new ComputeNetChangeOperation(response.getChangeItems()));

 

       String opName = String.format("Gathering changes");

-      IOperation op = new CompositeOperation(opName, InternalBranchActivator.PLUGIN_ID, ops);

+      IOperation op = new CompositeOperation(opName, Activator.PLUGIN_ID, ops);

       Operations.executeWorkAndCheckStatus(op, monitor, -1);

    }

 

    @Override

    public void purge(IProgressMonitor monitor, PurgeBranchRequest request) throws OseeCoreException {

       BranchCache branchCache = cachingService.getOseeCachingService().getBranchCache();

-      IOperation operation = new PurgeBranchOperation(branchCache.getById(request.getBranchId()), cachingService, oseeDatabaseProvider);

+      IOperation operation =

+            new PurgeBranchOperation(branchCache.getById(request.getBranchId()), cachingService, oseeDatabaseProvider);

       Operations.executeWork(operation, new NullProgressMonitor(), -1);

       try {

          Operations.checkForStatusSeverityMask(operation.getStatus(), IStatus.ERROR | IStatus.WARNING);

diff --git a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java
index 25a9d6bf67c..213ae1249b2 100644
--- a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java
+++ b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java
@@ -14,9 +14,8 @@ package org.eclipse.osee.framework.branch.management.purge;
 import java.util.ArrayList;

 import java.util.List;

 import java.util.logging.Level;

-

 import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.osee.framework.branch.management.internal.InternalBranchActivator;

+import org.eclipse.osee.framework.branch.management.internal.Activator;

 import org.eclipse.osee.framework.core.cache.BranchCache;

 import org.eclipse.osee.framework.core.enums.TransactionDetailsType;

 import org.eclipse.osee.framework.core.exception.OseeArgumentException;

@@ -65,7 +64,8 @@ public class PurgeBranchOperation extends AbstractDbTxOperation {
    private final IOseeDatabaseServiceProvider oseeDatabaseProvider;

 

    public PurgeBranchOperation(Branch branch, IOseeCachingServiceProvider cachingService, IOseeDatabaseServiceProvider oseeDatabaseProvider) {

-      super(oseeDatabaseProvider, String.format("Purge Branch: [(%s)-%s]", branch.getId(), branch.getShortName()), InternalBranchActivator.PLUGIN_ID);

+      super(oseeDatabaseProvider, String.format("Purge Branch: [(%s)-%s]", branch.getId(), branch.getShortName()),

+            Activator.PLUGIN_ID);

       this.branch = branch;

       this.sourceTableName = branch.getArchiveState().isArchived() ? "osee_txs_archived" : "osee_txs";

       this.cachingService = cachingService;

@@ -77,7 +77,8 @@ public class PurgeBranchOperation extends AbstractDbTxOperation {
       this.connection = connection;

       this.monitor = monitor;

       int numberOfChildren =

-         oseeDatabaseProvider.getOseeDatabaseService().runPreparedQueryFetchObject(0, COUNT_CHILD_BRANCHES, branch.getId());

+            oseeDatabaseProvider.getOseeDatabaseService().runPreparedQueryFetchObject(0, COUNT_CHILD_BRANCHES,

+                  branch.getId());

       if (numberOfChildren > 0) {

          throw new OseeArgumentException("Unable to purge a branch containing children");

       }

@@ -113,9 +114,8 @@ public class PurgeBranchOperation extends AbstractDbTxOperation {
          try {

             branchCache = cachingService.getOseeCachingService().getBranchCache();

             branchCache.decache(branch);

-         }

-         catch (OseeCoreException ex) {

-            OseeLog.log(InternalBranchActivator.class, Level.SEVERE, ex);

+         } catch (OseeCoreException ex) {

+            OseeLog.log(Activator.class, Level.SEVERE, ex);

          }

       }

    }

diff --git a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/remote/BranchArchivingService.java b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/remote/BranchArchivingService.java
index 6b165719edb..54bcddb946d 100644
--- a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/remote/BranchArchivingService.java
+++ b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/remote/BranchArchivingService.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.framework.branch.management.remote;

 

 import org.eclipse.osee.framework.branch.management.IBranchArchivingService;

-import org.eclipse.osee.framework.branch.management.internal.InternalBranchActivator;

+import org.eclipse.osee.framework.branch.management.internal.Activator;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

 import org.eclipse.osee.framework.core.model.Branch;

 import org.eclipse.osee.framework.database.IOseeDatabaseService;

@@ -28,7 +28,7 @@ public class BranchArchivingService implements IBranchArchivingService {
    public static final String DELETE_ADDRESSING = "delete from %s where branch_id = ?";

 

    public static void moveBranchAddressing(OseeConnection connection, Branch branch, boolean archive) throws OseeDataStoreException {

-      IOseeDatabaseService service = InternalBranchActivator.getInstance().getOseeDatabaseService();

+      IOseeDatabaseService service = Activator.getInstance().getOseeDatabaseService();

 

       String sourceTableName = archive ? "osee_txs" : "osee_txs_archived";

       String destinationTableName = archive ? "osee_txs_archived" : "osee_txs";