Rebase

deephaven · Mar 7, 2024 · ef308a7 · ef308a7
1 parent 6d9ef34
commit ef308a7
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/Util/src/main/java/io/deephaven/util/CompletionStageFuture.java b/Util/src/main/java/io/deephaven/util/CompletionStageFuture.java
@@ -1,6 +1,6 @@
-/**
- * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
- */
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
 package io.deephaven.util;
 
 import org.jetbrains.annotations.NotNull;

diff --git a/Util/src/main/java/io/deephaven/util/CompletionStageFutureImpl.java b/Util/src/main/java/io/deephaven/util/CompletionStageFutureImpl.java
@@ -1,6 +1,6 @@
-/**
- * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
- */
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
 package io.deephaven.util;
 
 import org.jetbrains.annotations.NotNull;

diff --git a/Util/src/main/java/io/deephaven/util/datastructures/CachingSupplier.java b/Util/src/main/java/io/deephaven/util/datastructures/CachingSupplier.java
@@ -1,6 +1,6 @@
-/**
- * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
- */
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
 package io.deephaven.util.datastructures;
 
 import org.jetbrains.annotations.NotNull;

diff --git a/engine/context/src/main/java/io/deephaven/engine/context/QueryCompilerRequest.java b/engine/context/src/main/java/io/deephaven/engine/context/QueryCompilerRequest.java
@@ -1,6 +1,6 @@
-/**
- * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
- */
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
 package io.deephaven.engine.context;
 
 import io.deephaven.annotations.BuildableStyle;

diff --git a/...e/context/src/main/java/io/deephaven/engine/context/util/SynchronizedJavaFileManager.java b/...e/context/src/main/java/io/deephaven/engine/context/util/SynchronizedJavaFileManager.java
@@ -1,10 +1,12 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
 package io.deephaven.engine.context.util;
 
 import javax.tools.FileObject;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 import java.util.Set;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryCompilerRequestProcessor.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryCompilerRequestProcessor.java
@@ -1,6 +1,6 @@
-/**
- * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
- */
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.UncheckedDeephavenException;

diff --git a/...va/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java b/...va/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java
@@ -164,8 +164,8 @@ public CharRollingFormulaOperator(
             @NotNull final TableDefinition tableDef,
             @NotNull final Supplier<Map<String, Object>> queryScopeVariables,
             @NotNull final QueryCompilerRequestProcessor compilationProcessor
-            // region extra-constructor-args
-            // endregion extra-constructor-args
+    // region extra-constructor-args
+    // endregion extra-constructor-args
     ) {
         super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, formula,
                 paramToken, formulaColumnMap, tableDef, queryScopeVariables, compilationProcessor);