Happy New Year 2022

ctrueden · ctrueden · commit c57f18a374a8 · 2022-08-26T11:05:26.000-05:00
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2017 - 2018, Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+Copyright (c) 2017 - 2022, Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/main/java/org/scijava/batch/BatchModuleSearchActionFactory.java b/src/main/java/org/scijava/batch/BatchModuleSearchActionFactory.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/BatchService.java b/src/main/java/org/scijava/batch/BatchService.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/FileBatchService.java b/src/main/java/org/scijava/batch/FileBatchService.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/FileScriptBatchProcessor.java b/src/main/java/org/scijava/batch/FileScriptBatchProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/MenuScriptBatchProcessor.java b/src/main/java/org/scijava/batch/MenuScriptBatchProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/ModuleBatchProcessor.java b/src/main/java/org/scijava/batch/ModuleBatchProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -120,8 +120,9 @@ public void run() {
 		}
 
 		String taskName = "Batch:";
-		if ((scriptModule.getInfo()!=null) && (scriptModule.getInfo().getName()!=null)) {
-				taskName = scriptModule.getInfo().getName();
+		ModuleInfo scriptInfo = scriptModule.getInfo();
+		if (scriptInfo != null && scriptInfo.getName() != null) {
+			taskName = scriptInfo.getName();
 		}
 		Task batchTask = taskService.createTask(taskName);
 		batchTask.setProgressMaximum(inputFileList.length);
diff --git a/src/main/java/org/scijava/batch/ScriptInfoWidget.java b/src/main/java/org/scijava/batch/ScriptInfoWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/SwingScriptInfoWidget.java b/src/main/java/org/scijava/batch/SwingScriptInfoWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/input/BatchInput.java b/src/main/java/org/scijava/batch/input/BatchInput.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/input/BatchInputProvider.java b/src/main/java/org/scijava/batch/input/BatchInputProvider.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/batch/input/FileBatchInputProvider.java b/src/main/java/org/scijava/batch/input/FileBatchInputProvider.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/batch/BatchServiceTest.java b/src/test/java/org/scijava/batch/BatchServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * A Batch Processor for SciJava Modules and Scripts
  * %%
- * Copyright (C) 2017 - 2018 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
+ * Copyright (C) 2017 - 2022 Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2017 - 2018, Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)`
	`1`	`+Copyright (c) 2017 - 2022, Friedrich Miescher Institute for Biomedical Research, Basel (Switzerland)`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without modification,`