diff options
author | Ryan D. Brooks | 2013-10-10 07:20:35 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2013-10-22 02:38:07 +0000 |
commit | 39907af9becac8d3c67aa1d56690ce301291c011 (patch) | |
tree | 8e369dffe6ce4705de673f8b784d58c10397e619 /plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org | |
parent | 6ea9b7c96f97853e4d1733f57a0653fc1c779536 (diff) | |
download | org.eclipse.osee-39907af9becac8d3c67aa1d56690ce301291c011.tar.gz org.eclipse.osee-39907af9becac8d3c67aa1d56690ce301291c011.tar.xz org.eclipse.osee-39907af9becac8d3c67aa1d56690ce301291c011.zip |
refactor: Remove unnecessary usage of FullyNamedIdentity
Change-Id: If8893a9c8294ab523471279a43b9305954790595
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org')
3 files changed, 2 insertions, 24 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java index f6f605927fb..8a9b54ca00d 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java @@ -15,7 +15,6 @@ import java.util.Iterator; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.Identity; -import org.eclipse.osee.framework.core.data.Named; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy; import org.eclipse.osee.framework.core.dsl.integration.mocks.DslAsserts; @@ -259,16 +258,6 @@ public class ArtifactMatchInterpreterTest { return new ArtifactProxy() { @Override - public String getUnqualifiedName() { - return null; - } - - @Override - public int compareTo(Named o) { - return 0; - } - - @Override public IOseeBranch getBranch() { return TokenFactory.createBranch(branchGuid, branchName); } diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifact.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifact.java index cb7392505eb..61d8f087c4b 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifact.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifact.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.dsl.integration.mocks; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.FullyNamedIdentity; +import org.eclipse.osee.framework.core.data.NamedIdentity; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.model.Branch; @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.model.type.ArtifactType; /** * @author Jeff C. Phillips */ -public class MockArtifact extends FullyNamedIdentity<String> implements IBasicArtifact<Object> { +public class MockArtifact extends NamedIdentity<String> implements IBasicArtifact<Object> { private final Branch branch; private final ArtifactType artifactType; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifactProxy.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifactProxy.java index 91cedb72ac0..80aeed008d3 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifactProxy.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifactProxy.java @@ -15,7 +15,6 @@ import java.util.Collections; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.Identity; -import org.eclipse.osee.framework.core.data.Named; import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy; import org.eclipse.osee.framework.core.model.IBasicArtifact; import org.eclipse.osee.framework.core.model.type.ArtifactType; @@ -93,14 +92,4 @@ public class MockArtifactProxy implements ArtifactProxy { public boolean matches(Identity... identities) { return artifactObject.matches(identities); } - - @Override - public String getUnqualifiedName() { - return artifactObject.getUnqualifiedName(); - } - - @Override - public int compareTo(Named o) { - return artifactObject.compareTo(o); - } } |