Clean up some syntax errors and warnings

saalfeldlab · Aug 18, 2023 · c987e98 · c987e98
1 parent 9c69374
commit c987e98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...ava-client/src/main/java/org/janelia/render/client/newsolver/AffineDistributedSolver.java b/...ava-client/src/main/java/org/janelia/render/client/newsolver/AffineDistributedSolver.java
@@ -127,20 +127,19 @@ public static void main( final String[] args ) throws IOException
 				{
 					allItems.addAll( future.get() );
 				}
-				catch (InterruptedException | ExecutionException e)
+				catch (final InterruptedException | ExecutionException e)
 				{
 					LOG.error( "Failed to compute alignments: " + e );
 					e.printStackTrace();
-					return;
 				}
 			} );
 
 			taskExecutor.shutdown();
 		}
-		catch (InterruptedException e1)
+		catch (final InterruptedException e)
 		{
-			LOG.error( "Failed to compute alignments: " + e1 );
-			e1.printStackTrace();
+			LOG.error( "Failed to compute alignments: " + e );
+			e.printStackTrace();
 			return;
 		}
 
@@ -164,7 +163,7 @@ public static void main( final String[] args ) throws IOException
 						allItems,
 						solver,
 						(r,z) -> z.set( r ),
-						() -> new AffineModel2D() );
+						AffineModel2D::new);
 
 		assembler.createAssembly();
 

diff --git a/...c/main/java/org/janelia/render/client/newsolver/DistributedIntensityCorrectionSolver.java b/...c/main/java/org/janelia/render/client/newsolver/DistributedIntensityCorrectionSolver.java
@@ -134,7 +134,8 @@ public static void main(final String[] args) throws IOException {
 						cmdLineSetup.distributedSolve.maxIterationsGlobal,
 						cmdLineSetup.threadsGlobal);
 
-		final Assembler<ArrayList<AffineModel1D>, TranslationModel1D, ArrayList<AffineModel1D>, ZBlockFactory> assembler = new Assembler<>(allItems, solver);
+		final Assembler<ArrayList<AffineModel1D>, TranslationModel1D, ArrayList<AffineModel1D>, ZBlockFactory> assembler =
+				new Assembler<>(allItems, solver, (r, z) -> z.addAll(r), ArrayList::new);
 		assembler.createAssembly();
 	}