refinement: Re-Organize, Format and Cleanup source

Change-Id: I71e686df3d68f22622f492a8dc0c168b4adc5c4d

18 files changed, 111 insertions, 156 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java
index 86365538690..0aa76b7c07c 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java
@@ -30,22 +30,19 @@ public class EventBasicGuidArtifactTest {
    public void testEqualsEventBasicGuidArtifact() {
       EventBasicGuidArtifact eventArt1 =
          new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), 0x01L, GUID.create());
-      EventBasicGuidArtifact eventArt2 =
-         new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
-            eventArt1.getGuid());
+      EventBasicGuidArtifact eventArt2 = new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchId(),
+         eventArt1.getArtTypeGuid(), eventArt1.getGuid());
 
       Assert.assertEquals(eventArt1.hashCode(), eventArt2.hashCode());
       Assert.assertEquals(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventBasicGuidArtifact(EventModType.Deleted, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
-            eventArt1.getGuid());
+      eventArt2 = new EventBasicGuidArtifact(EventModType.Deleted, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
+         eventArt1.getGuid());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), eventArt1.getArtTypeGuid(),
-            eventArt1.getGuid());
+      eventArt2 = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), eventArt1.getArtTypeGuid(),
+         eventArt1.getGuid());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
@@ -53,9 +50,8 @@ public class EventBasicGuidArtifactTest {
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
-            GUID.create());
+      eventArt2 = new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
+         GUID.create());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
@@ -84,15 +80,13 @@ public class EventBasicGuidArtifactTest {
       Assert.assertEquals(eventArt1.hashCode(), eventArt2.hashCode());
       Assert.assertEquals(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventBasicGuidArtifact(EventModType.Deleted, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
-            eventArt1.getGuid());
+      eventArt2 = new EventBasicGuidArtifact(EventModType.Deleted, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
+         eventArt1.getGuid());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), eventArt1.getArtTypeGuid(),
-            eventArt1.getGuid());
+      eventArt2 = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), eventArt1.getArtTypeGuid(),
+         eventArt1.getGuid());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
@@ -100,9 +94,8 @@ public class EventBasicGuidArtifactTest {
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
-            GUID.create());
+      eventArt2 = new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchId(), eventArt1.getArtTypeGuid(),
+         GUID.create());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java
index 7b2bf3558f7..60f7458e1d8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java
@@ -31,56 +31,48 @@ public class EventBasicGuidRelationTest {
       DefaultBasicGuidArtifact eventArt2 =
          new DefaultBasicGuidArtifact(eventArt1.getBranchId(), eventArt1.getArtTypeGuid(), eventArt1.getGuid());
 
-      EventBasicGuidRelation eventRel1 =
-         new EventBasicGuidRelation(RelationEventType.Added, eventArt1.getBranchId(), 0x02L, 234, 333, 34, eventArt1,
-            33, eventArt2);
-      EventBasicGuidRelation eventRel2 =
-         new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(), eventRel1.getRelTypeGuid(),
-            eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(), eventRel1.getArtA(),
-            eventRel1.getArtBId(), eventRel1.getArtB());
+      EventBasicGuidRelation eventRel1 = new EventBasicGuidRelation(RelationEventType.Added, eventArt1.getBranchId(),
+         0x02L, 234, 333, 34, eventArt1, 33, eventArt2);
+      EventBasicGuidRelation eventRel2 = new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(),
+         eventRel1.getRelTypeGuid(), eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(),
+         eventRel1.getArtA(), eventRel1.getArtBId(), eventRel1.getArtB());
 
       Assert.assertEquals(eventRel1.hashCode(), eventRel2.hashCode());
       Assert.assertEquals(eventRel1, eventRel2);
 
-      eventRel2 =
-         new EventBasicGuidRelation(RelationEventType.Deleted, eventRel1.getBranchId(), eventRel1.getRelTypeGuid(),
-            eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(), eventRel1.getArtA(),
-            eventRel1.getArtBId(), eventRel1.getArtB());
+      eventRel2 = new EventBasicGuidRelation(RelationEventType.Deleted, eventRel1.getBranchId(),
+         eventRel1.getRelTypeGuid(), eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(),
+         eventRel1.getArtA(), eventRel1.getArtBId(), eventRel1.getArtB());
 
       Assert.assertNotSame(eventRel1, eventRel2);
 
-      eventRel2 =
-         new EventBasicGuidRelation(RelationEventType.Deleted, Lib.generateUuid(), eventRel1.getRelTypeGuid(),
-            eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(), eventRel1.getArtA(),
-            eventRel1.getArtBId(), eventRel1.getArtB());
+      eventRel2 = new EventBasicGuidRelation(RelationEventType.Deleted, Lib.generateUuid(), eventRel1.getRelTypeGuid(),
+         eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(), eventRel1.getArtA(),
+         eventRel1.getArtBId(), eventRel1.getArtB());
 
       Assert.assertNotSame(eventRel1, eventRel2);
 
-      eventRel2 =
-         new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(), eventRel1.getRelTypeGuid(), 99,
-            eventRel1.getGammaId(), eventRel1.getArtAId(), eventRel1.getArtA(), eventRel1.getArtBId(),
-            eventRel1.getArtB());
+      eventRel2 = new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(),
+         eventRel1.getRelTypeGuid(), 99, eventRel1.getGammaId(), eventRel1.getArtAId(), eventRel1.getArtA(),
+         eventRel1.getArtBId(), eventRel1.getArtB());
 
       Assert.assertNotSame(eventRel1, eventRel2);
 
-      eventRel2 =
-         new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(), eventRel1.getRelTypeGuid(),
-            eventRel1.getRelationId(), 88, eventRel1.getArtAId(), eventRel1.getArtA(), eventRel1.getArtBId(),
-            eventRel1.getArtB());
+      eventRel2 = new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(),
+         eventRel1.getRelTypeGuid(), eventRel1.getRelationId(), 88, eventRel1.getArtAId(), eventRel1.getArtA(),
+         eventRel1.getArtBId(), eventRel1.getArtB());
 
       Assert.assertNotSame(eventRel1, eventRel2);
 
-      eventRel2 =
-         new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(), eventRel1.getRelTypeGuid(),
-            eventRel1.getRelationId(), eventRel1.getGammaId(), 77, eventRel1.getArtA(), eventRel1.getArtBId(),
-            eventRel1.getArtB());
+      eventRel2 = new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(),
+         eventRel1.getRelTypeGuid(), eventRel1.getRelationId(), eventRel1.getGammaId(), 77, eventRel1.getArtA(),
+         eventRel1.getArtBId(), eventRel1.getArtB());
 
       Assert.assertNotSame(eventRel1, eventRel2);
 
-      eventRel2 =
-         new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(), eventRel1.getRelTypeGuid(),
-            eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(), eventRel1.getArtA(), 66,
-            eventRel1.getArtB());
+      eventRel2 = new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchId(),
+         eventRel1.getRelTypeGuid(), eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(),
+         eventRel1.getArtA(), 66, eventRel1.getArtB());
 
       Assert.assertNotSame(eventRel1, eventRel2);
 
@@ -105,9 +97,8 @@ public class EventBasicGuidRelationTest {
       DefaultBasicGuidArtifact eventArt2 =
          new DefaultBasicGuidArtifact(eventArt1.getBranchId(), eventArt1.getArtTypeGuid(), eventArt1.getGuid());
 
-      EventBasicGuidRelation eventRel1 =
-         new EventBasicGuidRelation(RelationEventType.Added, eventArt1.getBranchId(), 0x04L, 234, 333, 34, eventArt1,
-            33, eventArt2);
+      EventBasicGuidRelation eventRel1 = new EventBasicGuidRelation(RelationEventType.Added, eventArt1.getBranchId(),
+         0x04L, 234, 333, 34, eventArt1, 33, eventArt2);
       Assert.assertTrue(eventRel1.is(RelationEventType.Added));
       Assert.assertTrue(eventRel1.is(RelationEventType.Added, RelationEventType.Purged));
       Assert.assertFalse(eventRel1.is(RelationEventType.Purged));
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java
index 6743a90a5ac..668969903dc 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java
@@ -28,34 +28,29 @@ public class EventChangeTypeBasicGuidArtifactTest {
    public void testEquals() {
       EventChangeTypeBasicGuidArtifact eventArt1 =
          new EventChangeTypeBasicGuidArtifact(Lib.generateUuid(), 1234L, 546L, GUID.create());
-      EventChangeTypeBasicGuidArtifact eventArt2 =
-         new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchId(), eventArt1.getFromArtTypeGuid(),
-            eventArt1.getArtTypeGuid(), eventArt1.getGuid());
+      EventChangeTypeBasicGuidArtifact eventArt2 = new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchId(),
+         eventArt1.getFromArtTypeGuid(), eventArt1.getArtTypeGuid(), eventArt1.getGuid());
 
       Assert.assertEquals(eventArt1.hashCode(), eventArt2.hashCode());
       Assert.assertEquals(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchId(), eventArt1.getFromArtTypeGuid(),
-            eventArt1.getArtTypeGuid(), eventArt1.getGuid());
+      eventArt2 = new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchId(), eventArt1.getFromArtTypeGuid(),
+         eventArt1.getArtTypeGuid(), eventArt1.getGuid());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventChangeTypeBasicGuidArtifact(Lib.generateUuid(), eventArt1.getFromArtTypeGuid(),
-            eventArt1.getArtTypeGuid(), eventArt1.getGuid());
+      eventArt2 = new EventChangeTypeBasicGuidArtifact(Lib.generateUuid(), eventArt1.getFromArtTypeGuid(),
+         eventArt1.getArtTypeGuid(), eventArt1.getGuid());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchId(), 111L, eventArt1.getArtTypeGuid(),
-            eventArt1.getGuid());
+      eventArt2 = new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchId(), 111L, eventArt1.getArtTypeGuid(),
+         eventArt1.getGuid());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
-      eventArt2 =
-         new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchId(), eventArt1.getFromArtTypeGuid(),
-            eventArt1.getArtTypeGuid(), GUID.create());
+      eventArt2 = new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchId(), eventArt1.getFromArtTypeGuid(),
+         eventArt1.getArtTypeGuid(), GUID.create());
 
       Assert.assertNotSame(eventArt1, eventArt2);
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactTypeEventFilterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactTypeEventFilterTest.java
index 0796da406a6..5c249e67d02 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactTypeEventFilterTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactTypeEventFilterTest.java
@@ -45,9 +45,8 @@ public class ArtifactTypeEventFilterTest {
       when(typeProvider.getTypeByGuid(CoreArtifactTypes.Requirement.getGuid())).thenReturn(
          CoreArtifactTypes.Requirement);
       ArtifactTypeEventFilter typeFilter = new ArtifactTypeEventFilter(typeProvider, CoreArtifactTypes.Requirement);
-      EventBasicGuidArtifact guidArt =
-         new EventBasicGuidArtifact(EventModType.Added, branchUuid, CoreArtifactTypes.Requirement.getGuid(),
-            GUID.create());
+      EventBasicGuidArtifact guidArt = new EventBasicGuidArtifact(EventModType.Added, branchUuid,
+         CoreArtifactTypes.Requirement.getGuid(), GUID.create());
       List<EventBasicGuidArtifact> guidArts = Arrays.asList(guidArt);
       Assert.assertTrue("Should match cause same artifact type", typeFilter.isMatchArtifacts(guidArts));
 
@@ -75,17 +74,14 @@ public class ArtifactTypeEventFilterTest {
 
       when(typeProvider.getTypeByGuid(CoreArtifactTypes.Requirement.getGuid())).thenReturn(
          CoreArtifactTypes.Requirement);
-      EventBasicGuidArtifact guidArtA =
-         new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), CoreArtifactTypes.Requirement.getGuid(),
-            GUID.create());
-      EventBasicGuidArtifact guidArtB =
-         new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
-            CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create());
+      EventBasicGuidArtifact guidArtA = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
+         CoreArtifactTypes.Requirement.getGuid(), GUID.create());
+      EventBasicGuidArtifact guidArtB = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
+         CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create());
 
       List<IBasicGuidRelation> relations = new ArrayList<>();
-      EventBasicGuidRelation relation =
-         new EventBasicGuidRelation(RelationEventType.Added, Lib.generateUuid(),
-            CoreRelationTypes.SupportingInfo_SupportedBy.getGuid(), 234, 123, 55, guidArtA, 66, guidArtB);
+      EventBasicGuidRelation relation = new EventBasicGuidRelation(RelationEventType.Added, Lib.generateUuid(),
+         CoreRelationTypes.SupportingInfo_SupportedBy.getGuid(), 234, 123, 55, guidArtA, 66, guidArtB);
       relations.add(relation);
 
       // guidArt in relation matches
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java
index cd523b58f7a..5e62dca4d39 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java
@@ -45,21 +45,18 @@ public class BranchUuidEventFilterTest {
    public void testIsMatchArtifacts() {
       BranchUuidEventFilter branchFilter = new BranchUuidEventFilter(COMMON);
 
-      EventBasicGuidArtifact guidArtA =
-         new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), CoreArtifactTypes.Requirement.getGuid(),
-            GUID.create());
-      EventBasicGuidArtifact guidArtB =
-         new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
-            CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create());
+      EventBasicGuidArtifact guidArtA = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
+         CoreArtifactTypes.Requirement.getGuid(), GUID.create());
+      EventBasicGuidArtifact guidArtB = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
+         CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create());
       List<IBasicGuidArtifact> arts = new ArrayList<>();
       arts.add(guidArtB);
       arts.add(guidArtA);
 
       Assert.assertFalse(branchFilter.isMatchArtifacts(arts));
 
-      guidArtA =
-         new EventBasicGuidArtifact(EventModType.Added, COMMON_ID,
-            CoreArtifactTypes.Requirement.getGuid(), GUID.create());
+      guidArtA = new EventBasicGuidArtifact(EventModType.Added, COMMON_ID, CoreArtifactTypes.Requirement.getGuid(),
+         GUID.create());
       arts.clear();
       arts.add(guidArtB);
       arts.add(guidArtA);
@@ -71,33 +68,27 @@ public class BranchUuidEventFilterTest {
    public void testIsMatchRelationArtifacts() {
       BranchUuidEventFilter branchFilter = new BranchUuidEventFilter(COMMON);
 
-      EventBasicGuidArtifact guidArtA =
-         new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), CoreArtifactTypes.Requirement.getGuid(),
-            GUID.create());
-      EventBasicGuidArtifact guidArtB =
-         new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
-            CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create());
+      EventBasicGuidArtifact guidArtA = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
+         CoreArtifactTypes.Requirement.getGuid(), GUID.create());
+      EventBasicGuidArtifact guidArtB = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(),
+         CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create());
 
       List<IBasicGuidRelation> relations = new ArrayList<>();
-      EventBasicGuidRelation relation =
-         new EventBasicGuidRelation(RelationEventType.Added, Lib.generateUuid(),
-            CoreRelationTypes.SupportingInfo_SupportedBy.getGuid(), 234, 123, 55, guidArtA, 66, guidArtB);
+      EventBasicGuidRelation relation = new EventBasicGuidRelation(RelationEventType.Added, Lib.generateUuid(),
+         CoreRelationTypes.SupportingInfo_SupportedBy.getGuid(), 234, 123, 55, guidArtA, 66, guidArtB);
       relations.add(relation);
 
       // neither in relation matches common branch
       Assert.assertFalse(branchFilter.isMatchRelationArtifacts(relations));
 
-      guidArtA =
-         new EventBasicGuidArtifact(EventModType.Added, COMMON_ID,
-            CoreArtifactTypes.Requirement.getGuid(), GUID.create());
-      guidArtB =
-         new EventBasicGuidArtifact(EventModType.Added, COMMON_ID,
-            CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create());
+      guidArtA = new EventBasicGuidArtifact(EventModType.Added, COMMON_ID, CoreArtifactTypes.Requirement.getGuid(),
+         GUID.create());
+      guidArtB = new EventBasicGuidArtifact(EventModType.Added, COMMON_ID,
+         CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create());
 
       relations.clear();
-      relation =
-         new EventBasicGuidRelation(RelationEventType.Added, COMMON_ID,
-            CoreRelationTypes.SupportingInfo_SupportedBy.getGuid(), 234, 123, 55, guidArtA, 66, guidArtB);
+      relation = new EventBasicGuidRelation(RelationEventType.Added, COMMON_ID,
+         CoreRelationTypes.SupportingInfo_SupportedBy.getGuid(), 234, 123, 55, guidArtA, 66, guidArtB);
       relations.add(relation);
 
       // branch match
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ReqNumberingTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ReqNumberingTest.java
index 363cb0376a7..78bca3baf27 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ReqNumberingTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ReqNumberingTest.java
@@ -16,7 +16,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.osee.framework.skynet.core.importing.ReqNumbering;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -119,13 +118,13 @@ public class ReqNumberingTest {
 
    @Test
    public void testCompare() {
-      List<ReqNumbering> referenceList =
-         Arrays.asList(new ReqNumbering("1"), new ReqNumbering("1.0-1"), new ReqNumbering("1.3"), new ReqNumbering(
-            "1.3.1.1.1.1.1.1"), new ReqNumbering("2.4"), new ReqNumbering("2.4.0.1"), new ReqNumbering("3"));
+      List<ReqNumbering> referenceList = Arrays.asList(new ReqNumbering("1"), new ReqNumbering("1.0-1"),
+         new ReqNumbering("1.3"), new ReqNumbering("1.3.1.1.1.1.1.1"), new ReqNumbering("2.4"),
+         new ReqNumbering("2.4.0.1"), new ReqNumbering("3"));
 
-      List<ReqNumbering> sampleList =
-         Arrays.asList(new ReqNumbering("3"), new ReqNumbering("1.0-1"), new ReqNumbering("2.4.0-1"), new ReqNumbering(
-            "2.4"), new ReqNumbering("1.3.1.1.1.1.1.1"), new ReqNumbering("1.3"), new ReqNumbering("1"));
+      List<ReqNumbering> sampleList = Arrays.asList(new ReqNumbering("3"), new ReqNumbering("1.0-1"),
+         new ReqNumbering("2.4.0-1"), new ReqNumbering("2.4"), new ReqNumbering("1.3.1.1.1.1.1.1"),
+         new ReqNumbering("1.3"), new ReqNumbering("1"));
 
       Collections.sort(sampleList);
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/DoorsJsoupElementUtility.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/DoorsJsoupElementUtility.java
index 8b077a8c165..c7163b650a3 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/DoorsJsoupElementUtility.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/DoorsJsoupElementUtility.java
@@ -107,7 +107,7 @@ public final class DoorsJsoupElementUtility {
          "";
       //@formatter:on
       // this selection doesn't distinguish the table rows inside of table rows
-      // these child rows appear at the end of the list 
+      // these child rows appear at the end of the list
 
       elements = Jsoup.parse(s).select("tr");
    }
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java
index 5b889189fc7..14328b88976 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java
@@ -74,9 +74,8 @@ public final class OutlineResolutionAndNumberTest {
    @Test
    public void testNextSetGeneration() {
       Set<String> nextPossibleSet = outlineResolution.generateNextSet(new ReqNumbering(LAST_OUTLINE_NUMBER));
-      Set<String> expected =
-         new HashSet<String>(Arrays.asList("3.2", "3.1.2", "3.1.1.3", "3.1.1.2.2", "3.1.1.2.1.8", "4.0",
-            "3.1.1.2.1.7.1", "3.1.1.2.1.7.0.1"));
+      Set<String> expected = new HashSet<String>(Arrays.asList("3.2", "3.1.2", "3.1.1.3", "3.1.1.2.2", "3.1.1.2.1.8",
+         "4.0", "3.1.1.2.1.7.1", "3.1.1.2.1.7.0.1"));
       addDotEndingSet(expected);
       expected.removeAll(nextPossibleSet);
       Assert.assertTrue(expected.isEmpty());
@@ -91,7 +90,6 @@ public final class OutlineResolutionAndNumberTest {
     * 1.                      ->    [1.1, 1.1., 1.0.1., 1.0.1, 2.0, 2.0.]
     * 3.                      ->    [3.0.1, 3.0.1., 3.1, 3.1., 4.0, 4.0.]
     * </pre>
-    *
     * </p>
     */
    @Test
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java
index 1889bffb6c0..47e5f7937ba 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.skynet.core.internal.event;
 
-import org.junit.Assert;
 import org.eclipse.osee.framework.core.enums.CoreBranches;
 import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteAccessControlEvent1;
 import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBranchEvent1;
@@ -22,6 +21,7 @@ import org.eclipse.osee.framework.skynet.core.internal.event.handlers.AccessCont
 import org.eclipse.osee.framework.skynet.core.internal.event.handlers.AccessControlRemoteEventHandler;
 import org.eclipse.osee.framework.skynet.core.internal.event.handlers.ArtifactEventHandler;
 import org.eclipse.osee.framework.skynet.core.internal.event.handlers.BranchRemoteEventHandler;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java
index e69b1c50aea..928ee8d1591 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.skynet.core.types.IArtifact;
 /**
  * @author Roberto E. Escobar
  */
-public class MockIArtifact extends NamedIdentity<String> implements IArtifact {
+public class MockIArtifact extends NamedIdentity<String>implements IArtifact {
 
    private boolean wasGetFullArtifactCalled;
    private final int uniqueId;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
index ac481852954..b6f33d87196 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
@@ -204,8 +204,8 @@ public class RelationTypeSideSorterTest {
       String sorterGuid = orderData.getCurrentSorterGuid(relationType, relationSide);
       IRelationSorterId expectedId = sorterProvider.getRelationOrder(sorterGuid).getSorterId();
       String expectedToString =
-         String.format("Relation Sorter {relationType=%s, relationSide=[%s], artifact=[%s], sorterId=%s}",
-            relationType, relationSide, artGuid, expectedId);
+         String.format("Relation Sorter {relationType=%s, relationSide=[%s], artifact=[%s], sorterId=%s}", relationType,
+            relationSide, artGuid, expectedId);
       Assert.assertEquals(expectedToString, sorter.toString());
    }
 
@@ -248,9 +248,8 @@ public class RelationTypeSideSorterTest {
    private static RelationType createRelationType(RelationTypeCache cache, String name, String delationRelationOrderGuid) throws OseeCoreException {
       IArtifactType type1 = new ArtifactType(0x01L, "1", false);
       IArtifactType type2 = new ArtifactType(0x02L, "2", false);
-      RelationType relationType =
-         new RelationType(0x03L, name, name + "_A", name + "_B", type1, type2, RelationTypeMultiplicity.MANY_TO_MANY,
-            delationRelationOrderGuid);
+      RelationType relationType = new RelationType(0x03L, name, name + "_A", name + "_B", type1, type2,
+         RelationTypeMultiplicity.MANY_TO_MANY, delationRelationOrderGuid);
       Assert.assertNotNull(relationType);
       cache.cache(relationType);
       return relationType;
@@ -269,12 +268,11 @@ public class RelationTypeSideSorterTest {
       int index = 0;
       Assert.assertEquals(expectedValues.size(), orderData.size());
       for (Entry<Pair<String, String>, Pair<String, List<String>>> entry : orderData.getOrderedEntrySet()) {
-         Object[] actual =
-            new Object[] {
-               entry.getKey().getFirst(),
-               entry.getKey().getSecond(),
-               entry.getValue().getFirst(),
-               entry.getValue().getSecond()};
+         Object[] actual = new Object[] {
+            entry.getKey().getFirst(),
+            entry.getKey().getSecond(),
+            entry.getValue().getFirst(),
+            entry.getValue().getSecond()};
          Object[] expected = expectedValues.get(index++);
          Assert.assertEquals(expected.length, actual.length);
          for (int index2 = 0; index2 < expected.length; index2++) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
index 6e3b393bde3..1ba82a0d495 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
@@ -245,12 +245,11 @@ public class RelationOrderDataTest {
       int index = 0;
       Assert.assertEquals(expectedValues.size(), orderData.size());
       for (Entry<Pair<String, String>, Pair<String, List<String>>> entry : orderData.getOrderedEntrySet()) {
-         Object[] actual =
-            new Object[] {
-               entry.getKey().getFirst(),
-               entry.getKey().getSecond(),
-               entry.getValue().getFirst(),
-               entry.getValue().getSecond()};
+         Object[] actual = new Object[] {
+            entry.getKey().getFirst(),
+            entry.getKey().getSecond(),
+            entry.getValue().getFirst(),
+            entry.getValue().getSecond()};
          Object[] expected = expectedValues.get(index++);
          Assert.assertEquals(expected.length, actual.length);
          for (int index2 = 0; index2 < expected.length; index2++) {
@@ -278,9 +277,8 @@ public class RelationOrderDataTest {
    private static RelationType createRelationType(RelationTypeCache cache, String name, String delationRelationOrderGuid) throws OseeCoreException {
       IArtifactType type1 = new ArtifactType(0x01L, "1", false);
       IArtifactType type2 = new ArtifactType(0x02L, "2", false);
-      RelationType relationType =
-         new RelationType(0x03L, name, name + "_A", name + "_B", type1, type2, RelationTypeMultiplicity.MANY_TO_MANY,
-            delationRelationOrderGuid);
+      RelationType relationType = new RelationType(0x03L, name, name + "_A", name + "_B", type1, type2,
+         RelationTypeMultiplicity.MANY_TO_MANY, delationRelationOrderGuid);
       Assert.assertNotNull(relationType);
       cache.cache(relationType);
       return relationType;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java
index fa159f8cb91..18c7fe9d6f0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java
@@ -15,7 +15,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-
 import org.eclipse.core.runtime.Assert;
 import org.junit.Test;
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java
index 60c138d8a9e..0d9048787f1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java
@@ -188,12 +188,11 @@ public class RelationOrderParserTest {
       int index = 0;
       Assert.assertEquals(expectedValues.size(), orderData.size());
       for (Entry<Pair<String, String>, Pair<String, List<String>>> entry : orderData.getOrderedEntrySet()) {
-         Object[] actual =
-            new Object[] {
-               entry.getKey().getFirst(),
-               entry.getKey().getSecond(),
-               entry.getValue().getFirst(),
-               entry.getValue().getSecond()};
+         Object[] actual = new Object[] {
+            entry.getKey().getFirst(),
+            entry.getKey().getSecond(),
+            entry.getValue().getFirst(),
+            entry.getValue().getSecond()};
          Object[] expected = expectedValues.get(index++);
          Assert.assertEquals(expected.length, actual.length);
          for (int index2 = 0; index2 < expected.length; index2++) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java
index e467fd90ced..19c05f25d31 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.osee.framework.core.data.IRelationSorterId;
 import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
 import org.eclipse.osee.framework.jdk.core.util.GUID;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java
index 81584d126ff..b0388383cc2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java
@@ -12,12 +12,12 @@ package org.eclipse.osee.framework.skynet.core.transaction;
 
 import java.util.HashSet;
 import java.util.Set;
-import org.junit.Assert;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
 import org.eclipse.osee.framework.jdk.core.util.GUID;
 import org.eclipse.osee.framework.skynet.core.transaction.TxMonitorImpl.MonitoredTx;
 import org.eclipse.osee.framework.skynet.core.transaction.TxMonitorImpl.TxState;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java
index 8de0c2669de..6904bfad170 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Boeing - initial API and implementation 
+ *     Boeing - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.osee.framework.skynet.core.utility;
@@ -67,7 +67,7 @@ public class NormalizeHtmlTest {
    private static String bodyOnly(String input) {
       int iBodyStart = input.indexOf("<body");
       int iBodyEnd = input.indexOf("</body");
-      if ((iBodyStart == -1) || (iBodyEnd == -1)) {
+      if (iBodyStart == -1 || iBodyEnd == -1) {
          return input;
       }
       iBodyStart = iBodyStart + 1 + input.substring(iBodyStart).indexOf('>');
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/UpdateBookmarkIdTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/UpdateBookmarkIdTest.java
index 335fb1953eb..95e3614c621 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/UpdateBookmarkIdTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/word/UpdateBookmarkIdTest.java
@@ -28,8 +28,7 @@ public class UpdateBookmarkIdTest {
          "<aml:annotation aml:id=\"133334\" w:type=\"Word.Bookmark.Start\"/><aml:annotation aml:id=\"133334\" w:type=\"Word.Bookmark.End\"/>";
       String modifiedContent = bookMarkIds.fixTags(bookmark);
 
-      Assert.assertEquals(
-         "The bookmark IDs have been reset",
+      Assert.assertEquals("The bookmark IDs have been reset",
          "<aml:annotation aml:id=\"1001\" w:type=\"Word.Bookmark.Start\"/><aml:annotation aml:id=\"1001\" w:type=\"Word.Bookmark.End\"/>",
          modifiedContent);
    }