From 579802c5bc9fa7cdfff7d963505654d5e51cf336 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 4 Dec 2024 13:04:36 +0100 Subject: [PATCH] org.jetbrains.kotlinx.dataframe.io.Csv clashes with CSV on windows... --- dataframe-csv/api/dataframe-csv.api | 4 ++-- .../src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt | 2 +- .../src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt | 2 +- .../org.jetbrains.kotlinx.dataframe.io.SupportedFormat | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dataframe-csv/api/dataframe-csv.api b/dataframe-csv/api/dataframe-csv.api index 042b58ccf1..6e467c27d4 100644 --- a/dataframe-csv/api/dataframe-csv.api +++ b/dataframe-csv/api/dataframe-csv.api @@ -48,7 +48,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/CompressionKt { public static final fun useDecompressed (Ljava/io/InputStream;Lorg/jetbrains/kotlinx/dataframe/io/Compression;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; } -public final class org/jetbrains/kotlinx/dataframe/io/Csv : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat { +public final class org/jetbrains/kotlinx/dataframe/io/CsvDeephaven : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat { public fun ()V public fun (C)V public synthetic fun (CILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -140,7 +140,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/ToTsvStrKt { public static synthetic fun toTsvStr$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;ZCLjava/lang/Character;Lorg/jetbrains/kotlinx/dataframe/io/QuoteMode;Ljava/lang/Character;Ljava/lang/Character;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String; } -public final class org/jetbrains/kotlinx/dataframe/io/Tsv : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat { +public final class org/jetbrains/kotlinx/dataframe/io/TsvDeephaven : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat { public fun ()V public fun (C)V public synthetic fun (CILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt index 165bf2e781..740abf10e4 100644 --- a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt +++ b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt @@ -10,7 +10,7 @@ import java.io.File import java.io.InputStream import kotlin.reflect.typeOf -public class Csv(private val delimiter: Char = DelimParams.CSV_DELIMITER) : SupportedDataFrameFormat { +public class CsvDeephaven(private val delimiter: Char = DelimParams.CSV_DELIMITER) : SupportedDataFrameFormat { override fun readDataFrame(stream: InputStream, header: List): DataFrame<*> = DataFrame.readCsv(inputStream = stream, header = header) diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt index 8213b0d43f..4d349aad72 100644 --- a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt +++ b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt @@ -10,7 +10,7 @@ import java.io.File import java.io.InputStream import kotlin.reflect.typeOf -public class Tsv(private val delimiter: Char = DelimParams.TSV_DELIMITER) : SupportedDataFrameFormat { +public class TsvDeephaven(private val delimiter: Char = DelimParams.TSV_DELIMITER) : SupportedDataFrameFormat { override fun readDataFrame(stream: InputStream, header: List): DataFrame<*> = DataFrame.readTsv(inputStream = stream, header = header) diff --git a/dataframe-csv/src/main/resources/META-INF/services/org.jetbrains.kotlinx.dataframe.io.SupportedFormat b/dataframe-csv/src/main/resources/META-INF/services/org.jetbrains.kotlinx.dataframe.io.SupportedFormat index ebcae7710f..9934f2e7d6 100644 --- a/dataframe-csv/src/main/resources/META-INF/services/org.jetbrains.kotlinx.dataframe.io.SupportedFormat +++ b/dataframe-csv/src/main/resources/META-INF/services/org.jetbrains.kotlinx.dataframe.io.SupportedFormat @@ -1,2 +1,2 @@ -org.jetbrains.kotlinx.dataframe.io.Csv -org.jetbrains.kotlinx.dataframe.io.Tsv +org.jetbrains.kotlinx.dataframe.io.CsvDeephaven +org.jetbrains.kotlinx.dataframe.io.TsvDeephaven