6 files changed, 150 insertions, 259 deletions

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java
index 6e8d301b94e..9dd7932132f 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java
@@ -4,9 +4,6 @@
 package org.eclipse.osee.framework.ui.skynet;

 

 import java.io.File;

-import java.util.ArrayList;

-import java.util.LinkedList;

-import java.util.List;

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.TreeViewer;

@@ -20,10 +17,7 @@ import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;

 import org.eclipse.osee.framework.ui.plugin.util.Wizards;

 import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportWizard;

-import org.eclipse.osee.framework.ui.skynet.update.ArtifactTransferObject;

-import org.eclipse.osee.framework.ui.skynet.update.InterArtifactExplorerHandler;

-import org.eclipse.osee.framework.ui.skynet.update.TransferMessage;

-import org.eclipse.osee.framework.ui.skynet.update.TransferMessage.Type;

+import org.eclipse.osee.framework.ui.skynet.update.InterArtifactExplorerDropHandler;

 import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.DropTargetEvent;

@@ -39,7 +33,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop {
    private TreeViewer treeViewer;

    private String viewId;

    private IViewPart viewPart;

-   private InterArtifactExplorerHandler interArtifactExplorerHandler;

+   private InterArtifactExplorerDropHandler interArtifactExplorerHandler;

    

    public ArtifactExplorerDragAndDrop(TreeViewer treeViewer, String viewId, IViewPart viewPart) {

       super(treeViewer.getTree(), treeViewer.getTree(), viewId);

@@ -47,7 +41,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop {
       this.treeViewer = treeViewer;

       this.viewId = viewId;

       this.viewPart = viewPart;

-      this.interArtifactExplorerHandler = new InterArtifactExplorerHandler();

+      this.interArtifactExplorerHandler = new InterArtifactExplorerDropHandler();

    }

 

    @Override

@@ -155,53 +149,4 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop {
          }

       }

    }

-

-   /**

-    * @param parentArtifact

-    * @param sourceArtifacts

-    * @throws OseeCoreException

-    */

-   private void dropArtifactIntoDifferentBranch(Artifact parentArtifact, Artifact[] sourceArtifacts) throws OseeCoreException {

-      //TODO need to lock this down if user doesn't have access to the parent Artifacts branch..

-      List<Artifact> descendents = parentArtifact.getDescendants();

-      List<Integer> artifactIds = new ArrayList<Integer>();

-      artifactIds.add(parentArtifact.getArtId());

-      for (Artifact artifact : descendents) {

-         artifactIds.add(artifact.getArtId());

-      }

-      

-      List<ArtifactTransferObject> updateArtifacts = new LinkedList<ArtifactTransferObject>();

-      List<ArtifactTransferObject> newBaselineArtifacts = new LinkedList<ArtifactTransferObject>();

-      List<ArtifactTransferObject> newNonBaselineArtifacts = new LinkedList<ArtifactTransferObject>();

-      

-      for (Artifact source : sourceArtifacts) {

-         if (artifactIds.contains(source.getArtId())) {

-            updateArtifacts.add(new ArtifactTransferObject(source, new TransferMessage(Type.INFO, "")));

-         } else if (artifactOnBranch()) {

-            updateArtifacts.add(new ArtifactTransferObject(source, new TransferMessage(Type.INFO, "")));

-         } else if (artifactOnParentBranch()) {

-            newBaselineArtifacts.add(new ArtifactTransferObject(source, new TransferMessage(Type.INFO, "")));

-         } else {

-            newNonBaselineArtifacts.add(new ArtifactTransferObject(source, new TransferMessage(Type.INFO, "")));

-         }

-      }

-      

-      

-      

-      //               ArtifactBaselineUpdate.updateArtifacts(parentArtifact.getBranch(), Arrays.asList(newArtifact), newArtifact.getBranch());

-   }

-

-   /**

-    * @return

-    */

-   private boolean artifactOnParentBranch() {

-      return false;

-   }

-

-   /**

-    * @return

-    */

-   private boolean artifactOnBranch() {

-      return false;

-   }

 }

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateFromParentBranch.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateFromParentBranch.java
index 0566b9254cc..0979ef4a7cd 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateFromParentBranch.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateFromParentBranch.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation;
 import java.util.Arrays;

 import java.util.Collection;

 import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactBaselineUpdate;

+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactUpdateHandler;

 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

 

@@ -35,7 +35,7 @@ public class UpdateFromParentBranch extends AbstractBlam {
    public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {

       monitor.beginTask("Update From Parent Branch", IProgressMonitor.UNKNOWN);

       Branch childBranch = variableMap.getBranch("Child Branch Name");

-      ArtifactBaselineUpdate.updateArtifacts(childBranch, variableMap.getArtifacts("Parent Branch Artifacts to update to Child Branch"), childBranch.getParentBranch());

+      ArtifactUpdateHandler.updateArtifacts(childBranch, variableMap.getArtifacts("Parent Branch Artifacts to update to Child Branch"), childBranch.getParentBranch());

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/ArtifactTransferObject.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/ArtifactTransferObject.java
deleted file mode 100644
index 8fe00292ed9..00000000000
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/ArtifactTransferObject.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**

- * 

- */

-package org.eclipse.osee.framework.ui.skynet.update;

-

-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-

-/**

- * @author Jeff C. Phillips

- */

-public class ArtifactTransferObject {

-   private Artifact artifact;

-   private TransferMessage message;

-

-   public ArtifactTransferObject(Artifact artifact, TransferMessage message) {

-      super();

-      this.artifact = artifact;

-      this.message = message;

-   }

-

-   /**

-    * @return the artifact

-    */

-   public Artifact getArtifact() {

-      return artifact;

-   }

-

-   /**

-    * @return the message

-    */

-   public TransferMessage getMessage() {

-      return message;

-   }

-}

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java
new file mode 100644
index 00000000000..c67c1e50aa8
--- /dev/null
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java
@@ -0,0 +1,145 @@
+/**

+ * 

+ */

+package org.eclipse.osee.framework.ui.skynet.update;

+

+import java.util.ArrayList;

+import java.util.LinkedList;

+import java.util.List;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.osee.framework.db.connection.ConnectionHandlerStatement;

+import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;

+import org.eclipse.osee.framework.db.connection.exception.OseeDataStoreException;

+import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;

+import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;

+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactUpdateHandler;

+import org.eclipse.osee.framework.skynet.core.artifact.Branch;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * @author Jeff C. Phillips

+ */

+public class InterArtifactExplorerDropHandler {

+   private static final String IS_ARTIFACT_ON_BRANCH =

+         "select 'x' from osee_artifact_version av1, osee_txs txs1, osee_tx_details txd1 where av1.art_id = ? and av1.gamma_id = txs1.gamma_id and txs1.transaction_id = txd1.transaction_id and txd1.branch_id = ?";

+

+   public void dropArtifactIntoDifferentBranch(Artifact destinationParentArtifact, Artifact[] sourceArtifacts) throws OseeCoreException {

+      if (destinationParentArtifact == null || sourceArtifacts == null || sourceArtifacts.length < 1) {

+         throw new OseeCoreException("");

+      }

+

+      if (AccessControlManager.checkObjectPermission(destinationParentArtifact.getBranch(), PermissionEnum.WRITE) && AccessControlManager.checkObjectPermission(

+            sourceArtifacts[0].getBranch(), PermissionEnum.READ)) {

+

+         List<Artifact> descendents = destinationParentArtifact.getDescendants();

+         List<Integer> artifactIds = new ArrayList<Integer>();

+         artifactIds.add(destinationParentArtifact.getArtId());

+

+         for (Artifact artifact : descendents) {

+            artifactIds.add(artifact.getArtId());

+         }

+

+         List<Artifact> updateSelectedArtifacts = new LinkedList<Artifact>();

+         List<Artifact> updateArtifactsFoundOnBranch = new LinkedList<Artifact>();

+         List<Artifact> newBaselineArtifacts = new LinkedList<Artifact>();

+         List<Artifact> newNonBaselineArtifacts = new LinkedList<Artifact>();

+         Branch sourceBranch = null;

+

+         for (Artifact sourceArtifact : sourceArtifacts) {

+            if (sourceBranch == null) {

+               sourceBranch = sourceArtifact.getBranch();

+            }

+

+            if (artifactIds.contains(sourceArtifact.getArtId())) {

+               updateSelectedArtifacts.add(sourceArtifact);

+            } else if (artifactOnDestinaltionBranch(destinationParentArtifact.getBranch(), sourceArtifact)) {

+               updateArtifactsFoundOnBranch.add(sourceArtifact);

+            } else if (artifactOnParentBranch(destinationParentArtifact.getBranch(), sourceArtifact)) {

+               newBaselineArtifacts.add(sourceArtifact);

+            } else {

+               newNonBaselineArtifacts.add(sourceArtifact);

+            }

+         }

+

+         confirmUsersRequestAndProcess(destinationParentArtifact, sourceBranch, updateSelectedArtifacts,

+               updateArtifactsFoundOnBranch, newBaselineArtifacts, newNonBaselineArtifacts);

+      } else {

+         MessageDialog.openError(

+               Display.getCurrent().getActiveShell(),

+               "Drag and Drop Error",

+               "Access control has restricted this action. The current user does not have sufficient permission to drag and drop artifacts on this branch from the selected source branch.");

+      }

+   }

+

+   private void confirmUsersRequestAndProcess(Artifact destinationArtifact, Branch sourceBranch, List<Artifact> updateSelectedArtifacts, List<Artifact> updateArtifactsFoundOnBranch, List<Artifact> newBaselineArtifacts, List<Artifact> newNonBaselineArtifacts) throws OseeCoreException {

+      StringBuilder message = new StringBuilder();

+

+      if (!updateSelectedArtifacts.isEmpty()) {

+         message.append(" 1 Are you sure you want to update " + updateSelectedArtifacts.size() + " artifacts from thier parent branch? \n");

+      }

+      if (!updateArtifactsFoundOnBranch.isEmpty()) {

+         message.append(" 2 These artifacts were already found on your branch. Are you sure you want to update " + updateArtifactsFoundOnBranch.size() + " artifacts from thier parent branch? \n");

+      }

+      if (!newBaselineArtifacts.isEmpty()) {

+         message.append(" 3 Are you sure you want to add " + newBaselineArtifacts.size() + " artifacts from thier parent branch? \n");

+      }

+      if (!newNonBaselineArtifacts.isEmpty()) {

+         message.append(" 4 Are you sure you want to add " + newNonBaselineArtifacts.size() + " new artifacts from this branch? \n");

+      }

+

+      if (MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Confirm Action",

+            message.toString())) {

+

+         Branch destinationBranch = destinationArtifact.getBranch();

+         updateArtifacts(updateSelectedArtifacts, destinationBranch, sourceBranch);

+         updateArtifacts(updateArtifactsFoundOnBranch, destinationBranch, sourceBranch);

+         addNewArtifactToBaseline(newBaselineArtifacts, destinationBranch, sourceBranch);

+         addNewArtifact(destinationArtifact, newNonBaselineArtifacts, sourceBranch);

+      }

+   }

+

+   private void addNewArtifact(Artifact destinationArtifact, List<Artifact> updateArtifacts, Branch sourceBranch) throws OseeCoreException {

+      ArtifactUpdateHandler.updateArtifacts(destinationArtifact.getBranch(), updateArtifacts, sourceBranch, destinationArtifact, true);

+   }

+

+   private void addNewArtifactToBaseline(List<Artifact> updateArtifacts, Branch destinationBranch, Branch sourceBranch) throws OseeCoreException {

+      if (updateArtifacts.isEmpty()) {

+         return;

+      }

+

+      ArtifactUpdateHandler.updateArtifacts(destinationBranch, updateArtifacts, sourceBranch);

+   }

+

+   private void updateArtifacts(List<Artifact> updateArtifacts, Branch destinationBranch, Branch sourceBranch) throws OseeCoreException {

+      if (updateArtifacts.isEmpty()) {

+         return;

+      }

+

+      ArtifactUpdateHandler.updateArtifacts(destinationBranch, updateArtifacts, sourceBranch);

+   }

+

+   private boolean artifactOnParentBranch(Branch branch, Artifact artifact) throws OseeCoreException {

+      return branch.getParentBranch().equals(artifact.getBranch());

+   }

+

+   private boolean artifactOnDestinaltionBranch(Branch branch, Artifact artifact) throws OseeCoreException {

+      return artifactOnBranch(branch, artifact);

+   }

+

+   private boolean artifactOnBranch(Branch sourceBranch, Artifact sourceArtifact) throws OseeDataStoreException {

+      boolean found = false;

+      ConnectionHandlerStatement chtStmt = new ConnectionHandlerStatement();

+

+      try {

+         chtStmt.runPreparedQuery(IS_ARTIFACT_ON_BRANCH, sourceArtifact.getArtId(), sourceBranch.getBranchId());

+         found = chtStmt.next();

+      } finally {

+         chtStmt.close();

+      }

+

+      return found;

+   }

+

+}

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerHandler.java
deleted file mode 100644
index 19f6a09f96f..00000000000
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerHandler.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * 

- */

-package org.eclipse.osee.framework.ui.skynet.update;

-

-import java.util.ArrayList;

-import java.util.LinkedList;

-import java.util.List;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;

-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactBaselineUpdate;

-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;

-import org.eclipse.osee.framework.skynet.core.artifact.Branch;

-import org.eclipse.osee.framework.ui.skynet.update.TransferMessage.Type;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @author Jeff C. Phillips

- */

-public class InterArtifactExplorerHandler {

-

-   public void dropArtifactIntoDifferentBranch(Artifact parentArtifact, Artifact[] sourceArtifacts) throws OseeCoreException {

-      if(parentArtifact == null || sourceArtifacts == null || sourceArtifacts.length < 1){

-         throw new OseeCoreException("");

-      }

-      

-      //TODO need to lock this down if user doesn't have access to the parent Artifacts branch..

-      List<Artifact> descendents = parentArtifact.getDescendants();

-      List<Integer> artifactIds = new ArrayList<Integer>();

-      artifactIds.add(parentArtifact.getArtId());

-      

-      for (Artifact artifact : descendents) {

-         artifactIds.add(artifact.getArtId());

-      }

-      

-      List<ArtifactTransferObject> updateArtifacts = new LinkedList<ArtifactTransferObject>();

-      List<ArtifactTransferObject> newBaselineArtifacts = new LinkedList<ArtifactTransferObject>();

-      List<ArtifactTransferObject> newNonBaselineArtifacts = new LinkedList<ArtifactTransferObject>();

-      Branch sourceBranch = null;

-      

-      for (Artifact sourceArtifact : sourceArtifacts) {

-         if(sourceBranch == null){

-            sourceBranch = sourceArtifact.getBranch();

-         }

-         

-         if (artifactIds.contains(sourceArtifact.getArtId())) {

-            updateArtifacts.add(new ArtifactTransferObject(sourceArtifact, new TransferMessage(Type.INFO, "")));

-         } else if (artifactOnBranch()) {

-            updateArtifacts.add(new ArtifactTransferObject(sourceArtifact, new TransferMessage(Type.INFO, "")));

-         } else if (artifactOnParentBranch(sourceBranch, sourceArtifact)) {

-            newBaselineArtifacts.add(new ArtifactTransferObject(sourceArtifact, new TransferMessage(Type.INFO, "")));

-         } else {

-            newNonBaselineArtifacts.add(new ArtifactTransferObject(sourceArtifact, new TransferMessage(Type.INFO, "")));

-         }

-      }

-      

-      String message = "";

-      

-      if(!updateArtifacts.isEmpty()){

-         message += "Are you sure you want to update " + updateArtifacts.size() + " artifacts from thier parent branch? \n";

-      }

-      if(!newBaselineArtifacts.isEmpty()){

-         message += "Are you sure you want to add " + newBaselineArtifacts.size() + " artifacts from thier parent branch? \n";

-      }

-      if(!newNonBaselineArtifacts.isEmpty()){

-         message += "Are you sure you want to add " + newNonBaselineArtifacts.size() + " new artifacts from this branch? \n";

-      }

-      

-      if (MessageDialog.openQuestion(

-            PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),

-            "Confirm Action", message)) {

-         

-         updateArtifacts(updateArtifacts, parentArtifact.getBranch(), sourceBranch);

-         addNewArtifactToBaseline(newBaselineArtifacts, parentArtifact.getBranch(), sourceBranch);

-         addNewArtifact(newNonBaselineArtifacts, parentArtifact.getBranch(), sourceBranch);

-      }

-   }

-

-   /**

-    * @param updateArtifacts

-    * @param branch

-    * @param sourceBranch

-    */

-   private void addNewArtifact(List<ArtifactTransferObject> updateArtifacts, Branch branch, Branch sourceBranch) {

-      // TODO Auto-generated method stub

-

-   }

-

-   /**

-    * @param updateArtifacts

-    * @param branch

-    * @param sourceBranch

-    */

-   private void addNewArtifactToBaseline(List<ArtifactTransferObject> updateArtifacts, Branch branch, Branch sourceBranch) {

-      // TODO Auto-generated method stub

-

-   }

-

-   private void updateArtifacts(List<ArtifactTransferObject> updateArtifacts, Branch destinationBranch, Branch sourceBranch) throws OseeCoreException {

-      if (updateArtifacts.isEmpty()) {

-         return;

-      }

-

-      List<Artifact> artifacts = new LinkedList<Artifact>();

-      for (ArtifactTransferObject artifactTransferObject : updateArtifacts) {

-         artifacts.add(artifactTransferObject.getArtifact());

-      }

-

-      ArtifactBaselineUpdate.updateArtifacts(destinationBranch, artifacts, sourceBranch);

-   }

-

-   /**

-    * @return

-    * @throws OseeCoreException

-    */

-   private boolean artifactOnParentBranch(Branch branch, Artifact artifact) throws OseeCoreException {

-      return ArtifactPersistenceManager.getDefaultHierarchyRootArtifact(branch).getChildren().contains(artifact);

-   }

-

-   /**

-    * @return

-    */

-   private boolean artifactOnBranch() {

-      return false;

-   }

-

-}

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/TransferMessage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/TransferMessage.java
deleted file mode 100644
index e6db203ad89..00000000000
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/TransferMessage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**

- * 

- */

-package org.eclipse.osee.framework.ui.skynet.update;

-

-/**

- * @author Jeff C. Phillips

- *

- */

-public class TransferMessage {

-   public enum Type{ERROR, INFO};

-   

-   private Type type;

-   private String message;

-   

-   

-   public TransferMessage(Type type, String message) {

-      super();

-      this.type = type;

-      this.message = message;

-   }

-   

-   /**

-    * @return the type

-    */

-   public Type getType() {

-      return type;

-   }

-

-

-   /**

-    * @return the message

-    */

-   public String getMessage() {

-      return message;

-   }

-}