Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2015-11-04 19:43:04 +0000
committerRyan D. Brooks2015-11-04 19:43:04 +0000
commitfb37546d706949275aaa8ccea1b6cd83a979428f (patch)
treeb94f9c4a78961933eab8af664d86671b149a41d6 /plugins/org.eclipse.osee.orcs
parent4fff9b74f7e88cd20a1113533f3f82af1a5a72a2 (diff)
downloadorg.eclipse.osee-fb37546d706949275aaa8ccea1b6cd83a979428f.tar.gz
org.eclipse.osee-fb37546d706949275aaa8ccea1b6cd83a979428f.tar.xz
org.eclipse.osee-fb37546d706949275aaa8ccea1b6cd83a979428f.zip
refactor: Improve HasBranch type hierarchy
Diffstat (limited to 'plugins/org.eclipse.osee.orcs')
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java3
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/HasBranch.java18
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java2
3 files changed, 2 insertions, 21 deletions
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java
index e6a1883a532..fcc9118c0be 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.orcs.data;
import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.data.ArtifactId;
+import org.eclipse.osee.framework.core.data.HasBranch;
import org.eclipse.osee.framework.core.data.HasLocalId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
@@ -27,7 +28,7 @@ import org.eclipse.osee.framework.jdk.core.type.ResultSet;
* @author Roberto E. Escobar
* @author Andrew M. Finkbeiner
*/
-public interface ArtifactReadable extends ArtifactId, HasLocalId<Integer>, HasBranch, HasTransaction, OrcsReadable {
+public interface ArtifactReadable extends ArtifactId, HasLocalId<Integer>, HasTransaction, OrcsReadable {
int getLastModifiedTransaction();
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/HasBranch.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/HasBranch.java
deleted file mode 100644
index 940daffdee9..00000000000
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/HasBranch.java
+++ /dev/null
@@ -1,18 +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.data;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface HasBranch {
- Long getBranchId();
-}
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java
index 711be1647df..110f4c37645 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java
@@ -28,8 +28,6 @@ public interface TransactionReadable extends HasLocalId<Integer>, ITransaction {
int getAuthorId();
- Long getBranchId();
-
int getCommit();
} \ No newline at end of file

Back to the top