Skip to content

Commit 6e74863

Browse files
ctruedenctrueden
committed
Fix autogenerated source code skew
And regenerate the autogenerated source files. It is important that they remain exactly the same as: bin/generate.groovy && mvn license:update-file-header Otherwise, it is too burdensome to use the code generation tooling as intended whenever changes are needed to the templates. No fighting autoformatters! This commit makes the following changes: * Remove obsolete .arityX() calls from Velocity templates. * Align formatting of all "do not edit" warning blurbs.
1 parent ed87ff9 commit 6e74863

File tree

78 files changed

+35754
-51266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+35754
-51266
lines changed

‎scijava-function/src/main/java/org/scijava/function/Computers.java‎

Lines changed: 537 additions & 1007 deletions
Large diffs are not rendered by default.

‎scijava-function/src/main/java/org/scijava/function/Consumers.java‎

Lines changed: 77 additions & 142 deletions
Large diffs are not rendered by default.

‎scijava-function/src/main/java/org/scijava/function/Functions.java‎

Lines changed: 97 additions & 201 deletions
Large diffs are not rendered by default.

‎scijava-function/src/main/java/org/scijava/function/Inplaces.java‎

Lines changed: 445 additions & 807 deletions
Large diffs are not rendered by default.

‎scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java‎

Lines changed: 7427 additions & 16017 deletions
Large diffs are not rendered by default.

‎scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.vm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* This is autogenerated source code -- DO NOT EDIT. Instead, edit the
3-
* corresponding template in templates/ and rerun bin/generate.groovy.
4-
*/
2+
* This is autogenerated source code -- DO NOT EDIT. Instead, edit the
3+
* corresponding template in templates/ and rerun bin/generate.groovy.
4+
*/
55

66
package org.scijava.ops.api;
77

‎scijava-ops-engine/src/main/java/module-info.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
* POSSIBILITY OF SUCH DAMAGE.
2727
* #L%
2828
*/
29-
3029
/*
3130
* This is autogenerated source code -- DO NOT EDIT. Instead, edit the
3231
* corresponding template in templates/ and rerun bin/generate.groovy.
@@ -44,11 +43,10 @@
4443
requires org.scijava.priority;
4544
requires org.scijava.progress;
4645
requires org.scijava.struct;
47-
requires org.scijava.ops.api;
46+
requires transitive org.scijava.ops.api;
4847
requires org.scijava.ops.spi;
4948
requires org.scijava.types;
5049

51-
requires com.google.common;
5250
requires org.javassist;
5351
requires org.slf4j;
5452
requires org.yaml.snakeyaml;

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.java‎

Lines changed: 72 additions & 172 deletions
Large diffs are not rendered by default.

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.java‎

Lines changed: 156 additions & 224 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)