Skip to content

Commit 0a64c9c

Browse files
committed
Fix warnings under newer Java
1 parent 873e6f9 commit 0a64c9c

20 files changed

+38
-55
lines changed

src/main/java/com/rtg/assembler/GraphMap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static void finalizeCounts(List<GraphMap> mappings, MutableGraph graph) {
326326
}
327327
for (GraphMap mapping : mappings) {
328328
if (mapping.mContigReadCounts.length() > i) {
329-
count += mapping.mContigReadCounts.get(i);
329+
count += mapping.mContigReadCounts.getInt(i);
330330
}
331331
}
332332
if (count > 0) {
@@ -343,7 +343,7 @@ static void finalizeCounts(List<GraphMap> mappings, MutableGraph graph) {
343343
}
344344
for (GraphMap mapping : mappings) {
345345
if (mapping.mPathReadCounts.length() > i) {
346-
count += mapping.mPathReadCounts.get(i);
346+
count += mapping.mPathReadCounts.getInt(i);
347347
}
348348
}
349349
if (count > 0) {

src/main/java/com/rtg/launcher/HashingRegion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ public long longestSubSequence(final SequencesReader reader) throws IOException
577577
lengths[0] = (int) (mPaddedEndPosition - mPaddedStartPosition);
578578
} else {
579579
if (this.getStartClipPosition() != MISSING) {
580-
lengths[0] -= mPaddedStartPosition;
580+
lengths[0] -= (int) mPaddedStartPosition;
581581
}
582582
if (this.getEndClipPosition() != MISSING) {
583583
lengths[lengths.length - 1] = (int) mPaddedEndPosition;

src/main/java/com/rtg/metagenomics/metasnp/MetaSnpCli.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ static void outputVisualisation(List<Integer> refBytes, List<MetaSnpLine> lines,
266266
final int numAlleles = currentEvidence[0].length;
267267
for (int sample = 0; sample < currentEvidence.length; ++sample) {
268268
for (byte allele = 0; allele < numAlleles; ++allele) {
269-
totals[sample] += currentEvidence[sample][allele];
269+
totals[sample] += (int) currentEvidence[sample][allele];
270270
}
271271
}
272272
for (byte allele = 0; allele < numAlleles; ++allele) {

src/main/java/com/rtg/variant/BaseQualityMachineCyclePhredScaler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ class BaseQualityMachineCyclePhredScaler implements PhredScaler {
8484
final int[] qualityTotals = new int[mCurve.length];
8585
for (int i = 0; i < qualityMismatches.length; ++i) {
8686
for (int j = 0; j < proc.getTotals()[i].length; ++j) {
87-
qualityMismatches[i] += proc.getMismatches()[i][j];
88-
qualityTotals[i] += proc.getTotals()[i][j];
87+
qualityMismatches[i] += (int) proc.getMismatches()[i][j];
88+
qualityTotals[i] += (int) proc.getTotals()[i][j];
8989
}
9090
}
9191

src/main/java/com/rtg/variant/CalibratedMachineErrorParams.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static double[][] histogramsToCgV1Dists(Histogram gapHistogram, Histogram overla
203203
//each read must have 1 and only 1 gap of between 0 and 3 (incl) long, but we can't count those with 0 long gaps
204204
int totSmallGaps = 0;
205205
for (int i = 0; i < 4 && i < gapHistogram.getLength(); ++i) {
206-
totSmallGaps += gapHistogram.getValue(i);
206+
totSmallGaps += (int) gapHistogram.getValue(i);
207207
}
208208
if (totSmallGaps > totalReads) {
209209
throw new IllegalArgumentException("invalid CG gap distribution, small gaps (1-3) has larger count than big gaps(4-8)");

src/main/java/com/rtg/variant/bayes/BinaryFactor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* Factor for a binary hypothesis.
3636
* @param <D> description
3737
*/
38-
public class BinaryFactor<D extends Description> extends AbstractFactor<D> {
38+
public final class BinaryFactor<D extends Description> extends AbstractFactor<D> {
3939

4040
private final double[] mPoss;
4141

src/main/java/com/rtg/variant/bayes/UnitFactor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* Unit factor.
3636
* @param <D> description
3737
*/
38-
public class UnitFactor<D extends Description> extends AbstractFactor<D> {
38+
public final class UnitFactor<D extends Description> extends AbstractFactor<D> {
3939

4040
private final double mUnit;
4141

src/main/java/com/rtg/variant/bayes/complex/ComplexTemplate.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131

3232
import java.lang.reflect.Constructor;
3333
import java.lang.reflect.InvocationTargetException;
34-
import java.security.AccessController;
35-
import java.security.PrivilegedAction;
3634
import java.util.ArrayList;
3735
import java.util.List;
3836

@@ -77,12 +75,7 @@ public class ComplexTemplate extends SequenceNameLocusSimple {
7775
private static final Constructor<Environment> ENVIRONMENT_COMBINED_CONSTRUCTOR;
7876
static {
7977
Diagnostic.developerLog("Classloading hack = " + HOTSPOT_HACK);
80-
final SeparateClassLoader loader = AccessController.doPrivileged(new PrivilegedAction<SeparateClassLoader>() {
81-
@Override
82-
public SeparateClassLoader run() {
83-
return new SeparateClassLoader(ScoreFastUnderflow.class, ScoreMatrix.class, AbstractAllPaths.class, EnvironmentCombined.class);
84-
}
85-
});
78+
final SeparateClassLoader loader = new SeparateClassLoader(ScoreFastUnderflow.class, ScoreMatrix.class, AbstractAllPaths.class, EnvironmentCombined.class);
8679
try {
8780
@SuppressWarnings("unchecked")
8881
final Class<AllPaths> sfClazz = (Class<AllPaths>) loader.loadClass(ScoreFastUnderflow.class.getName());

src/main/java/com/rtg/variant/bayes/complex/EvidenceComplex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
* Provides evidence for a complex hypothesis by performing an all-paths alignment
6363
* from an alignment record to each hypothesis.
6464
*/
65-
public class EvidenceComplex extends Evidence {
65+
public final class EvidenceComplex extends Evidence {
6666

6767
/** Print complex evidence scores into the developer log for debugging. */
6868
private static final boolean PRINT_EVIDENCE_DETAILS = GlobalFlags.isSet(CoreGlobalFlags.COMPLEX_EVIDENCE_DETAILS);

src/main/java/com/rtg/variant/bayes/multisample/Complexities.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ final SynchronizedLinkedList<ComplexRegion> filter(Deque<ComplexRegion> regions)
249249
return ret;
250250
}
251251

252-
boolean joinInteresting(int positionA, int positionB) {
252+
final boolean joinInteresting(int positionA, int positionB) {
253253
return joinInteresting(positionA, positionB, 0, 0);
254254
}
255255

256-
boolean joinInteresting(int positionA, int positionB, int indelA, int indelB) {
256+
final boolean joinInteresting(int positionA, int positionB, int indelA, int indelB) {
257257
final int indelHint = Math.max(indelA, indelB);
258258
final int posA = positionA + indelA / 2;
259259
final int posB = positionB - indelB / 2;
@@ -270,7 +270,7 @@ final ComplexRegion computeEndDangle(Deque<ComplexRegion> regions) {
270270
return regions.peekLast();
271271
}
272272

273-
void addRegion(final Deque<ComplexRegion> regions, int firstInteresting, int endInteresting, boolean forceComplex, int firstIndel, int endIndel) {
273+
final void addRegion(final Deque<ComplexRegion> regions, int firstInteresting, int endInteresting, boolean forceComplex, int firstIndel, int endIndel) {
274274
if (firstInteresting != -1) {
275275
assert endInteresting >= firstInteresting : endInteresting + ":" + firstInteresting;
276276
final ComplexRegion.RegionType regionType;
@@ -286,7 +286,7 @@ void addRegion(final Deque<ComplexRegion> regions, int firstInteresting, int end
286286
}
287287
}
288288

289-
void addOverflowRegion(final Deque<ComplexRegion> regions, final VariantLocus locus) {
289+
final void addOverflowRegion(final Deque<ComplexRegion> regions, final VariantLocus locus) {
290290
final ComplexRegion com = new ComplexRegion(mReferenceName, locus.getStart(), locus.getEnd(), RegionType.OVERFLOW);
291291
regions.add(com);
292292
}

0 commit comments

Comments
 (0)