feature[ats_SF2V6]: Integrate new OrcsTypes API

Change-Id: I739a8600670773ff718efdc7a88046148f8e7b94

3 files changed, 18 insertions, 42 deletions

diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java
index 69ffe2b9f74..21182cd93f7 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java
@@ -16,18 +16,25 @@ import java.util.concurrent.Callable;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IAttributeType;
 import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.OseeImportModelRequest;
-import org.eclipse.osee.framework.core.model.OseeImportModelResponse;
+import org.eclipse.osee.framework.resource.management.IResource;
+import org.eclipse.osee.orcs.data.ArtifactTypes;
+import org.eclipse.osee.orcs.data.AttributeTypes;
+import org.eclipse.osee.orcs.data.RelationTypes;
 
 /**
  * @author Roberto E. Escobar
  */
 public interface OrcsTypes {
 
-   void importOseeTypes(boolean isInitializing, OseeImportModelRequest request, OseeImportModelResponse response) throws OseeCoreException;
+   ArtifactTypes getArtifactTypes();
 
-   void exportOseeTypes(OutputStream outputStream) throws OseeCoreException;
+   AttributeTypes getAttributeTypes();
+
+   RelationTypes getRelationTypes();
+
+   Callable<?> loadTypes(IResource resource, boolean isInitializing);
+
+   Callable<?> writeTypes(OutputStream outputStream);
 
    Callable<?> purgeArtifactsByArtifactType(Collection<? extends IArtifactType> artifactTypes);
 
@@ -35,4 +42,6 @@ public interface OrcsTypes {
 
    Callable<?> purgeRelationsByRelationType(Collection<? extends IRelationType> relationTypes);
 
+   void invalidateAll();
+
 }
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/GraphReadable.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/GraphReadable.java
index 12ee1ba6f06..112becdd505 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/GraphReadable.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/GraphReadable.java
@@ -13,17 +13,17 @@ package org.eclipse.osee.orcs.data;
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.data.IRelationType;
 import org.eclipse.osee.framework.core.data.IRelationTypeSide;
 import org.eclipse.osee.framework.core.data.Readable;
 import org.eclipse.osee.framework.core.enums.RelationSide;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.type.RelationType;
 
 public interface GraphReadable extends Readable {
 
    Collection<IRelationTypeSide> getExistingRelationTypes(ArtifactReadable art);
 
-   List<RelationType> getValidRelationTypes(ArtifactReadable art) throws OseeCoreException;
+   List<IRelationType> getValidRelationTypes(ArtifactReadable art) throws OseeCoreException;
 
    ///////
    ArtifactReadable getParent(ArtifactReadable art) throws OseeCoreException;
@@ -32,8 +32,7 @@ public interface GraphReadable extends Readable {
 
    RelationsReadable getRelatedArtifacts(IRelationTypeSide relationTypeSide, ArtifactReadable art) throws OseeCoreException;
 
-   RelationType getFullRelationType(IRelationTypeSide relationTypeSide) throws OseeCoreException;
-
-   int getRelationSideMax(RelationType relationType, IArtifactType artifactType, RelationSide relationSide) throws OseeCoreException;
+   int getRelationSideMax(IRelationType relationType, IArtifactType artifactType, RelationSide relationSide) throws OseeCoreException;
 
+   RelationTypes getTypes();
 }
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/utility/Providers.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/utility/Providers.java
deleted file mode 100644
index 3799e1e5e06..00000000000
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/utility/Providers.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.utility;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class Providers {
-
-   private Providers() {
-      // utility class
-   }
-
-   public static <T> ObjectProvider<T> returning(final T object) {
-      return new ObjectProvider<T>() {
-
-         @Override
-         public T get() {
-            return object;
-         }
-      };
-   }
-
-}