9 files changed, 51 insertions, 24 deletions

diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/OnEditOperationTest.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/OnEditOperationTest.java
index f3770004854..b59cabbd204 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/OnEditOperationTest.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/OnEditOperationTest.java
@@ -20,10 +20,11 @@ import org.eclipse.osee.framework.core.operation.IOperation;
 import org.eclipse.osee.framework.core.operation.LogProgressMonitor;

 import org.eclipse.osee.framework.core.operation.Operations;

 import org.eclipse.osee.framework.lifecycle.AbstractLifecycleOperation;

-import org.eclipse.osee.framework.lifecycle.ChangeMgmtChkPoint;

-import org.eclipse.osee.framework.lifecycle.ChangeMgmtHandler;

 import org.eclipse.osee.framework.lifecycle.ILifecycleService;

 import org.eclipse.osee.framework.lifecycle.LifecycleServiceImpl;

+import org.eclipse.osee.framework.lifecycle.access.ChangeMgmtChkPoint;

+import org.eclipse.osee.framework.lifecycle.access.ChangeMgmtHandler;

+import org.eclipse.osee.framework.lifecycle.test.mock.access.MockAccessCheckPorovider;

 import org.eclipse.osee.framework.lifecycle.test.mock.access.OnEditOperation;

 import org.junit.Assert;

 import org.junit.Test;

@@ -40,7 +41,7 @@ public class OnEditOperationTest {
    public void testOperation() throws OseeCoreException {

       ILifecycleService service = new LifecycleServiceImpl();

 

-      service.addHandler(ChangeMgmtChkPoint.TYPE, new ChangeMgmtHandler());

+      service.addHandler(ChangeMgmtChkPoint.TYPE, new ChangeMgmtHandler(new MockAccessCheckPorovider()));

 

       Assert.assertEquals(1, service.getHandlerCount(ChangeMgmtChkPoint.TYPE));

       Assert.assertFalse(service.getHandlerTypes().isEmpty());

diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/MockAccessCheckPorovider.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/MockAccessCheckPorovider.java
new file mode 100644
index 00000000000..bbcf4abb825
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/MockAccessCheckPorovider.java
@@ -0,0 +1,18 @@
+/*

+ * Created on Jun 24, 2010

+ *

+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

+ */

+package org.eclipse.osee.framework.lifecycle.test.mock.access;

+

+import org.eclipse.osee.framework.core.model.IBasicArtifact;

+import org.eclipse.osee.framework.lifecycle.access.IAccessCheckProvider;

+

+public class MockAccessCheckPorovider implements IAccessCheckProvider {

+

+   @Override

+   public boolean canEdit(IBasicArtifact<?> user, IBasicArtifact<?> artTcheck) {

+      return false;

+   }

+

+}

diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/OnEditOperation.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/OnEditOperation.java
index d96888bffd5..4b1026eb438 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/OnEditOperation.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/OnEditOperation.java
@@ -9,8 +9,8 @@ import java.util.Collection;
 import org.eclipse.core.runtime.IProgressMonitor;

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

 import org.eclipse.osee.framework.lifecycle.AbstractLifecycleOperation;

-import org.eclipse.osee.framework.lifecycle.ChangeMgmtChkPoint;

 import org.eclipse.osee.framework.lifecycle.ILifecycleService;

+import org.eclipse.osee.framework.lifecycle.access.ChangeMgmtChkPoint;

 

 public class OnEditOperation extends AbstractLifecycleOperation {

 

diff --git a/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF
index 71b8331cbae..cd099a10e51 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF
@@ -13,8 +13,10 @@ Import-Package: org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.osee.framework.core.util,
  org.eclipse.osee.framework.database.core,
  org.eclipse.osee.framework.jdk.core.type,
+ org.eclipse.osee.framework.lifecycle,
  org.osgi.framework;version="1.3.0",
  org.osgi.util.tracker
 Eclipse-ExtensibleAPI: true
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.osee.framework.lifecycle
+Export-Package: org.eclipse.osee.framework.lifecycle,
+ org.eclipse.osee.framework.lifecycle.access
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/ChangeMgmtChkPoint.java b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtChkPoint.java
index 0a368f392a1..5bbf036feb6 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/ChangeMgmtChkPoint.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtChkPoint.java
@@ -8,10 +8,11 @@
  * Contributors:

  *     Boeing - initial API and implementation

  *******************************************************************************/

-package org.eclipse.osee.framework.lifecycle;

+package org.eclipse.osee.framework.lifecycle.access;

 

 import java.util.Collection;

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

+import org.eclipse.osee.framework.lifecycle.AbstractLifecyclePoint;

 

 /**

  * @author Roberto E. Escobar

diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/ChangeMgmtHandler.java b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtHandler.java
index 7e3867246e8..379cb4ba739 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/ChangeMgmtHandler.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtHandler.java
@@ -8,13 +8,15 @@
  * Contributors:

  *     Boeing - initial API and implementation

  *******************************************************************************/

-package org.eclipse.osee.framework.lifecycle;

+package org.eclipse.osee.framework.lifecycle.access;

 

 import java.util.Collection;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

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

+import org.eclipse.osee.framework.lifecycle.Activator;

+import org.eclipse.osee.framework.lifecycle.LifecycleOpHandler;

 

 /**

  * @author Roberto E. Escobar

@@ -22,23 +24,12 @@ import org.eclipse.osee.framework.core.model.IBasicArtifact;
  */

 public class ChangeMgmtHandler implements LifecycleOpHandler {

    private final IStatus status = Status.OK_STATUS;

-

-   public static interface IAccessDataProvider {

-      public boolean canEdit(IBasicArtifact<?> user, IBasicArtifact<?> artTcheck);

-   }

-

-   private class AccessDataProvider implements IAccessDataProvider {

-      public boolean canEdit(IBasicArtifact<?> user, IBasicArtifact<?> artTcheck) {

-         return true;

-      }

-   }

-

    private IBasicArtifact<?> userArtifact;

    private Collection<IBasicArtifact<?>> artsToCheck;

-   private final AccessDataProvider dataProvider;

+   private final IAccessCheckProvider accessCheckProvider;

 

-   public ChangeMgmtHandler() {

-      this.dataProvider = new AccessDataProvider();

+   public ChangeMgmtHandler(IAccessCheckProvider accessCheckProvider) {

+      this.accessCheckProvider = accessCheckProvider;

    }

 

    public void setData(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artsToCheck) {

@@ -51,7 +42,7 @@ public class ChangeMgmtHandler implements LifecycleOpHandler {
       IStatus statusToReturn = status;

 

       for (IBasicArtifact<?> artifactToChk : artsToCheck) {

-         if (!dataProvider.canEdit(userArtifact, artifactToChk)) {

+         if (!accessCheckProvider.canEdit(userArtifact, artifactToChk)) {

             statusToReturn = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error");

             break;

          }

diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/IAccessCheckProvider.java b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/IAccessCheckProvider.java
new file mode 100644
index 00000000000..ef96c7d0eda
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/IAccessCheckProvider.java
@@ -0,0 +1,13 @@
+/*

+ * Created on Jun 24, 2010

+ *

+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

+ */

+package org.eclipse.osee.framework.lifecycle.access;

+

+import org.eclipse.osee.framework.core.model.IBasicArtifact;

+

+public interface IAccessCheckProvider {

+   public boolean canEdit(IBasicArtifact<?> user, IBasicArtifact<?> artTcheck);

+

+}

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
index 645aee9a56d..8fbf088b192 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.osee.framework.messaging.event.skynet,

  org.eclipse.osee.framework.database,

  org.eclipse.osee.framework.messaging.event.res,

- org.eclipse.osee.framework.messaging

+ org.eclipse.osee.framework.messaging,

+ org.eclipse.osee.framework.lifecycle

 Export-Package: org.eclipse.osee.framework.skynet.core,

  org.eclipse.osee.framework.skynet.core.access,

  org.eclipse.osee.framework.skynet.core.artifact,

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
index e6073003c85..b22201755c7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
@@ -45,8 +45,8 @@ import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;

 import org.eclipse.osee.framework.lifecycle.AbstractLifecycleOperation;

 import org.eclipse.osee.framework.lifecycle.AbstractLifecyclePoint;

-import org.eclipse.osee.framework.lifecycle.ChangeMgmtChkPoint;

 import org.eclipse.osee.framework.lifecycle.ILifecycleService;

+import org.eclipse.osee.framework.lifecycle.access.ChangeMgmtChkPoint;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.UserManager;

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