refinement: Re-Organize, Format and Cleanup source

Change-Id: I71e686df3d68f22622f492a8dc0c168b4adc5c4d

6 files changed, 17 insertions, 17 deletions

diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/AnnotationCopierTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/AnnotationCopierTest.java
index 7d2f014482c..ab406abd6b9 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/AnnotationCopierTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/AnnotationCopierTest.java
@@ -159,9 +159,8 @@ public class AnnotationCopierTest {
       OperationReport report = new OperationReport();
 
       DispoSetCopier copier = new DispoSetCopier(connector);
-      List<DispoItem> toModify =
-         copier.copyAllDispositions(Collections.singletonMap(destItem.getName(), destItem),
-            Collections.singletonList((DispoItem) sourceItem), true, report);
+      List<DispoItem> toModify = copier.copyAllDispositions(Collections.singletonMap(destItem.getName(), destItem),
+         Collections.singletonList((DispoItem) sourceItem), true, report);
 
       DispoItem modifiedItem = toModify.get(0);
       JSONArray modifiedItemAnnotations = modifiedItem.getAnnotationsList();
@@ -196,7 +195,7 @@ public class AnnotationCopierTest {
       destDiscrepancies.put(discrepancy5.getId(), DispoUtil.discrepancyToJsonObj(discrepancy5));
       destItem.setDiscrepanciesList(destDiscrepancies);
 
-      // We're gonna set this annotation on the Dest Item this Annotation should not get overwritten but 
+      // We're gonna set this annotation on the Dest Item this Annotation should not get overwritten but
       DispoAnnotationData annotationD1 = new DispoAnnotationData();
       String expectedId = "DIID";
       annotationD1.setIdsOfCoveredDiscrepancies(new JSONArray());
@@ -213,9 +212,8 @@ public class AnnotationCopierTest {
 
       OperationReport report = new OperationReport();
       DispoSetCopier copier = new DispoSetCopier(connector);
-      List<DispoItem> toModify =
-         copier.copyAllDispositions(Collections.singletonMap(destItem.getName(), destItem),
-            Collections.singletonList((DispoItem) sourceItem), true, report);
+      List<DispoItem> toModify = copier.copyAllDispositions(Collections.singletonMap(destItem.getName(), destItem),
+         Collections.singletonList((DispoItem) sourceItem), true, report);
 
       DispoItem modifiedItem = toModify.get(0);
       JSONArray modifiedItemAnnotations = modifiedItem.getAnnotationsList();
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/DispoItemDataCopierTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/DispoItemDataCopierTest.java
index fca86c7553f..9e4ee776407 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/DispoItemDataCopierTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/DispoItemDataCopierTest.java
@@ -123,7 +123,7 @@ public class DispoItemDataCopierTest {
       // Make sure discrepancy10 in the new Item if the same as discrepancy9 from first item
       assertEquals(DispoStrings.Item_Complete, secondItemStatus);
 
-      // Make sure the annotations from the second item are the same as those from the first except for the location ranges which should all increase by 1. 
+      // Make sure the annotations from the second item are the same as those from the first except for the location ranges which should all increase by 1.
       assertEquals(annotationOneFirstItem.getGuid(), annotationOneSecondItem.getGuid());
       assertEquals("9", annotationOneFirstItem.getLocationRefs());
       assertEquals("10", annotationOneSecondItem.getLocationRefs());
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/DispositionIntegrationTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/DispositionIntegrationTest.java
index 594dc815198..b99cef59bf8 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/DispositionIntegrationTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/DispositionIntegrationTest.java
@@ -57,7 +57,7 @@ public class DispositionIntegrationTest {
       DispositionInitializer initializer = new DispositionInitializer(orcsApi, dispoApi);
       initializer.initialize();
 
-      // Get the sample TMO file into a file in a temp folder   
+      // Get the sample TMO file into a file in a temp folder
       File newFile = folder.newFile("sampleTmo.tmo");
 
       URL resource = getClass().getResource("../../../../../../../support/sampleTmo.tmo");
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
index a60e990b586..55c4b189e6e 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.osee.disposition.rest.integration.util;
 
-import static org.eclipse.osee.framework.core.enums.DemoBranches.SAW_Bld_1;
 import static org.eclipse.osee.disposition.rest.integration.util.DispositionTestUtil.SAW_Bld_1_FOR_DISPO;
+import static org.eclipse.osee.framework.core.enums.DemoBranches.SAW_Bld_1;
 import org.eclipse.osee.disposition.model.DispoProgram;
 import org.eclipse.osee.disposition.model.DispoSetDescriptorData;
 import org.eclipse.osee.disposition.model.DispoStrings;
@@ -42,7 +42,8 @@ public class DispositionInitializer {
 
    @SuppressWarnings("unchecked")
    private ArtifactReadable getDispositionUser() throws OseeCoreException {
-      return getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(SystemUser.OseeSystem).getResults().getExactlyOne();
+      return getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+         SystemUser.OseeSystem).getResults().getExactlyOne();
    }
 
    private QueryFactory getQueryFactory() {
@@ -78,6 +79,7 @@ public class DispositionInitializer {
 
    @SuppressWarnings("unchecked")
    private ArtifactReadable findUser() {
-      return orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(SystemUser.OseeSystem).getResults().getExactlyOne();
+      return orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+         SystemUser.OseeSystem).getResults().getExactlyOne();
    }
 }
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/AnnotationResourceTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/AnnotationResourceTest.java
index 47034344906..15851b4271f 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/AnnotationResourceTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/AnnotationResourceTest.java
@@ -131,15 +131,15 @@ public class AnnotationResourceTest {
       newAnnotation.setLocationRefs("2-11");
       DispoAnnotationData annotationToEdit = new DispoAnnotationData();
       annotationToEdit.setId(mockId);
-      when(dispositionApi.editDispoAnnotation(program, "itemId", annotationToEdit.getId(), newAnnotation, "name")).thenReturn(
-         true);
+      when(dispositionApi.editDispoAnnotation(program, "itemId", annotationToEdit.getId(), newAnnotation,
+         "name")).thenReturn(true);
       when(dispositionApi.getDispoItemById(program, "itemId")).thenReturn(dispoItem);
       when(dispoItem.getStatus()).thenReturn(DispoStrings.Item_Complete);
       Response response = resource.putDispoAnnotation(annotationToEdit.getId(), newAnnotation, "name");
       assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
 
-      when(dispositionApi.editDispoAnnotation(program, "itemId", annotationToEdit.getId(), newAnnotation, "name")).thenReturn(
-         false);
+      when(dispositionApi.editDispoAnnotation(program, "itemId", annotationToEdit.getId(), newAnnotation,
+         "name")).thenReturn(false);
       response = resource.putDispoAnnotation(annotationToEdit.getId(), newAnnotation, "name");
       assertEquals(Response.Status.NOT_MODIFIED.getStatusCode(), response.getStatus());
    }
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoSetResourceTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoSetResourceTest.java
index a86eeeeca8d..9565c7cf069 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoSetResourceTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoSetResourceTest.java
@@ -160,7 +160,7 @@ public class DispoSetResourceTest {
 
    @Test
    public void testPut() {
-      OperationReport report = new OperationReport();
+      new OperationReport();
 
       DispoSetData newSet = new DispoSetData();
       DispoSetData setToEdt = new DispoSetData();