refactor: Minor quality fixes0.9.9.v201106200029_RC

6 files changed, 34 insertions, 34 deletions

diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
index 92a7e0f455c..247047251e5 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
@@ -54,7 +54,6 @@ public class MergeManager {
       Collection<? extends ICoverage> children = coverageImport.getChildren();
       int count = 0;
       for (ICoverage importCoverage : children) {
-         //         System.out.println(String.format("Get merge items from %d/%d - [%s]", count, children.size(), importCoverage));
          processImportCoverage(importCoverage, mergeItems, resultData);
          count++;
       }
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java
index 39d4349559d..1820d7836bf 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java
@@ -22,18 +22,18 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * @formatter:off
- * Tests by inputing the whole requirements sample ICD file.
- * Tests:
- * 	- if user answers store as content vs store as an outline number,
- *      depending on what user selects.
- * 
- *      THESE TESTS MUST RUN AS PART OF THE SUITE, RoughArtifact* classes need
- *      the osee caching service.
+ * <p>
+ * Tests by inputing the whole requirements sample ICD file.<br/>
+ * Tests:<br/>
+ * <li>if user answers store as content vs store as an outline number, depending on what user selects.</li>
+ * </p>
+ * <p>
+ * <br/>
+ * THESE TESTS MUST RUN AS PART OF THE SUITE, RoughArtifact* classes need the osee caching service.<br/>
+ * </p>
  * 
  * @author Karol M. Wilk
  */
-//@formatter:on
 public class WordMlResolutionGuiTest {
 
    private static final Pattern PARAGRAPH_REGEX = Pattern.compile("<w:p[ >].*?</w:p>", Pattern.DOTALL);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
index 646f9fff9a4..d8b0e375c5c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
@@ -71,7 +71,7 @@ public class RelationOrderRendererTest {
    }
 
    @Test
-   public void testRenderingAllValid() {
+   public void testRenderingAllValid() throws OseeCoreException {
       RelationOrderData orderData = new MockRelationOrderData();
       List<Object[]> expectedData = new ArrayList<Object[]>();
 
@@ -87,8 +87,8 @@ public class RelationOrderRendererTest {
       checkRelationOrderRenderer(getExpected(expectedData), orderData);
    }
 
-   @Test
-   public void testRenderingOrderTypeNotFoud() {
+   @Test(expected = OseeCoreException.class)
+   public void testRenderingOrderTypeNotFound() throws OseeCoreException {
       RelationOrderData orderData = new MockRelationOrderData();
       List<Object[]> expectedData = new ArrayList<Object[]>();
       addData(orderData, expectedData, "Relation 1", "Relation 1_A", RelationSide.SIDE_A, GUID.create(), "0", "1", "2");
@@ -96,7 +96,7 @@ public class RelationOrderRendererTest {
    }
 
    @Test
-   public void testRenderingEmptyGuids() {
+   public void testRenderingEmptyGuids() throws OseeCoreException {
       RelationOrderData orderData = new MockRelationOrderData();
       List<Object[]> expectedData = new ArrayList<Object[]>();
       addData(orderData, expectedData, "Relation 1", "Relation 1_A", RelationSide.SIDE_A,
@@ -111,7 +111,7 @@ public class RelationOrderRendererTest {
       checkRelationOrderRenderer(getExpected(expectedData), orderData);
    }
 
-   private void addData(RelationOrderData orderData, List<Object[]> expectedData, String relationType, String relationSideName, RelationSide side, String relationOrderIdGuid, String... guids) {
+   private void addData(RelationOrderData orderData, List<Object[]> expectedData, String relationType, String relationSideName, RelationSide side, String relationOrderIdGuid, String... guids) throws OseeCoreException {
       List<String> artGuids = new ArrayList<String>();
       if (guids != null && guids.length > 0) {
          artGuids.addAll(Arrays.asList(guids));
@@ -119,12 +119,9 @@ public class RelationOrderRendererTest {
       orderData.addOrderList(relationType, side.name(), relationOrderIdGuid, artGuids);
 
       String expectedOrderId = relationOrderIdGuid;
-      try {
-         IRelationSorter sorter = sorterProvider.getRelationOrder(relationOrderIdGuid);
-         expectedOrderId = sorter.getSorterId().getName();
-      } catch (Exception ex) {
-         // Do Nothing
-      }
+      IRelationSorter sorter = sorterProvider.getRelationOrder(relationOrderIdGuid);
+      expectedOrderId = sorter.getSorterId().getName();
+
       expectedData.add(new Object[] {
          relationType,
          relationSideName,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java
index 01f0188ab1c..ef9831480f8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java
@@ -39,10 +39,6 @@ import org.junit.Test;
 
 /**
  * {@link RelationIntegrityCheck}
- * <p>
- * Tests data integrity case where a new relation is persisted on a deleted artifact. Checks that if the situation
- * exists and runs <code>applyFix()</code> to resolve the issue.
- * </p>
  * 
  * @author Karol M. Wilk
  */
@@ -52,6 +48,12 @@ public class RelationIntegrityCheckTest {
    private Branch parentBranch;
    private Branch workingBranch;
 
+   /**
+    * <p>
+    * Tests data integrity case where a new relation is persisted on a deleted artifact. Checks that if the situation
+    * exists and runs <code>applyFix()</code> to resolve the issue.
+    * </p>
+    */
    @Test
    public void testNewRelationOnDeletedArtifact() throws Exception {
       runQuery(RelationIntegrityCheck.DELETED_A_ARTIFACTS);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
index 88a84c1498f..ac7626429cc 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
@@ -39,6 +39,7 @@ import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifact
 import org.eclipse.osee.framework.skynet.core.importing.parsers.ExcelArtifactExtractor;
 import org.eclipse.osee.framework.skynet.core.importing.resolvers.IArtifactImportResolver;
 import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportOperationFactory;
+import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportWizard;
 import org.eclipse.osee.framework.ui.skynet.Import.MatchingStrategy;
 import org.eclipse.osee.support.test.util.DemoSawBuilds;
 import org.eclipse.osee.support.test.util.TestUtil;
@@ -50,7 +51,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
- * @link ArtifactImportWizard
+ * @see ArtifactImportWizard
  * @author Karol M. Wilk
  */
 public final class ArtifactImportWizardTest {
@@ -155,13 +156,15 @@ public final class ArtifactImportWizardTest {
       //@formatter:off
       /*
        setup artifact tree of this form:
-         ArtifactImportWizardTest_Root
-                                     |
-                                     `--A
-                                        |\.__ C
-                                        | |
-                                        | `._ D
-                                        B
+         myRootArtifact
+                      |
+                      `--A
+                      |   \._ C
+                      |   |
+                      |   `._ D
+                      |
+                      `--B
+         Where myRootArtifact real name is "ArtifactImportWizardTest_Root"
        */
       //@formatter:on
 
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
index c13e08ef5ec..1132a90cb77 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
@@ -67,7 +67,6 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende
    private final IComparator comparator;
 
    public WordTemplateRenderer() {
-      super();
       this.comparator = new WordTemplateCompare(this);
    }