From fc5ee4cd44caf70e2ff2e2f6bf62830d06ff9095 Mon Sep 17 00:00:00 2001 From: Michael Innerberger Date: Mon, 28 Aug 2023 17:30:11 -0400 Subject: [PATCH] Fix a few IDE warnings --- .../DistributedAffineXYBlockSolver.java | 21 ++++++------------- .../client/parameter/XYRangeParameters.java | 1 + 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/render-ws-java-client/src/main/java/org/janelia/render/client/newsolver/DistributedAffineXYBlockSolver.java b/render-ws-java-client/src/main/java/org/janelia/render/client/newsolver/DistributedAffineXYBlockSolver.java index 1ce0df48c..50733cc67 100644 --- a/render-ws-java-client/src/main/java/org/janelia/render/client/newsolver/DistributedAffineXYBlockSolver.java +++ b/render-ws-java-client/src/main/java/org/janelia/render/client/newsolver/DistributedAffineXYBlockSolver.java @@ -11,7 +11,6 @@ import java.util.function.Function; import org.janelia.render.client.newsolver.blockfactories.XYBlockFactory; -import org.janelia.render.client.newsolver.blockfactories.ZBlockFactory; import org.janelia.render.client.newsolver.blocksolveparameters.FIBSEMAlignmentParameters; import org.janelia.render.client.newsolver.setup.AffineXYBlockSolverSetup; import org.janelia.render.client.newsolver.setup.RenderSetup; @@ -113,29 +112,21 @@ public static void main( final String[] args ) throws IOException final ArrayList< BlockData > allItems = new ArrayList<>(); - try - { + try { final ExecutorService taskExecutor = Executors.newFixedThreadPool(cmdLineSetup.distributedSolve.threadsGlobal); taskExecutor.invokeAll( workers ).forEach( future -> { - try - { + try { allItems.addAll( future.get() ); - } - catch (final InterruptedException | ExecutionException e) - { - LOG.error( "Failed to compute alignments: " + e ); - e.printStackTrace(); + } catch (final InterruptedException | ExecutionException e) { + LOG.error("Failed to compute alignments: ", e); } } ); taskExecutor.shutdown(); - } - catch (final InterruptedException e) - { - LOG.error( "Failed to compute alignments: " + e ); - e.printStackTrace(); + } catch (final InterruptedException e) { + LOG.error("Failed to compute alignments: ", e); return; } diff --git a/render-ws-java-client/src/main/java/org/janelia/render/client/parameter/XYRangeParameters.java b/render-ws-java-client/src/main/java/org/janelia/render/client/parameter/XYRangeParameters.java index 9e6854018..dd5703a16 100644 --- a/render-ws-java-client/src/main/java/org/janelia/render/client/parameter/XYRangeParameters.java +++ b/render-ws-java-client/src/main/java/org/janelia/render/client/parameter/XYRangeParameters.java @@ -14,6 +14,7 @@ public class XYRangeParameters implements Serializable { + // TODO: this seems to be a duplicate of LayerBoundsParameters @Parameter( names = "--minX", description = "Minimum X value within layers to be processed")