diff options
author | donald.g.dunne | 2015-12-23 19:54:49 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2015-12-23 19:54:49 +0000 |
commit | 82b1c027fa407dcdeaae4676c91681e3cdd9fa6c (patch) | |
tree | 2c235ec876df29269b683ed69ecf2ef432375ec9 /plugins/org.eclipse.osee.define.report | |
parent | ad0d071519a7e37e8d6f81906c4c9690a3de3a31 (diff) | |
download | org.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.tar.gz org.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.tar.xz org.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.zip |
refinement: Re-Organize, Format and Cleanup source
Change-Id: I71e686df3d68f22622f492a8dc0c168b4adc5c4d
Diffstat (limited to 'plugins/org.eclipse.osee.define.report')
10 files changed, 39 insertions, 39 deletions
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/SafetyReportGenerator.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/SafetyReportGenerator.java index c4884568d35..d234dbfbfb4 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/SafetyReportGenerator.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/SafetyReportGenerator.java @@ -88,7 +88,8 @@ public class SafetyReportGenerator { traces.extractTraces(root); } ArtifactReadable functionsFolder = - queryFactory.fromBranch(branchUuid).andIsOfType(CoreArtifactTypes.Folder).andNameEquals("System Functions").getResults().getExactlyOne(); + queryFactory.fromBranch(branchUuid).andIsOfType(CoreArtifactTypes.Folder).andNameEquals( + "System Functions").getResults().getExactlyOne(); processSystemFunctions(functionsFolder, writer); writer.endWorkbook(); @@ -106,15 +107,16 @@ public class SafetyReportGenerator { String criticality; if (systemFunction.getAttributes(CoreAttributeTypes.SafetyCriticality).size() != 1) { logger.debug("found too many attributes on %s", systemFunction.toString()); - criticality = - systemFunction.getAttributes(CoreAttributeTypes.SafetyCriticality).iterator().next().getDisplayableString(); + criticality = systemFunction.getAttributes( + CoreAttributeTypes.SafetyCriticality).iterator().next().getDisplayableString(); } else { criticality = systemFunction.getSoleAttributeAsString(CoreAttributeTypes.SafetyCriticality); } writer.writeCell(criticality); writer.writeCell(getSFHAHazards(systemFunction)); - for (ArtifactReadable systemRequirement : systemFunction.getRelated(CoreRelationTypes.Design__Requirement)) { + for (ArtifactReadable systemRequirement : systemFunction.getRelated( + CoreRelationTypes.Design__Requirement)) { writer.writeCell(systemRequirement.getSoleAttributeAsString(CoreAttributeTypes.ParagraphNumber, ""), SYSTEM_REQUIREMENT_INDEX); writer.writeCell(systemRequirement.getName()); diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java index b7d77422509..3d2eccda1b6 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java @@ -43,8 +43,8 @@ public class DataRightBuilder { private final OrcsApi orcsApi; - private static final IArtifactToken MAPPING_ARTIFACT = TokenFactory.createArtifactToken(5443258, "AOkJ_kFNbEXCS7UjmfwA", - "DataRightsFooters", CoreArtifactTypes.GeneralData); + private static final IArtifactToken MAPPING_ARTIFACT = TokenFactory.createArtifactToken(5443258, + "AOkJ_kFNbEXCS7UjmfwA", "DataRightsFooters", CoreArtifactTypes.GeneralData); public DataRightBuilder(OrcsApi orcsApi) { this.orcsApi = orcsApi; diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java index 2647c5c7b20..abddc4afe29 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java @@ -10,6 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.define.report.internal; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -29,11 +34,6 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.io.xml.ISheetWriter; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.AttributeReadable; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; /** * @author David W. Miller @@ -43,8 +43,8 @@ public final class SafetyInformationAccumulator { private final SafetyReportGenerator safetyReport; private String functionalCategory; private List<ArtifactReadable> subsystemFunctions; - private final Map<String, String> safetyCriticalityMap = ImmutableMap.of("I", "A", "II", "B", "III", "C", "IV", "D", - "V", "E"); + private final Map<String, String> safetyCriticalityMap = + ImmutableMap.of("I", "A", "II", "B", "III", "C", "IV", "D", "V", "E"); private final HashMap<ArtifactReadable, List<ArtifactReadable>> subsystemRequirements = Maps.newHashMap(); private final HashMap<ArtifactReadable, List<ArtifactReadable>> softwareRequirements = Maps.newHashMap(); private static final Predicate<ArtifactReadable> notAbstractSoftwareRequirement = new Predicate<ArtifactReadable>() { @@ -170,9 +170,8 @@ public final class SafetyInformationAccumulator { writer.writeCell(subsystemRequirement.getSoleAttributeAsString(CoreAttributeTypes.ParagraphNumber, "")); writer.writeCell(subsystemRequirement.getName()); - String currentCriticality = - writeCriticalityWithDesignCheck(subsystemRequirement, criticality, CoreRelationTypes.Design__Design, - CoreAttributeTypes.SafetyCriticality); + String currentCriticality = writeCriticalityWithDesignCheck(subsystemRequirement, criticality, + CoreRelationTypes.Design__Design, CoreAttributeTypes.SafetyCriticality); for (ArtifactReadable softwareRequirement : softwareRequirements.get(subsystemRequirement)) { processSoftwareRequirement(softwareRequirement, currentCriticality); @@ -230,16 +229,15 @@ public final class SafetyInformationAccumulator { private void processSoftwareRequirement(ArtifactReadable softwareRequirement, String criticality) throws IOException { writer.writeCell(softwareRequirement.getName(), SafetyReportGenerator.SOFTWARE_REQUIREMENT_INDEX); - String softwareRequirementDAL = - writeCriticalityWithDesignCheck(softwareRequirement, criticality, - CoreRelationTypes.Requirement_Trace__Higher_Level, CoreAttributeTypes.DevelopmentAssuranceLevel); + String softwareRequirementDAL = writeCriticalityWithDesignCheck(softwareRequirement, criticality, + CoreRelationTypes.Requirement_Trace__Higher_Level, CoreAttributeTypes.DevelopmentAssuranceLevel); writer.writeCell(calculateBoeingEquivalentSWQualLevel(softwareRequirementDAL, softwareRequirement.getAttributeCount(CoreAttributeTypes.Partition))); writer.writeCell(functionalCategory); - writer.writeCell(Collections.toString(",", - getAttributesToStringList(softwareRequirement, CoreAttributeTypes.Partition))); + writer.writeCell( + Collections.toString(",", getAttributesToStringList(softwareRequirement, CoreAttributeTypes.Partition))); writer.writeCell(safetyReport.getComponentUtil().getQualifiedComponentNames(softwareRequirement)); Collection<String> codeUnits = safetyReport.getRequirementToCodeUnitsValues(softwareRequirement); diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceAccumulator.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceAccumulator.java index 2a08535ef95..61ee381e07a 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceAccumulator.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceAccumulator.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.define.report.internal; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimaps; +import com.google.common.collect.SetMultimap; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -24,9 +27,6 @@ import org.eclipse.osee.framework.jdk.core.type.CaseInsensitiveString; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Lib; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimaps; -import com.google.common.collect.SetMultimap; /** * @author David W. Miller @@ -70,7 +70,8 @@ public class TraceAccumulator { private void traceFile(File root) throws IOException { int prefixLength = root.getCanonicalPath().length(); - for (File sourceFile : Lib.recursivelyListFilesAndDirectories(new ArrayList<File>(400), root, filePattern, false)) { + for (File sourceFile : Lib.recursivelyListFilesAndDirectories(new ArrayList<File>(400), root, filePattern, + false)) { /** * use prefixLength + 1 to account for trailing file separator which is not included in the root canonical path */ diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/util/ComponentUtil.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/util/ComponentUtil.java index 0f8ab65ab88..3c43fa682ad 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/util/ComponentUtil.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/util/ComponentUtil.java @@ -38,9 +38,8 @@ public class ComponentUtil { private synchronized void load() { wasLoaded = true; - mpCsci = - orcsApi.getQueryFactory().fromBranch(branchUuid).andIsOfType(CoreArtifactTypes.Component).andNameEquals( - "MP CSCI").getResults().getExactlyOne(); + mpCsci = orcsApi.getQueryFactory().fromBranch(branchUuid).andIsOfType(CoreArtifactTypes.Component).andNameEquals( + "MP CSCI").getResults().getExactlyOne(); mpComponents = mpCsci.getDescendants(); } @@ -70,7 +69,7 @@ public class ComponentUtil { strB.append(", "); } } - return (strB.length() == 0) ? null : strB.substring(0, strB.length() - 2); + return strB.length() == 0 ? null : strB.substring(0, strB.length() - 2); } public Collection<ArtifactReadable> getComponents() { diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java index e901d2af744..b2b7c9cf4a0 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java @@ -125,7 +125,7 @@ public class OseeLinkBuilder { } private String getEditImage(boolean isStart, String guid) { - String imageId = String.format("%s_%s", guid, (isStart ? "START.jpg" : "END.jpg")); + String imageId = String.format("%s_%s", guid, isStart ? "START.jpg" : "END.jpg"); String imageData = isStart ? START_BIN_DATA : END_BIN_DATA; return String.format(PIC_TAG_DATA, imageId, imageData, imageId, guid); } diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkParser.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkParser.java index b4347016605..11da5cc9ddb 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkParser.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkParser.java @@ -82,8 +82,8 @@ public final class OseeLinkParser { } /** - * Process new style requests are of the following format: - * http://127.0.0.1:<port>/<ProcessType>?key1=value1&key2=value2...&key3=value3 + * Process new style requests are of the following format: http://127.0.0.1:<port>/ + * <ProcessType>?key1=value1&key2=value2...&key3=value3 */ private void parseNewStyleRequests(String link) { String noHostStr = link.replaceFirst("^http:\\/\\/(.*?)\\/", "/"); diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordImageArtifactElementExtractor.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordImageArtifactElementExtractor.java index 50b7e066857..287ed827e16 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordImageArtifactElementExtractor.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordImageArtifactElementExtractor.java @@ -182,7 +182,7 @@ public class WordImageArtifactElementExtractor implements IElementExtractor { } else if (isEditEndImage(descendant)) { removals.add(descendant); afterEditTag = true; - } else if ((beforeEditTag && keepSide == Side.right) || (afterEditTag && keepSide == Side.left)) { + } else if (beforeEditTag && keepSide == Side.right || afterEditTag && keepSide == Side.left) { removals.add(descendant); } } @@ -242,12 +242,12 @@ public class WordImageArtifactElementExtractor implements IElementExtractor { private boolean compareBinData(Element pictElement, boolean lookingForStart) { boolean foundBindata = false; - int imageCheckSum = (getImageChecksum(lookingForStart)); + int imageCheckSum = getImageChecksum(lookingForStart); Node currentBinData = getElement(pictElement, BIN_DATA); if (currentBinData != null) { Node bindDataValue = currentBinData.getFirstChild(); - foundBindata = getCheckSum(bindDataValue.getNodeValue()) == (imageCheckSum); + foundBindata = getCheckSum(bindDataValue.getNodeValue()) == imageCheckSum; if (foundBindata) { if (lookingForStart) { START_IMG_ID = getImageId(pictElement); @@ -354,7 +354,7 @@ public class WordImageArtifactElementExtractor implements IElementExtractor { } private boolean properLevelChild(Element element) { - return (properLevelChildWord2003(element) || properLevelChildWord2007(element)); + return properLevelChildWord2003(element) || properLevelChildWord2007(element); } private void handleImages(Element element) { @@ -404,7 +404,7 @@ public class WordImageArtifactElementExtractor implements IElementExtractor { grandParentName.equals(BODY_TAG) && parentName.equals(SECTION_TAG) && !myName.equals(SUB_SECTION_TAG); boolean subsectionChild = parentName.equals(SUB_SECTION_TAG) && !myName.equals(SUB_SECTION_TAG); - return (nonSubsectionBodyChild || sectionChild || subsectionChild); + return nonSubsectionBodyChild || sectionChild || subsectionChild; } private boolean properLevelChildWord2007(Element element) { diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMlLinkHandler.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMlLinkHandler.java index e002b343f4f..eec8bb98188 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMlLinkHandler.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMlLinkHandler.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.define.report.internal.wordupdate; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -26,7 +27,6 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.BranchReadable; import org.eclipse.osee.orcs.search.QueryFactory; -import com.google.common.collect.Lists; /** * This class converts between OSEE hyperlink markers into wordML style links. <br/> diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java index 513bd829432..6163098b098 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java @@ -287,7 +287,7 @@ public class WordUpdateArtifact { private boolean checkIfSafetyRelated(ArtifactReadable artifact) { String dal = artifact.getSoleAttributeAsString(CoreAttributeTypes.DevelopmentAssuranceLevel, ""); - return ("A".equals(dal) || "B".equals(dal) || "C".equals(dal)); + return "A".equals(dal) || "B".equals(dal) || "C".equals(dal); } } |