Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrbrooks2010-04-07 21:20:34 +0000
committerrbrooks2010-04-07 21:20:34 +0000
commit0281f92d21eb91f115c1aaa9b6b9b8772e70f970 (patch)
tree7d7b8ea1a94b9dc23e8d722de01a58bc945cabc8 /plugins
parentf15d09827751538d8e2474cb8b1198b61b0479be (diff)
downloadorg.eclipse.osee-0281f92d21eb91f115c1aaa9b6b9b8772e70f970.tar.gz
org.eclipse.osee-0281f92d21eb91f115c1aaa9b6b9b8772e70f970.tar.xz
org.eclipse.osee-0281f92d21eb91f115c1aaa9b6b9b8772e70f970.zip
resolved warnings
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java40
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java34
2 files changed, 34 insertions, 40 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
index c391bb8cf16..5473a1bf3ee 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
@@ -16,8 +16,6 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -37,7 +35,7 @@ public abstract class Change implements IAdaptable {
private final ArtifactType artifactType;
private final boolean isHistorical;
- public Change(IOseeBranch branch, ArtifactType artifactType, int sourceGamma, int artId, TransactionRecord toTransactionId, TransactionRecord fromTransactionId, ModificationType modType, boolean isHistorical, Artifact toArtifact, Artifact fromArtifact) throws OseeDataStoreException, OseeTypeDoesNotExist, ArtifactDoesNotExist {
+ public Change(IOseeBranch branch, ArtifactType artifactType, int sourceGamma, int artId, TransactionRecord toTransactionId, TransactionRecord fromTransactionId, ModificationType modType, boolean isHistorical, Artifact toArtifact, Artifact fromArtifact) {
super();
this.branch = branch;
this.sourceGamma = sourceGamma;
@@ -56,16 +54,16 @@ public abstract class Change implements IAdaptable {
if (obj instanceof Change) {
Change change = (Change) obj;
return change.getArtId() == artId &&
- //
- change.getGamma() == sourceGamma &&
- //
- change.getBranch() == branch &&
- //
- change.getToTransactionId() == toTransactionId &&
- //
- change.getFromTransactionId() == fromTransactionId &&
- //
- change.getModificationType() == modType;
+ //
+ change.getGamma() == sourceGamma &&
+ //
+ change.getBranch() == branch &&
+ //
+ change.getToTransactionId() == toTransactionId &&
+ //
+ change.getFromTransactionId() == fromTransactionId &&
+ //
+ change.getModificationType() == modType;
}
return false;
}
@@ -100,12 +98,12 @@ public abstract class Change implements IAdaptable {
public Artifact getToArtifact() {
return toArtifact;
}
-
- public Artifact getFromArtifact(){
- return fromArtifact;
- }
- public String getArtifactName() throws IllegalArgumentException, ArtifactDoesNotExist, MultipleArtifactsExist {
+ public Artifact getFromArtifact() {
+ return fromArtifact;
+ }
+
+ public String getArtifactName() {
return getToArtifact().getName();
}
@@ -126,9 +124,9 @@ public abstract class Change implements IAdaptable {
}
/**
- * For an artifact change this is the artifact type id. For an attribute this is the attribute
- * type id. For a relation this is the relation type id.
- *
+ * For an artifact change this is the artifact type id. For an attribute this is the attribute type id. For a
+ * relation this is the relation type id.
+ *
* @return typeId
*/
public abstract int getItemTypeId();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java
index 71ed45c5d1d..e3a8c71a4a6 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java
@@ -38,7 +38,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
/**
* Public API class for access to change data from branches and transactionIds
- *
+ *
* @author Jeff C. Phillips
* @author Donald G. Dunne
*/
@@ -47,6 +47,7 @@ public final class ChangeManager {
private final static RevisionChangeLoader revsionChangeLoader = new RevisionChangeLoader();
private ChangeManager() {
+ // this constructor is defined to prevent the default constructor from allowing public construction
}
public static Collection<Pair<Artifact, Artifact>> getCompareArtifacts(Collection<Change> changes) {
@@ -62,7 +63,7 @@ public final class ChangeManager {
/**
* Acquires changes for a particular artifact
- *
+ *
* @param artifact
* @param monitor
* @return changes
@@ -73,9 +74,8 @@ public final class ChangeManager {
}
/**
- * Acquires artifact, relation and attribute changes from a source branch
- * since its creation.
- *
+ * Acquires artifact, relation and attribute changes from a source branch since its creation.
+ *
* @param transactionId
* @param monitor
* @return changes
@@ -86,9 +86,8 @@ public final class ChangeManager {
}
/**
- * Acquires artifact, relation and attribute changes from a source branch
- * since its creation.
- *
+ * Acquires artifact, relation and attribute changes from a source branch since its creation.
+ *
* @param sourceBranch
* @param monitor
* @return changes
@@ -99,13 +98,11 @@ public final class ChangeManager {
}
/**
- * For the given list of artifacts determine which transactions (on that
- * artifact's branch) affected that artifact. The branch's baseline
- * transaction is excluded.
- *
+ * For the given list of artifacts determine which transactions (on that artifact's branch) affected that artifact.
+ * The branch's baseline transaction is excluded.
+ *
* @param artifacts
- * @return a map of artifact to collection of TransactionIds which affected
- * the given artifact
+ * @return a map of artifact to collection of TransactionIds which affected the given artifact
* @throws OseeCoreException
*/
public static HashCollection<Artifact, TransactionRecord> getModifingTransactions(Collection<Artifact> artifacts) throws OseeCoreException {
@@ -153,12 +150,11 @@ public final class ChangeManager {
}
/**
- * For the given list of artifacts determine which branches (in the branch
- * hierarchy for that artifact) affected that artifact.
- *
+ * For the given list of artifacts determine which branches (in the branch hierarchy for that artifact) affected that
+ * artifact.
+ *
* @param artifacts
- * @return a map of artifact to collection of branches which affected the
- * given artifact
+ * @return a map of artifact to collection of branches which affected the given artifact
* @throws OseeCoreException
*/
public static HashCollection<Artifact, Branch> getModifingBranches(Collection<Artifact> artifacts) throws OseeCoreException {

Back to the top