From ef308a7b2f0e89506f0bc19252922553f133eca1 Mon Sep 17 00:00:00 2001 From: Nathaniel Bauernfeind Date: Thu, 7 Mar 2024 10:17:25 -0700 Subject: [PATCH] Rebase --- .../main/java/io/deephaven/util/CompletionStageFuture.java | 6 +++--- .../java/io/deephaven/util/CompletionStageFutureImpl.java | 6 +++--- .../io/deephaven/util/datastructures/CachingSupplier.java | 6 +++--- .../io/deephaven/engine/context/QueryCompilerRequest.java | 6 +++--- .../engine/context/util/SynchronizedJavaFileManager.java | 4 +++- .../engine/table/impl/QueryCompilerRequestProcessor.java | 6 +++--- .../updateby/rollingformula/CharRollingFormulaOperator.java | 4 ++-- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Util/src/main/java/io/deephaven/util/CompletionStageFuture.java b/Util/src/main/java/io/deephaven/util/CompletionStageFuture.java index c410765e187..87eeaf57151 100644 --- 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 index d0ebef551fe..59884161404 100644 --- 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 index 62a60707d4c..0a0880f7896 100644 --- 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 index 38be0b97fe4..6f7608fa5ef 100644 --- 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/engine/context/src/main/java/io/deephaven/engine/context/util/SynchronizedJavaFileManager.java b/engine/context/src/main/java/io/deephaven/engine/context/util/SynchronizedJavaFileManager.java index 80a4d0c1667..d03a5bfdb81 100644 --- a/engine/context/src/main/java/io/deephaven/engine/context/util/SynchronizedJavaFileManager.java +++ b/engine/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 index 99db140e0f4..08f3cac184d 100644 --- 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/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java index 73dd6d03370..86a490caf42 100644 --- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java +++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java @@ -164,8 +164,8 @@ public CharRollingFormulaOperator( @NotNull final TableDefinition tableDef, @NotNull final Supplier> 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);