diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04415474..3c9feb2f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: uses: actions/delete-package-versions@v4 with: package-version-ids: ${{ env.project_version }} - package-name: 'io.github.paulgriffith.kindling' + package-name: 'io.github.inductiveautomation.kindling' package-type: 'maven' continue-on-error: true - name: Publish to Github Packages diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 56d883dc..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: Release new version upon tag commit -on: - push: - tags: - - '[0-9].[0-9].[0-9]' -jobs: - build: - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: 17 - cache: 'gradle' - - name: Execute Gradle build, JPackage - run: './gradlew -Pversion="${{github.ref_name}}" build jpackage' - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.os }} - path: | - build/jpackage/*.deb - build/jpackage/*.rpm - build/jpackage/*.exe - build/jpackage/*.msi - - name: Upload jar - if: ${{ matrix.os == 'ubuntu-latest' }} - uses: actions/upload-artifact@v3 - with: - name: fatjar - path: build/libs/kindling-bundle.jar - - name: Publish to Github packages - if: ${{ matrix.os == 'ubuntu-latest' }} - run: './gradlew -Pversion="${{github.ref_name}}" publish' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - release: - runs-on: ubuntu-latest - needs: [build] - steps: - - uses: actions/checkout@v3 - - name: Download Linux Artifacts - uses: actions/download-artifact@v3 - with: - name: ubuntu-latest - path: artifacts - - name: Download Windows Artifacts - uses: actions/download-artifact@v3 - with: - name: windows-latest - path: artifacts - - name: Download bundle jar - uses: actions/download-artifact@v3 - with: - name: fatjar - - name: Display structure of downloaded files - run: ls -R - - name: Create Release - uses: marvinpinto/action-automatic-releases@latest - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - prerelease: false - files: | - artifacts/* - kindling-bundle.jar - - name: Set package version - run: npm --no-git-tag-version version ${{github.ref_name}} - - name: Build App Installer Bundles - uses: shannah/jdeploy@4.0.20 - with: - github_token: ${{ github.token }} diff --git a/.gitignore b/.gitignore index 70bb55af..d415a3c6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,5 @@ .idea/ **build/ -jdeploy/ -jdeploy-bundle/ + +output/ diff --git a/NOTICES b/NOTICES new file mode 100644 index 00000000..92777a9c --- /dev/null +++ b/NOTICES @@ -0,0 +1,31 @@ +NOTICES + +This repository incorporates material as listed below or described in the code. + +### Build Dependencies +- Java - GPL license 2.0 +- Kotlin - Apache License 2.0 - https://github.com/JetBrains/kotlin/blob/master/license/LICENSE.txt + - Kotlin Coroutines - Apache License 2.0 - https://github.com/Kotlin/kotlinx.coroutines/blob/master/LICENSE.txt + - Kotlin Serialization - Apache License 2.0 - https://github.com/Kotlin/kotlinx.serialization/blob/master/LICENSE.txt +- Gradle - Apache License 2.0 - https://docs.gradle.org/current/userguide/licenses.html +- Ktlint Gradle Plugin - MIT License - https://github.com/JLLeitschuh/ktlint-gradle/blob/master/LICENSE.txt +- Ktlint - MIT License - https://github.com/pinterest/ktlint/blob/master/LICENSE + +### Core Dependencies +- FlatLaf - Apache License 2.0 - https://github.com/JFormDesigner/FlatLaf/blob/main/LICENSE +- SQLite - Public Domain - https://www.sqlite.org/copyright.html +- Xerial JDBC Driver - Apache License 2.0 - https://github.com/xerial/sqlite-jdbc/blob/master/LICENSE +- Logback - Eclipse Public License 1.0 - https://logback.qos.ch/license.html +- HyperSQL - Modified BSD License - https://hsqldb.org/web/hsqlLicense.html +- ExcelKt - MIT License - https://github.com/evanrupert/ExcelKt/blob/master/LICENSE +- MigLayout - BSD License - http://miglayout.com/ +- SvgSalamander - BSD License - https://github.com/JFormDesigner/svgSalamander/blob/master/licenses/license-BSD.txt +- Jide Common Layer - GPL with classpath exception - http://www.jidesoft.com/products/oss.htm +- JSystemThemeDetector - Apache License 2.0 - https://github.com/Dansoftowner/jSystemThemeDetector/blob/master/LICENSE +- RSyntaxTextArea - BSD 3-Clause - https://github.com/bobbylight/RSyntaxTextArea/blob/master/LICENSE.md + +### Test Dependencies +- Kotest - Apache License 2.0 - https://github.com/kotest/kotest/blob/master/LICENSE + +### Assets +- BoxIcons - MIT License - https://boxicons.com/usage#license diff --git a/build.gradle.kts b/build.gradle.kts index 97652f76..0d1d4eb7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,15 +1,11 @@ -import org.gradle.internal.os.OperatingSystem import org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE -import java.time.LocalDate plugins { alias(libs.plugins.kotlin) alias(libs.plugins.serialization) alias(libs.plugins.ktlint) + alias(libs.plugins.conveyor) application - alias(libs.plugins.shadow) - alias(libs.plugins.runtime) - `maven-publish` } apply { @@ -58,39 +54,16 @@ dependencies { testImplementation(libs.bundles.kotest) } -group = "io.github.paulgriffith" +group = "io.github.inductiveautomation" application { - mainClass.set("io.github.paulgriffith.kindling.MainPanel") + mainClass.set("io.github.inductiveautomation.kindling.MainPanel") } tasks { test { useJUnitPlatform() } - - val cleanupJDeploy by registering(Delete::class) { - delete("jdeploy", "jdeploy-bundle") - } - clean { - finalizedBy(cleanupJDeploy) - } - - shadowJar { - manifest { - attributes["Main-Class"] = "io.github.paulgriffith.kindling.MainPanel" - } - archiveBaseName.set("kindling-bundle") - archiveClassifier.set("") - archiveVersion.set("") - mergeServiceFiles() - } - - register("printVersion") { - doLast { // add a task action - println(project.version) - } - } } kotlin { @@ -102,78 +75,3 @@ ktlint { reporter(CHECKSTYLE) } } - -runtime { - options.set(listOf("--strip-debug", "--compress", "2", "--no-header-files", "--no-man-pages")) - - modules.set( - listOf( - "java.desktop", - "java.sql", - "java.logging", - "java.naming", - "java.xml", - "jdk.zipfs", - ), - ) - - jpackage { - val currentOs = OperatingSystem.current() - val imgType = if (currentOs.isWindows) "ico" else "png" - appVersion = project.version.toString() - imageOptions = listOf("--icon", "src/main/resources/icons/ignition.$imgType") - val options: Map = buildMap { - put("resource-dir", "src/main/resources") - put("vendor", "Paul Griffith") - put("copyright", LocalDate.now().year.toString()) - put("description", "A collection of useful tools for troubleshooting Ignition") - - when { - currentOs.isWindows -> { - put("win-per-user-install", null) - put("win-dir-chooser", null) - put("win-menu", null) - put("win-shortcut", null) - // random (consistent) UUID makes upgrades smoother - put("win-upgrade-uuid", "8e7428c8-bbc6-460a-9995-db6d8b04a690") - } - - currentOs.isLinux -> { - put("linux-shortcut", null) - } - } - } - - // add-exports is used to bypass Java modular restrictions - jvmArgs = listOf("--add-exports", "java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED") - - installerOptions = options.flatMap { (key, value) -> - listOfNotNull("--$key", value) - } - - imageName = "kindling" - installerName = "kindling" - mainJar = "kindling-bundle.jar" - } -} - -configure { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/paul-griffith/kindling") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } - publications { - register("gpr") { - from(components["kotlin"]) - pom { - description.set("Kindling core API and first-party tools, packaged for ease of extension by third parties.") - } - } - } -} diff --git a/buildSrc/Dockerfile b/buildSrc/Dockerfile new file mode 100644 index 00000000..7c382abe --- /dev/null +++ b/buildSrc/Dockerfile @@ -0,0 +1,6 @@ +FROM debian:latest + +RUN wget https://downloads.hydraulic.dev/conveyor/hydraulic-conveyor_8.1_amd64.deb \ + && apt install ./hydraulic-conveyor_8.1_amd64.deb + +ENTRYPOINT /bin/sh diff --git a/ci.conveyor.conf b/ci.conveyor.conf new file mode 100644 index 00000000..2bff0381 --- /dev/null +++ b/ci.conveyor.conf @@ -0,0 +1,14 @@ +include required("conveyor.conf") + +app { + signing-key = ${env.SIGNING_KEY} + + mac.certificate = apple.cer + windows.certificate = windows.cer + + mac.notarization { + app-specific-password = ${env.APPLE_ASP} + team-id = TODO + apple-id = "TODO" + } +} diff --git a/conveyor.conf b/conveyor.conf new file mode 100644 index 00000000..5acf1223 --- /dev/null +++ b/conveyor.conf @@ -0,0 +1,35 @@ +// This is a hashbang include. You can run the command after the #! to see what +// configuration is being extracted from the Gradle build using the Conveyor plugin. +include "#!./gradlew -q printConveyorConfig" + +include required("https://raw.githubusercontent.com/hydraulic-software/conveyor/master/configs/jvm/extract-native-libraries.conf") + +app { + version = "1.0.0" + // The base URL is where the download site will be placed. Packages will check here for updates. + site.base-url = "localhost:3000" + + // This is optional. If not specified the last component of the rdns name will be turned into a display name. + display-name = "Kindling" + + // A global identifier for the app. + rdns-name = "io.github.inductiveautomation.kindling" + + jvm { + modules += java.desktop + modules += java.sql + modules += java.logging + modules += java.naming + modules += java.xml + modules += jdk.zipfs + + options += "--add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED" + options += "--add-exports=java.base/sun.security.action=ALL-UNNAMED" + options += "--add-exports=java.desktop/apple.laf=ALL-UNNAMED" + options += "--add-reads=com.formdev.flatlaf.extras=ALL-UNNAMED" + } + + // icons = "icons/icon.svg" +} + +conveyor.compatibility-level = 8 diff --git a/gradle.properties b/gradle.properties index 48c605d8..d61f9ede 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version=0.6.2-SNAPSHOT +version=1.0.0-SNAPSHOT org.gradle.jvmargs=-Xmx2G diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b4569c89..ffd3d917 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] java = "17" kotlin = "1.8.21" -coroutines = "1.6.4" +coroutines = "1.7.0-RC" flatlaf = "3.1.1" kotest = "5.6.1" ignition = "8.1.1" @@ -9,9 +9,8 @@ ignition = "8.1.1" [plugins] kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +conveyor = { id = "dev.hydraulic.conveyor", version = "1.5" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.3.2" } -shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } -runtime = { id = "org.beryx.runtime", version = "1.13.0" } [libraries] # core functionality @@ -35,7 +34,7 @@ flatlaf-jide = { group = "com.formdev", name = "flatlaf-jide-oss", version.ref = flatlaf-swingx = { group = "com.formdev", name = "flatlaf-swingx", version.ref = "flatlaf" } svgSalamander = { group = "com.formdev", name = "svgSalamander", version = "1.1.4" } jide-common = { group = "com.formdev", name = "jide-oss", version = "3.7.12" } -swingx = { group = "org.swinglabs.swingx", name = "swingx-core", version = "1.6.5-1" } +swingx = { group = "org.swinglabs.swingx", name = "swingx-all", version = "1.6.5-1" } osthemedetector = { group = "com.github.Dansoftowner", name = "jSystemThemeDetector", version = "3.8" } rsyntaxtextarea = { group = "com.fifesoft", name = "rsyntaxtextarea", version = "3.3.3" } jfreechart = { group = "org.jfree", name = "jfreechart", version = "1.5.4" } diff --git a/readme.md b/readme.md index da6446f1..7ff937d2 100644 --- a/readme.md +++ b/readme.md @@ -7,14 +7,15 @@ to help work with Ignition's custom data export formats. ### Thread Viewer -Parses Ignition thread dump .json files (generated by all Ignition mechanisms since 8.1.10). +Parses Ignition thread dump files, in JSON or plain text format. ### IDB Viewer Opens Ignition .idb files and displays a list of tables and allows arbitrary SQL queries to be executed. -If the file is detected as an Ignition log or metrics file, opens a custom view automatically. Right-click the tab to -switch between IDB views. +Has special handling for: +- Metrics files +- System logs ### Log Viewer @@ -37,43 +38,26 @@ Note: If you encounter any issues with missing classes, please file an issue. ## Usage -Download the hosted installer from [JDeploy](https://www.jdeploy.com/~ignition-kindling) here. These installers allow -for auto-updating upon launch. -If you prefer an offline installation, or to avoid JDeploy, you can also download native installers from -the [Releases page](https://github.com/paul-griffith/kindling/releases). +TODO ## Development Kindling uses Java Swing as a GUI framework, but is written almost exclusively in Kotlin, an alternate JVM language. Gradle is used as the build tool, and will automatically download the appropriate Gradle and Java version (via the Gradle wrapper). Most IDEs (Eclipse, IntelliJ) should figure out the project structure automatically. You can directly -run the main class in your IDE ([`MainPanel`](src/main/kotlin/io/github/paulgriffith/kindling/MainPanel.kt)), or you +run the main class in your IDE ([`MainPanel`](src/main/kotlin/io/github/inductiveautomation/kindling/MainPanel.kt)), or you can run the application via`./gradlew run` at the command line. -## Extension - -Kindling uses -the [`ServiceLoader`](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ServiceLoader.html) -mechanism to register tools. Simply provide an implementation -of [`io.github.paulgriffith.kindling.core.Tool`](src/main/kotlin/io/github/paulgriffith/kindling/core/Tool.kt) (or -any of its extensions), appropriately registered on the classpath, to add tools at runtime. - ## Contribution Contributions of any kind (additional tools, polish to existing tools, test files) are welcome. -## Releases - -New tags pushed to GitHub will automatically trigger an action-based deployment of the given version, which will trigger -JDeploy to fetch the new version upon next launch. Offline installers (created using jpackage) are also available for -Windows and Linux. - ## Acknowledgements - [BoxIcons](https://github.com/atisawd/boxicons) - [FlatLaf](https://github.com/JFormDesigner/FlatLaf) - [SerializationDumper](https://github.com/NickstaDB/SerializationDumper) -- [JDeploy](https://www.jdeploy.com/) +- [Hydraulic Conveyor](https://www.hydraulic.software/) ## Disclaimer diff --git a/settings.gradle.kts b/settings.gradle.kts index 232f397b..419f1290 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,6 +3,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { repositories { gradlePluginPortal() + maven("https://maven.hq.hydraulic.software") } } diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/MainPanel.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/MainPanel.kt similarity index 90% rename from src/main/kotlin/io/github/paulgriffith/kindling/MainPanel.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/MainPanel.kt index b0140b97..94dbc358 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/MainPanel.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/MainPanel.kt @@ -1,21 +1,21 @@ -package io.github.paulgriffith.kindling +package io.github.inductiveautomation.kindling import com.formdev.flatlaf.extras.FlatSVGIcon import com.formdev.flatlaf.extras.FlatUIDefaultsInspector import com.formdev.flatlaf.extras.components.FlatTextArea -import io.github.paulgriffith.kindling.core.ClipboardTool -import io.github.paulgriffith.kindling.core.CustomIconView -import io.github.paulgriffith.kindling.core.Kindling -import io.github.paulgriffith.kindling.core.MultiTool -import io.github.paulgriffith.kindling.core.Tool -import io.github.paulgriffith.kindling.core.ToolOpeningException -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.internal.FileTransferHandler -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.TabStrip -import io.github.paulgriffith.kindling.utils.chooseFiles -import io.github.paulgriffith.kindling.utils.getLogger +import io.github.inductiveautomation.kindling.core.ClipboardTool +import io.github.inductiveautomation.kindling.core.CustomIconView +import io.github.inductiveautomation.kindling.core.Kindling +import io.github.inductiveautomation.kindling.core.MultiTool +import io.github.inductiveautomation.kindling.core.Tool +import io.github.inductiveautomation.kindling.core.ToolOpeningException +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.internal.FileTransferHandler +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.TabStrip +import io.github.inductiveautomation.kindling.utils.chooseFiles +import io.github.inductiveautomation.kindling.utils.getLogger import net.miginfocom.layout.PlatformDefaults import net.miginfocom.layout.UnitValue import net.miginfocom.swing.MigLayout diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/AliasingObjectInputStream.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/AliasingObjectInputStream.kt similarity index 95% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/AliasingObjectInputStream.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/AliasingObjectInputStream.kt index 7c5ea1c9..453727c5 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/AliasingObjectInputStream.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/AliasingObjectInputStream.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.cache +package io.github.inductiveautomation.kindling.cache import java.io.InputStream import java.io.ObjectInputStream diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheEntry.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheEntry.kt similarity index 76% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheEntry.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheEntry.kt index b1c8a8f7..225b55e4 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheEntry.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheEntry.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.cache +package io.github.inductiveautomation.kindling.cache data class CacheEntry( val id: Int, diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheModel.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheModel.kt similarity index 88% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheModel.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheModel.kt index edb1ced8..44fc116c 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheModel.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheModel.kt @@ -1,7 +1,7 @@ -package io.github.paulgriffith.kindling.cache +package io.github.inductiveautomation.kindling.cache -import io.github.paulgriffith.kindling.utils.Column -import io.github.paulgriffith.kindling.utils.ColumnList +import io.github.inductiveautomation.kindling.utils.Column +import io.github.inductiveautomation.kindling.utils.ColumnList import org.jdesktop.swingx.renderer.DefaultTableRenderer import javax.swing.table.AbstractTableModel diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheView.kt similarity index 92% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheView.kt index a80df3be..8a670b9b 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/CacheView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/CacheView.kt @@ -1,28 +1,28 @@ -package io.github.paulgriffith.kindling.cache +package io.github.inductiveautomation.kindling.cache import com.formdev.flatlaf.extras.FlatSVGIcon import com.formdev.flatlaf.extras.components.FlatPopupMenu import com.inductiveautomation.ignition.gateway.history.BasicHistoricalRecord import com.inductiveautomation.ignition.gateway.history.ScanclassHistorySet import com.jidesoft.swing.JideButton -import io.github.paulgriffith.kindling.cache.model.AlarmJournalData -import io.github.paulgriffith.kindling.cache.model.AlarmJournalSFGroup -import io.github.paulgriffith.kindling.cache.model.AuditProfileData -import io.github.paulgriffith.kindling.cache.model.ScriptedSFData -import io.github.paulgriffith.kindling.core.Detail -import io.github.paulgriffith.kindling.core.DetailsPane -import io.github.paulgriffith.kindling.core.Tool -import io.github.paulgriffith.kindling.core.ToolOpeningException -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.EDT_SCOPE -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.ReifiedJXTable -import io.github.paulgriffith.kindling.utils.getLogger -import io.github.paulgriffith.kindling.utils.getValue -import io.github.paulgriffith.kindling.utils.jFrame -import io.github.paulgriffith.kindling.utils.selectedRowIndices -import io.github.paulgriffith.kindling.utils.toList +import io.github.inductiveautomation.kindling.cache.model.AlarmJournalData +import io.github.inductiveautomation.kindling.cache.model.AlarmJournalSFGroup +import io.github.inductiveautomation.kindling.cache.model.AuditProfileData +import io.github.inductiveautomation.kindling.cache.model.ScriptedSFData +import io.github.inductiveautomation.kindling.core.Detail +import io.github.inductiveautomation.kindling.core.DetailsPane +import io.github.inductiveautomation.kindling.core.Tool +import io.github.inductiveautomation.kindling.core.ToolOpeningException +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.EDT_SCOPE +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.ReifiedJXTable +import io.github.inductiveautomation.kindling.utils.getLogger +import io.github.inductiveautomation.kindling.utils.getValue +import io.github.inductiveautomation.kindling.utils.jFrame +import io.github.inductiveautomation.kindling.utils.selectedRowIndices +import io.github.inductiveautomation.kindling.utils.toList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/SchemaFilterList.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/SchemaFilterList.kt similarity index 93% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/SchemaFilterList.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/SchemaFilterList.kt index 296a06bd..bcff415c 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/SchemaFilterList.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/SchemaFilterList.kt @@ -1,7 +1,7 @@ -package io.github.paulgriffith.kindling.cache +package io.github.inductiveautomation.kindling.cache import com.jidesoft.swing.CheckBoxList -import io.github.paulgriffith.kindling.utils.listCellRenderer +import io.github.inductiveautomation.kindling.utils.listCellRenderer import java.awt.Font import java.awt.Font.MONOSPACED import javax.swing.AbstractListModel diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/SchemaModel.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/SchemaModel.kt similarity index 78% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/SchemaModel.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/SchemaModel.kt index 27f4ecdc..4e01a81a 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/SchemaModel.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/SchemaModel.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.cache +package io.github.inductiveautomation.kindling.cache data class SchemaRecord( val id: Int, diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/model/AlarmJournalData.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/AlarmJournalData.kt similarity index 92% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/model/AlarmJournalData.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/AlarmJournalData.kt index 89bde684..61b1dab5 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/model/AlarmJournalData.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/AlarmJournalData.kt @@ -1,8 +1,8 @@ -package io.github.paulgriffith.kindling.cache.model +package io.github.inductiveautomation.kindling.cache.model import com.inductiveautomation.ignition.common.alarming.EventData import com.inductiveautomation.ignition.common.alarming.evaluation.EventPropertyType -import io.github.paulgriffith.kindling.core.Detail +import io.github.inductiveautomation.kindling.core.Detail import java.io.Serializable import java.util.EnumSet @@ -73,6 +73,6 @@ class AlarmJournalSFGroup( companion object { @JvmStatic - private val serialVersionUID = -1_199_203_578_454_144_713L + private val serialVersionUID = -1199203578454144713L } } diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/model/AuditProfileData.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/AuditProfileData.kt similarity index 90% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/model/AuditProfileData.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/AuditProfileData.kt index 97549853..5568a033 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/model/AuditProfileData.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/AuditProfileData.kt @@ -1,7 +1,7 @@ -package io.github.paulgriffith.kindling.cache.model +package io.github.inductiveautomation.kindling.cache.model import com.inductiveautomation.ignition.gateway.audit.AuditRecord -import io.github.paulgriffith.kindling.core.Detail +import io.github.inductiveautomation.kindling.core.Detail import java.io.Serializable @Suppress("unused") diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/cache/model/ScriptedSFData.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/ScriptedSFData.kt similarity index 84% rename from src/main/kotlin/io/github/paulgriffith/kindling/cache/model/ScriptedSFData.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/ScriptedSFData.kt index cac927f4..8586c8ec 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/cache/model/ScriptedSFData.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/cache/model/ScriptedSFData.kt @@ -1,6 +1,6 @@ -package io.github.paulgriffith.kindling.cache.model +package io.github.inductiveautomation.kindling.cache.model -import io.github.paulgriffith.kindling.core.Detail +import io.github.inductiveautomation.kindling.core.Detail import java.io.Serializable @Suppress("unused") diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/core/CustomIconView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/core/CustomIconView.kt similarity index 89% rename from src/main/kotlin/io/github/paulgriffith/kindling/core/CustomIconView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/core/CustomIconView.kt index 27824994..0517048e 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/core/CustomIconView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/core/CustomIconView.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.core +package io.github.inductiveautomation.kindling.core import java.io.File import javax.swing.Icon diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/core/Detail.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/core/Detail.kt similarity index 85% rename from src/main/kotlin/io/github/paulgriffith/kindling/core/Detail.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/core/Detail.kt index 243ccf27..48db2359 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/core/Detail.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/core/Detail.kt @@ -1,6 +1,6 @@ -package io.github.paulgriffith.kindling.core +package io.github.inductiveautomation.kindling.core -import io.github.paulgriffith.kindling.core.Detail.BodyLine +import io.github.inductiveautomation.kindling.core.Detail.BodyLine data class Detail( val title: String, diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/core/DetailsPane.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/core/DetailsPane.kt similarity index 95% rename from src/main/kotlin/io/github/paulgriffith/kindling/core/DetailsPane.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/core/DetailsPane.kt index 6b8d8e5a..d1830dbc 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/core/DetailsPane.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/core/DetailsPane.kt @@ -1,11 +1,11 @@ -package io.github.paulgriffith.kindling.core +package io.github.inductiveautomation.kindling.core import com.formdev.flatlaf.extras.FlatSVGIcon import com.formdev.flatlaf.extras.components.FlatTextPane -import io.github.paulgriffith.kindling.internal.DetailsIcon -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.escapeHtml +import io.github.inductiveautomation.kindling.internal.DetailsIcon +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.escapeHtml import net.miginfocom.swing.MigLayout import java.awt.Component import java.awt.Desktop diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/core/Kindling.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/core/Kindling.kt similarity index 98% rename from src/main/kotlin/io/github/paulgriffith/kindling/core/Kindling.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/core/Kindling.kt index 8b87349b..01e36b80 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/core/Kindling.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/core/Kindling.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.core +package io.github.inductiveautomation.kindling.core import com.formdev.flatlaf.FlatDarkLaf import com.formdev.flatlaf.FlatLaf diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/core/Tool.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/core/Tool.kt similarity index 76% rename from src/main/kotlin/io/github/paulgriffith/kindling/core/Tool.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/core/Tool.kt index 591ea39d..1f6563b6 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/core/Tool.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/core/Tool.kt @@ -1,13 +1,13 @@ -package io.github.paulgriffith.kindling.core +package io.github.inductiveautomation.kindling.core import com.formdev.flatlaf.extras.FlatSVGIcon -import io.github.paulgriffith.kindling.cache.CacheViewer -import io.github.paulgriffith.kindling.idb.IdbViewer -import io.github.paulgriffith.kindling.log.LogViewer -import io.github.paulgriffith.kindling.thread.MultiThreadViewer -import io.github.paulgriffith.kindling.utils.FileExtensionFilter -import io.github.paulgriffith.kindling.utils.loadService -import io.github.paulgriffith.kindling.zip.ZipViewer +import io.github.inductiveautomation.kindling.cache.CacheViewer +import io.github.inductiveautomation.kindling.idb.IdbViewer +import io.github.inductiveautomation.kindling.log.LogViewer +import io.github.inductiveautomation.kindling.thread.MultiThreadViewer +import io.github.inductiveautomation.kindling.utils.FileExtensionFilter +import io.github.inductiveautomation.kindling.utils.loadService +import io.github.inductiveautomation.kindling.zip.ZipViewer import java.io.File import java.nio.file.Path import javax.swing.filechooser.FileFilter diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/core/ToolPanel.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/core/ToolPanel.kt similarity index 85% rename from src/main/kotlin/io/github/paulgriffith/kindling/core/ToolPanel.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/core/ToolPanel.kt index 00641406..9079f155 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/core/ToolPanel.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/core/ToolPanel.kt @@ -1,12 +1,12 @@ -package io.github.paulgriffith.kindling.core +package io.github.inductiveautomation.kindling.core -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.FileExtensionFilter -import io.github.paulgriffith.kindling.utils.FloatableComponent -import io.github.paulgriffith.kindling.utils.PopupMenuCustomizer -import io.github.paulgriffith.kindling.utils.Properties -import io.github.paulgriffith.kindling.utils.exportToCSV -import io.github.paulgriffith.kindling.utils.exportToXLSX +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.FileExtensionFilter +import io.github.inductiveautomation.kindling.utils.FloatableComponent +import io.github.inductiveautomation.kindling.utils.PopupMenuCustomizer +import io.github.inductiveautomation.kindling.utils.Properties +import io.github.inductiveautomation.kindling.utils.exportToCSV +import io.github.inductiveautomation.kindling.utils.exportToXLSX import net.miginfocom.swing.MigLayout import java.io.File import javax.swing.Icon diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/IdbView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/IdbView.kt similarity index 88% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/IdbView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/IdbView.kt index 698724b8..49f58224 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/IdbView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/IdbView.kt @@ -1,16 +1,16 @@ -package io.github.paulgriffith.kindling.idb +package io.github.inductiveautomation.kindling.idb import com.formdev.flatlaf.extras.FlatSVGIcon -import io.github.paulgriffith.kindling.core.Tool -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.idb.generic.GenericView -import io.github.paulgriffith.kindling.idb.metrics.MetricsView -import io.github.paulgriffith.kindling.log.Level -import io.github.paulgriffith.kindling.log.LogPanel -import io.github.paulgriffith.kindling.log.SystemLogsEvent -import io.github.paulgriffith.kindling.utils.SQLiteConnection -import io.github.paulgriffith.kindling.utils.TabStrip -import io.github.paulgriffith.kindling.utils.toList +import io.github.inductiveautomation.kindling.core.Tool +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.idb.generic.GenericView +import io.github.inductiveautomation.kindling.idb.metrics.MetricsView +import io.github.inductiveautomation.kindling.log.Level +import io.github.inductiveautomation.kindling.log.LogPanel +import io.github.inductiveautomation.kindling.log.SystemLogsEvent +import io.github.inductiveautomation.kindling.utils.SQLiteConnection +import io.github.inductiveautomation.kindling.utils.TabStrip +import io.github.inductiveautomation.kindling.utils.toList import java.nio.file.Path import java.sql.Connection import java.time.Instant diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/ImagesTab.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/ImagesTab.kt similarity index 91% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/ImagesTab.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/ImagesTab.kt index 997c1eb7..6fe0a7af 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/ImagesTab.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/ImagesTab.kt @@ -1,12 +1,12 @@ -package io.github.paulgriffith.kindling.idb +package io.github.inductiveautomation.kindling.idb import com.inductiveautomation.ignition.gateway.images.ImageFormat -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.utils.AbstractTreeNode -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.TypedTreeNode -import io.github.paulgriffith.kindling.utils.toList -import io.github.paulgriffith.kindling.utils.treeCellRenderer +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.utils.AbstractTreeNode +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.TypedTreeNode +import io.github.inductiveautomation.kindling.utils.toList +import io.github.inductiveautomation.kindling.utils.treeCellRenderer import java.awt.Dimension import java.sql.Connection import javax.imageio.ImageIO diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/Column.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/Column.kt similarity index 92% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/Column.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/Column.kt index 08cbf503..cf86c69a 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/Column.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/Column.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.idb.generic +package io.github.inductiveautomation.kindling.idb.generic import java.util.Collections import java.util.Enumeration diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/DBMetaDataTree.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/DBMetaDataTree.kt similarity index 93% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/DBMetaDataTree.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/DBMetaDataTree.kt index 2241fc0e..85edcd5e 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/DBMetaDataTree.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/DBMetaDataTree.kt @@ -1,11 +1,11 @@ -package io.github.paulgriffith.kindling.idb.generic +package io.github.inductiveautomation.kindling.idb.generic import com.formdev.flatlaf.extras.FlatSVGIcon import com.formdev.flatlaf.extras.components.FlatTree import com.jidesoft.swing.StyledLabelBuilder import com.jidesoft.swing.TreeSearchable -import io.github.paulgriffith.kindling.utils.derive -import io.github.paulgriffith.kindling.utils.treeCellRenderer +import io.github.inductiveautomation.kindling.utils.derive +import io.github.inductiveautomation.kindling.utils.treeCellRenderer import java.awt.Font import javax.swing.UIManager import javax.swing.tree.TreeModel diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/GenericView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/GenericView.kt similarity index 93% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/GenericView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/GenericView.kt index 13522ce7..3431b125 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/GenericView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/GenericView.kt @@ -1,11 +1,11 @@ -package io.github.paulgriffith.kindling.idb.generic - -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.attachPopupMenu -import io.github.paulgriffith.kindling.utils.javaType -import io.github.paulgriffith.kindling.utils.toList +package io.github.inductiveautomation.kindling.idb.generic + +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.attachPopupMenu +import io.github.inductiveautomation.kindling.utils.javaType +import io.github.inductiveautomation.kindling.utils.toList import net.miginfocom.swing.MigLayout import java.awt.Dimension import java.awt.Toolkit diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/QueryResult.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/QueryResult.kt similarity index 93% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/QueryResult.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/QueryResult.kt index 2960705d..75d2da30 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/QueryResult.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/QueryResult.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.idb.generic +package io.github.inductiveautomation.kindling.idb.generic import javax.swing.table.AbstractTableModel diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/ResultsPanel.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/ResultsPanel.kt similarity index 89% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/ResultsPanel.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/ResultsPanel.kt index 3c15ab7e..0a979f6d 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/ResultsPanel.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/ResultsPanel.kt @@ -1,13 +1,13 @@ -package io.github.paulgriffith.kindling.idb.generic +package io.github.inductiveautomation.kindling.idb.generic import com.formdev.flatlaf.extras.FlatSVGIcon import com.inductiveautomation.ignition.common.util.csv.CSVWriter -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.ReifiedJXTable -import io.github.paulgriffith.kindling.utils.ReifiedLabelProvider.Companion.setDefaultRenderer -import io.github.paulgriffith.kindling.utils.selectedOrAllRowIndices -import io.github.paulgriffith.kindling.utils.toFileSizeLabel +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.ReifiedJXTable +import io.github.inductiveautomation.kindling.utils.ReifiedLabelProvider.Companion.setDefaultRenderer +import io.github.inductiveautomation.kindling.utils.selectedOrAllRowIndices +import io.github.inductiveautomation.kindling.utils.toFileSizeLabel import net.miginfocom.swing.MigLayout import java.awt.Toolkit import java.awt.datatransfer.StringSelection diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/Table.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/Table.kt similarity index 91% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/Table.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/Table.kt index c47f0bd5..e7f234fc 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/generic/Table.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/generic/Table.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.idb.generic +package io.github.inductiveautomation.kindling.idb.generic import java.util.Collections import java.util.Enumeration diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/Metric.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/Metric.kt similarity index 69% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/Metric.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/Metric.kt index 2477b7d6..5dc01f92 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/Metric.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/Metric.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.idb.metrics +package io.github.inductiveautomation.kindling.idb.metrics import java.util.Date diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricCard.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricCard.kt similarity index 87% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricCard.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricCard.kt index 58926790..95c0974f 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricCard.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricCard.kt @@ -1,12 +1,12 @@ -package io.github.paulgriffith.kindling.idb.metrics - -import io.github.paulgriffith.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Cpu -import io.github.paulgriffith.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Default -import io.github.paulgriffith.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Heap -import io.github.paulgriffith.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Queue -import io.github.paulgriffith.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Throughput -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.jFrame +package io.github.inductiveautomation.kindling.idb.metrics + +import io.github.inductiveautomation.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Cpu +import io.github.inductiveautomation.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Default +import io.github.inductiveautomation.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Heap +import io.github.inductiveautomation.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Queue +import io.github.inductiveautomation.kindling.idb.metrics.MetricCard.Companion.MetricPresentation.Throughput +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.jFrame import net.miginfocom.swing.MigLayout import org.jdesktop.swingx.border.DropShadowBorder import org.jfree.chart.ChartPanel diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricTree.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricTree.kt similarity index 92% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricTree.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricTree.kt index 861515ba..26cd04e2 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricTree.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricTree.kt @@ -1,9 +1,9 @@ -package io.github.paulgriffith.kindling.idb.metrics +package io.github.inductiveautomation.kindling.idb.metrics import com.jidesoft.swing.CheckBoxTree -import io.github.paulgriffith.kindling.utils.AbstractTreeNode -import io.github.paulgriffith.kindling.utils.TypedTreeNode -import io.github.paulgriffith.kindling.utils.treeCellRenderer +import io.github.inductiveautomation.kindling.utils.AbstractTreeNode +import io.github.inductiveautomation.kindling.utils.TypedTreeNode +import io.github.inductiveautomation.kindling.utils.treeCellRenderer import javax.swing.tree.DefaultTreeModel import javax.swing.tree.TreeNode import javax.swing.tree.TreePath diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricsView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricsView.kt similarity index 87% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricsView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricsView.kt index b281d65b..2262a32e 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/MetricsView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/MetricsView.kt @@ -1,9 +1,9 @@ -package io.github.paulgriffith.kindling.idb.metrics +package io.github.inductiveautomation.kindling.idb.metrics -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.utils.EDT_SCOPE -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.toList +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.utils.EDT_SCOPE +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.toList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/Sparkline.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/Sparkline.kt similarity index 89% rename from src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/Sparkline.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/Sparkline.kt index cf2184df..661fc3d7 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/idb/metrics/Sparkline.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/metrics/Sparkline.kt @@ -1,7 +1,7 @@ -package io.github.paulgriffith.kindling.idb.metrics +package io.github.inductiveautomation.kindling.idb.metrics -import io.github.paulgriffith.kindling.core.Kindling -import io.github.paulgriffith.kindling.idb.metrics.MetricCard.Companion.DATE_FORMAT +import io.github.inductiveautomation.kindling.core.Kindling +import io.github.inductiveautomation.kindling.idb.metrics.MetricCard.Companion.DATE_FORMAT import org.jfree.chart.ChartFactory import org.jfree.chart.JFreeChart import org.jfree.chart.axis.NumberAxis diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/internal/DetailsIcon.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/internal/DetailsIcon.kt similarity index 96% rename from src/main/kotlin/io/github/paulgriffith/kindling/internal/DetailsIcon.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/internal/DetailsIcon.kt index a5ae357a..e9a6729a 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/internal/DetailsIcon.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/internal/DetailsIcon.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.internal +package io.github.inductiveautomation.kindling.internal import com.formdev.flatlaf.extras.FlatSVGIcon import org.jdesktop.swingx.JXTable diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/internal/DetailsModel.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/internal/DetailsModel.kt similarity index 88% rename from src/main/kotlin/io/github/paulgriffith/kindling/internal/DetailsModel.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/internal/DetailsModel.kt index 1cac0c12..4cc78e1a 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/internal/DetailsModel.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/internal/DetailsModel.kt @@ -1,6 +1,6 @@ -package io.github.paulgriffith.kindling.internal +package io.github.inductiveautomation.kindling.internal -import io.github.paulgriffith.kindling.utils.ColumnList +import io.github.inductiveautomation.kindling.utils.ColumnList import javax.swing.table.AbstractTableModel import kotlin.properties.Delegates diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/internal/FileTransferHandler.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/internal/FileTransferHandler.kt similarity index 94% rename from src/main/kotlin/io/github/paulgriffith/kindling/internal/FileTransferHandler.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/internal/FileTransferHandler.kt index fc928535..dd2167fd 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/internal/FileTransferHandler.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/internal/FileTransferHandler.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.internal +package io.github.inductiveautomation.kindling.internal import java.awt.datatransfer.DataFlavor import java.awt.datatransfer.UnsupportedFlavorException diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/log/Header.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/log/Header.kt similarity index 98% rename from src/main/kotlin/io/github/paulgriffith/kindling/log/Header.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/log/Header.kt index 431b9761..a5b406e7 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/log/Header.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/log/Header.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.log +package io.github.inductiveautomation.kindling.log import com.formdev.flatlaf.extras.FlatSVGIcon import com.jidesoft.swing.JideButton diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/log/LogPanel.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/log/LogPanel.kt similarity index 96% rename from src/main/kotlin/io/github/paulgriffith/kindling/log/LogPanel.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/log/LogPanel.kt index 9fcc06c3..33553963 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/log/LogPanel.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/log/LogPanel.kt @@ -1,12 +1,12 @@ -package io.github.paulgriffith.kindling.log +package io.github.inductiveautomation.kindling.log import com.formdev.flatlaf.ui.FlatScrollBarUI -import io.github.paulgriffith.kindling.core.DetailsPane -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.utils.EDT_SCOPE -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.ReifiedJXTable -import io.github.paulgriffith.kindling.utils.getValue +import io.github.inductiveautomation.kindling.core.DetailsPane +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.utils.EDT_SCOPE +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.ReifiedJXTable +import io.github.inductiveautomation.kindling.utils.getValue import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -32,7 +32,7 @@ import javax.swing.SortOrder import javax.swing.SwingConstants import javax.swing.UIManager import kotlin.math.absoluteValue -import io.github.paulgriffith.kindling.core.Detail as DetailEvent +import io.github.inductiveautomation.kindling.core.Detail as DetailEvent class LogPanel( private val rawData: List, diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/log/LoggerNames.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/log/LoggerNames.kt similarity index 92% rename from src/main/kotlin/io/github/paulgriffith/kindling/log/LoggerNames.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/log/LoggerNames.kt index b2ffb32d..84970bc6 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/log/LoggerNames.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/log/LoggerNames.kt @@ -1,12 +1,12 @@ -package io.github.paulgriffith.kindling.log +package io.github.inductiveautomation.kindling.log import com.formdev.flatlaf.extras.FlatSVGIcon import com.jidesoft.swing.CheckBoxList -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.NoSelectionModel -import io.github.paulgriffith.kindling.utils.installSearchable -import io.github.paulgriffith.kindling.utils.listCellRenderer +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.NoSelectionModel +import io.github.inductiveautomation.kindling.utils.installSearchable +import io.github.inductiveautomation.kindling.utils.listCellRenderer import net.miginfocom.swing.MigLayout import javax.swing.AbstractListModel import javax.swing.ButtonGroup diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/log/SystemLogsEvent.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/log/SystemLogsEvent.kt similarity index 95% rename from src/main/kotlin/io/github/paulgriffith/kindling/log/SystemLogsEvent.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/log/SystemLogsEvent.kt index a41f776f..6b0356a0 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/log/SystemLogsEvent.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/log/SystemLogsEvent.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.log +package io.github.inductiveautomation.kindling.log import java.time.Instant diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/log/WrapperLogView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/log/WrapperLogView.kt similarity index 86% rename from src/main/kotlin/io/github/paulgriffith/kindling/log/WrapperLogView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/log/WrapperLogView.kt index 07f7d6f8..e0ccfbe4 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/log/WrapperLogView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/log/WrapperLogView.kt @@ -1,10 +1,10 @@ -package io.github.paulgriffith.kindling.log +package io.github.inductiveautomation.kindling.log import com.formdev.flatlaf.extras.FlatSVGIcon -import io.github.paulgriffith.kindling.core.ClipboardTool -import io.github.paulgriffith.kindling.core.MultiTool -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.utils.Action +import io.github.inductiveautomation.kindling.core.ClipboardTool +import io.github.inductiveautomation.kindling.core.MultiTool +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.utils.Action import java.awt.Desktop import java.io.File import java.nio.file.Path diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/log/models.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/log/models.kt similarity index 92% rename from src/main/kotlin/io/github/paulgriffith/kindling/log/models.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/log/models.kt index 671577f0..9d49d153 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/log/models.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/log/models.kt @@ -1,9 +1,9 @@ -package io.github.paulgriffith.kindling.log // ktlint-disable filename +package io.github.inductiveautomation.kindling.log // ktlint-disable filename import com.jidesoft.comparator.AlphanumComparator -import io.github.paulgriffith.kindling.utils.Column -import io.github.paulgriffith.kindling.utils.ColumnList -import io.github.paulgriffith.kindling.utils.ReifiedLabelProvider +import io.github.inductiveautomation.kindling.utils.Column +import io.github.inductiveautomation.kindling.utils.ColumnList +import io.github.inductiveautomation.kindling.utils.ReifiedLabelProvider import org.jdesktop.swingx.renderer.DefaultTableRenderer import java.time.Instant import javax.swing.table.AbstractTableModel diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/thread/FilterList.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/FilterList.kt similarity index 94% rename from src/main/kotlin/io/github/paulgriffith/kindling/thread/FilterList.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/thread/FilterList.kt index 94f66d6a..123e407f 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/thread/FilterList.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/FilterList.kt @@ -1,9 +1,9 @@ -package io.github.paulgriffith.kindling.thread +package io.github.inductiveautomation.kindling.thread import com.jidesoft.swing.CheckBoxList import com.jidesoft.swing.ListSearchable -import io.github.paulgriffith.kindling.utils.NoSelectionModel -import io.github.paulgriffith.kindling.utils.listCellRenderer +import io.github.inductiveautomation.kindling.utils.NoSelectionModel +import io.github.inductiveautomation.kindling.utils.listCellRenderer import java.text.DecimalFormat import javax.swing.AbstractListModel import javax.swing.ListModel diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/thread/MultiThreadView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/MultiThreadView.kt similarity index 90% rename from src/main/kotlin/io/github/paulgriffith/kindling/thread/MultiThreadView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/thread/MultiThreadView.kt index 1e3a2761..9ae72b55 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/thread/MultiThreadView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/MultiThreadView.kt @@ -1,35 +1,35 @@ -package io.github.paulgriffith.kindling.thread +package io.github.inductiveautomation.kindling.thread import com.formdev.flatlaf.extras.FlatSVGIcon import com.jidesoft.comparator.AlphanumComparator import com.jidesoft.swing.CheckBoxListSelectionModel -import io.github.paulgriffith.kindling.core.ClipboardTool -import io.github.paulgriffith.kindling.core.Detail -import io.github.paulgriffith.kindling.core.Detail.BodyLine -import io.github.paulgriffith.kindling.core.MultiTool -import io.github.paulgriffith.kindling.core.ToolOpeningException -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.core.add -import io.github.paulgriffith.kindling.thread.FilterModel.Companion.byCountAsc -import io.github.paulgriffith.kindling.thread.FilterModel.Companion.byCountDesc -import io.github.paulgriffith.kindling.thread.FilterModel.Companion.byNameAsc -import io.github.paulgriffith.kindling.thread.FilterModel.Companion.byNameDesc -import io.github.paulgriffith.kindling.thread.model.Stacktrace -import io.github.paulgriffith.kindling.thread.model.Thread -import io.github.paulgriffith.kindling.thread.model.ThreadDump -import io.github.paulgriffith.kindling.thread.model.ThreadLifespan -import io.github.paulgriffith.kindling.thread.model.ThreadModel -import io.github.paulgriffith.kindling.thread.model.ThreadModel.MultiThreadColumns -import io.github.paulgriffith.kindling.thread.model.ThreadModel.SingleThreadColumns -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.Column -import io.github.paulgriffith.kindling.utils.EDT_SCOPE -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.ReifiedJXTable -import io.github.paulgriffith.kindling.utils.attachPopupMenu -import io.github.paulgriffith.kindling.utils.escapeHtml -import io.github.paulgriffith.kindling.utils.getValue -import io.github.paulgriffith.kindling.utils.selectedRowIndices +import io.github.inductiveautomation.kindling.core.ClipboardTool +import io.github.inductiveautomation.kindling.core.Detail +import io.github.inductiveautomation.kindling.core.Detail.BodyLine +import io.github.inductiveautomation.kindling.core.MultiTool +import io.github.inductiveautomation.kindling.core.ToolOpeningException +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.core.add +import io.github.inductiveautomation.kindling.thread.FilterModel.Companion.byCountAsc +import io.github.inductiveautomation.kindling.thread.FilterModel.Companion.byCountDesc +import io.github.inductiveautomation.kindling.thread.FilterModel.Companion.byNameAsc +import io.github.inductiveautomation.kindling.thread.FilterModel.Companion.byNameDesc +import io.github.inductiveautomation.kindling.thread.model.Stacktrace +import io.github.inductiveautomation.kindling.thread.model.Thread +import io.github.inductiveautomation.kindling.thread.model.ThreadDump +import io.github.inductiveautomation.kindling.thread.model.ThreadLifespan +import io.github.inductiveautomation.kindling.thread.model.ThreadModel +import io.github.inductiveautomation.kindling.thread.model.ThreadModel.MultiThreadColumns +import io.github.inductiveautomation.kindling.thread.model.ThreadModel.SingleThreadColumns +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.Column +import io.github.inductiveautomation.kindling.utils.EDT_SCOPE +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.ReifiedJXTable +import io.github.inductiveautomation.kindling.utils.attachPopupMenu +import io.github.inductiveautomation.kindling.utils.escapeHtml +import io.github.inductiveautomation.kindling.utils.getValue +import io.github.inductiveautomation.kindling.utils.selectedRowIndices import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/thread/ThreadComparisonPane.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/ThreadComparisonPane.kt similarity index 94% rename from src/main/kotlin/io/github/paulgriffith/kindling/thread/ThreadComparisonPane.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/thread/ThreadComparisonPane.kt index dba49e29..fbfbafe2 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/thread/ThreadComparisonPane.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/ThreadComparisonPane.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.thread +package io.github.inductiveautomation.kindling.thread import com.formdev.flatlaf.extras.FlatSVGIcon import com.formdev.flatlaf.extras.components.FlatButton @@ -6,18 +6,18 @@ import com.formdev.flatlaf.extras.components.FlatLabel import com.formdev.flatlaf.extras.components.FlatTextPane import com.jidesoft.swing.JideButton import com.jidesoft.swing.JidePopupMenu -import io.github.paulgriffith.kindling.core.DetailsPane -import io.github.paulgriffith.kindling.thread.MultiThreadView.Companion.linkify -import io.github.paulgriffith.kindling.thread.MultiThreadView.Companion.toDetail -import io.github.paulgriffith.kindling.thread.model.Thread -import io.github.paulgriffith.kindling.thread.model.ThreadLifespan -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.ScrollingTextPane -import io.github.paulgriffith.kindling.utils.add -import io.github.paulgriffith.kindling.utils.escapeHtml -import io.github.paulgriffith.kindling.utils.getAll -import io.github.paulgriffith.kindling.utils.jFrame -import io.github.paulgriffith.kindling.utils.tag +import io.github.inductiveautomation.kindling.core.DetailsPane +import io.github.inductiveautomation.kindling.thread.MultiThreadView.Companion.linkify +import io.github.inductiveautomation.kindling.thread.MultiThreadView.Companion.toDetail +import io.github.inductiveautomation.kindling.thread.model.Thread +import io.github.inductiveautomation.kindling.thread.model.ThreadLifespan +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.ScrollingTextPane +import io.github.inductiveautomation.kindling.utils.add +import io.github.inductiveautomation.kindling.utils.escapeHtml +import io.github.inductiveautomation.kindling.utils.getAll +import io.github.inductiveautomation.kindling.utils.jFrame +import io.github.inductiveautomation.kindling.utils.tag import net.miginfocom.swing.MigLayout import org.jdesktop.swingx.JXTaskPane import org.jdesktop.swingx.JXTaskPaneContainer diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/thread/ThreadDumpCheckboxList.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/ThreadDumpCheckboxList.kt similarity index 88% rename from src/main/kotlin/io/github/paulgriffith/kindling/thread/ThreadDumpCheckboxList.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/thread/ThreadDumpCheckboxList.kt index b3fae2ec..b4559c49 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/thread/ThreadDumpCheckboxList.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/ThreadDumpCheckboxList.kt @@ -1,8 +1,8 @@ -package io.github.paulgriffith.kindling.thread +package io.github.inductiveautomation.kindling.thread import com.jidesoft.swing.CheckBoxList -import io.github.paulgriffith.kindling.utils.NoSelectionModel -import io.github.paulgriffith.kindling.utils.listCellRenderer +import io.github.inductiveautomation.kindling.utils.NoSelectionModel +import io.github.inductiveautomation.kindling.utils.listCellRenderer import java.nio.file.Path import javax.swing.AbstractListModel import javax.swing.JList diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/thread/model/NoneAsNullStringSerializer.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/NoneAsNullStringSerializer.kt similarity index 92% rename from src/main/kotlin/io/github/paulgriffith/kindling/thread/model/NoneAsNullStringSerializer.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/NoneAsNullStringSerializer.kt index c66540bc..e63e8b81 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/thread/model/NoneAsNullStringSerializer.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/NoneAsNullStringSerializer.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.thread.model +package io.github.inductiveautomation.kindling.thread.model import kotlinx.serialization.KSerializer import kotlinx.serialization.builtins.serializer diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/thread/model/Thread.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/Thread.kt similarity index 95% rename from src/main/kotlin/io/github/paulgriffith/kindling/thread/model/Thread.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/Thread.kt index 2a402838..5de6e23d 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/thread/model/Thread.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/Thread.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.thread.model +package io.github.inductiveautomation.kindling.thread.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/thread/model/ThreadDump.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadDump.kt similarity index 95% rename from src/main/kotlin/io/github/paulgriffith/kindling/thread/model/ThreadDump.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadDump.kt index 70cc725e..a3d06f02 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/thread/model/ThreadDump.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadDump.kt @@ -1,8 +1,8 @@ -package io.github.paulgriffith.kindling.thread.model +package io.github.inductiveautomation.kindling.thread.model -import io.github.paulgriffith.kindling.core.ToolOpeningException -import io.github.paulgriffith.kindling.utils.getLogger -import io.github.paulgriffith.kindling.utils.getValue +import io.github.inductiveautomation.kindling.core.ToolOpeningException +import io.github.inductiveautomation.kindling.utils.getLogger +import io.github.inductiveautomation.kindling.utils.getValue import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.SerializationException diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/thread/model/ThreadModel.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadModel.kt similarity index 97% rename from src/main/kotlin/io/github/paulgriffith/kindling/thread/model/ThreadModel.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadModel.kt index 0ad4a2cf..34fb8285 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/thread/model/ThreadModel.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadModel.kt @@ -1,9 +1,9 @@ -package io.github.paulgriffith.kindling.thread.model +package io.github.inductiveautomation.kindling.thread.model import com.formdev.flatlaf.extras.FlatSVGIcon -import io.github.paulgriffith.kindling.utils.Column -import io.github.paulgriffith.kindling.utils.ColumnList -import io.github.paulgriffith.kindling.utils.mode +import io.github.inductiveautomation.kindling.utils.Column +import io.github.inductiveautomation.kindling.utils.ColumnList +import io.github.inductiveautomation.kindling.utils.mode import org.jdesktop.swingx.renderer.CellContext import org.jdesktop.swingx.renderer.DefaultTableRenderer import org.jdesktop.swingx.renderer.LabelProvider diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/utils/Action.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/Action.kt similarity index 96% rename from src/main/kotlin/io/github/paulgriffith/kindling/utils/Action.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/utils/Action.kt index a495db64..f35308ea 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/utils/Action.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/Action.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.utils +package io.github.inductiveautomation.kindling.utils import java.awt.event.ActionEvent import java.awt.event.ActionListener diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/utils/Column.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/Column.kt similarity index 93% rename from src/main/kotlin/io/github/paulgriffith/kindling/utils/Column.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/utils/Column.kt index 794fe1db..71970a89 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/utils/Column.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/Column.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.utils +package io.github.inductiveautomation.kindling.utils import org.jdesktop.swingx.table.TableColumnExt import javax.swing.table.TableModel diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/utils/ColumnList.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/ColumnList.kt similarity index 97% rename from src/main/kotlin/io/github/paulgriffith/kindling/utils/ColumnList.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/utils/ColumnList.kt index 363eff2e..9933d679 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/utils/ColumnList.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/ColumnList.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.utils +package io.github.inductiveautomation.kindling.utils import org.jdesktop.swingx.table.ColumnFactory import org.jdesktop.swingx.table.TableColumnExt diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/utils/ScrollingTextPane.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/ScrollingTextPane.kt similarity index 96% rename from src/main/kotlin/io/github/paulgriffith/kindling/utils/ScrollingTextPane.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/utils/ScrollingTextPane.kt index f389046a..85df4572 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/utils/ScrollingTextPane.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/ScrollingTextPane.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.utils +package io.github.inductiveautomation.kindling.utils import com.formdev.flatlaf.extras.components.FlatScrollPane import java.awt.Dimension diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/utils/TabStrip.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/TabStrip.kt similarity index 98% rename from src/main/kotlin/io/github/paulgriffith/kindling/utils/TabStrip.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/utils/TabStrip.kt index f9af3b65..4a4d7a85 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/utils/TabStrip.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/TabStrip.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.utils +package io.github.inductiveautomation.kindling.utils import com.formdev.flatlaf.extras.components.FlatTabbedPane import java.awt.BorderLayout diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/utils/ZipFileTree.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/ZipFileTree.kt similarity index 97% rename from src/main/kotlin/io/github/paulgriffith/kindling/utils/ZipFileTree.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/utils/ZipFileTree.kt index 3de19269..5701978b 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/utils/ZipFileTree.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/ZipFileTree.kt @@ -1,5 +1,5 @@ -package io.github.paulgriffith.kindling.utils +package io.github.inductiveautomation.kindling.utils import com.jidesoft.comparator.AlphanumComparator import java.nio.file.FileSystem diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/utils/swing.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/swing.kt similarity index 98% rename from src/main/kotlin/io/github/paulgriffith/kindling/utils/swing.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/utils/swing.kt index ce260d43..bff432c4 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/utils/swing.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/swing.kt @@ -1,10 +1,10 @@ -package io.github.paulgriffith.kindling.utils // ktlint-disable filename +package io.github.inductiveautomation.kindling.utils // ktlint-disable filename import com.formdev.flatlaf.extras.FlatSVGIcon import com.formdev.flatlaf.extras.components.FlatScrollPane import com.jidesoft.swing.ListSearchable -import io.github.paulgriffith.kindling.core.Kindling -import io.github.paulgriffith.kindling.utils.ReifiedLabelProvider.Companion.setDefaultRenderer +import io.github.inductiveautomation.kindling.core.Kindling +import io.github.inductiveautomation.kindling.utils.ReifiedLabelProvider.Companion.setDefaultRenderer import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.swing.Swing diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/utils/utils.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/utils.kt similarity index 98% rename from src/main/kotlin/io/github/paulgriffith/kindling/utils/utils.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/utils/utils.kt index 5d370b3a..7612b95b 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/utils/utils.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/utils/utils.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.utils // ktlint-disable filename +package io.github.inductiveautomation.kindling.utils // ktlint-disable filename import io.github.evanrupert.excelkt.workbook import org.slf4j.Logger diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/zip/ZipView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/ZipView.kt similarity index 86% rename from src/main/kotlin/io/github/paulgriffith/kindling/zip/ZipView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/zip/ZipView.kt index d053300c..fc6b64c4 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/zip/ZipView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/ZipView.kt @@ -1,27 +1,27 @@ -package io.github.paulgriffith.kindling.zip +package io.github.inductiveautomation.kindling.zip import com.formdev.flatlaf.extras.FlatSVGIcon import com.formdev.flatlaf.extras.components.FlatPopupMenu import com.formdev.flatlaf.extras.components.FlatTabbedPane -import io.github.paulgriffith.kindling.core.Tool -import io.github.paulgriffith.kindling.core.ToolOpeningException -import io.github.paulgriffith.kindling.core.ToolPanel -import io.github.paulgriffith.kindling.utils.Action -import io.github.paulgriffith.kindling.utils.FlatScrollPane -import io.github.paulgriffith.kindling.utils.PathNode -import io.github.paulgriffith.kindling.utils.TabStrip -import io.github.paulgriffith.kindling.utils.ZipFileTree -import io.github.paulgriffith.kindling.utils.attachPopupMenu -import io.github.paulgriffith.kindling.utils.getLogger -import io.github.paulgriffith.kindling.utils.toFileSizeLabel -import io.github.paulgriffith.kindling.zip.ZipViewer.createView -import io.github.paulgriffith.kindling.zip.views.GenericFileView -import io.github.paulgriffith.kindling.zip.views.ImageView -import io.github.paulgriffith.kindling.zip.views.MultiToolView -import io.github.paulgriffith.kindling.zip.views.PathView -import io.github.paulgriffith.kindling.zip.views.ProjectView -import io.github.paulgriffith.kindling.zip.views.TextFileView -import io.github.paulgriffith.kindling.zip.views.ToolView +import io.github.inductiveautomation.kindling.core.Tool +import io.github.inductiveautomation.kindling.core.ToolOpeningException +import io.github.inductiveautomation.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.utils.Action +import io.github.inductiveautomation.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.PathNode +import io.github.inductiveautomation.kindling.utils.TabStrip +import io.github.inductiveautomation.kindling.utils.ZipFileTree +import io.github.inductiveautomation.kindling.utils.attachPopupMenu +import io.github.inductiveautomation.kindling.utils.getLogger +import io.github.inductiveautomation.kindling.utils.toFileSizeLabel +import io.github.inductiveautomation.kindling.zip.ZipViewer.createView +import io.github.inductiveautomation.kindling.zip.views.GenericFileView +import io.github.inductiveautomation.kindling.zip.views.ImageView +import io.github.inductiveautomation.kindling.zip.views.MultiToolView +import io.github.inductiveautomation.kindling.zip.views.PathView +import io.github.inductiveautomation.kindling.zip.views.ProjectView +import io.github.inductiveautomation.kindling.zip.views.TextFileView +import io.github.inductiveautomation.kindling.zip.views.ToolView import java.awt.event.MouseAdapter import java.awt.event.MouseEvent import java.io.File diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/GenericFileView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/GenericFileView.kt similarity index 93% rename from src/main/kotlin/io/github/paulgriffith/kindling/zip/views/GenericFileView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/GenericFileView.kt index 031d8b76..2e566d09 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/GenericFileView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/GenericFileView.kt @@ -1,6 +1,6 @@ -package io.github.paulgriffith.kindling.zip.views +package io.github.inductiveautomation.kindling.zip.views -import io.github.paulgriffith.kindling.utils.FlatScrollPane +import io.github.inductiveautomation.kindling.utils.FlatScrollPane import java.awt.EventQueue import java.awt.Font import java.awt.Rectangle diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ImageView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ImageView.kt similarity index 95% rename from src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ImageView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ImageView.kt index 539dc1d2..ad919031 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ImageView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ImageView.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.zip.views +package io.github.inductiveautomation.kindling.zip.views import com.formdev.flatlaf.extras.FlatSVGIcon import java.nio.file.Path diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/MultiToolView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/MultiToolView.kt similarity index 87% rename from src/main/kotlin/io/github/paulgriffith/kindling/zip/views/MultiToolView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/MultiToolView.kt index 338d4303..be37fa98 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/MultiToolView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/MultiToolView.kt @@ -1,9 +1,9 @@ -package io.github.paulgriffith.kindling.zip.views +package io.github.inductiveautomation.kindling.zip.views import com.formdev.flatlaf.extras.FlatSVGIcon -import io.github.paulgriffith.kindling.core.MultiTool -import io.github.paulgriffith.kindling.core.Tool -import io.github.paulgriffith.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.core.MultiTool +import io.github.inductiveautomation.kindling.core.Tool +import io.github.inductiveautomation.kindling.core.ToolPanel import java.nio.file.Files import java.nio.file.Path import java.nio.file.spi.FileSystemProvider diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/PathView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/PathView.kt similarity index 80% rename from src/main/kotlin/io/github/paulgriffith/kindling/zip/views/PathView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/PathView.kt index 28b1efc4..246b7b8e 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/PathView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/PathView.kt @@ -1,7 +1,7 @@ -package io.github.paulgriffith.kindling.zip.views +package io.github.inductiveautomation.kindling.zip.views -import io.github.paulgriffith.kindling.utils.FloatableComponent -import io.github.paulgriffith.kindling.utils.PopupMenuCustomizer +import io.github.inductiveautomation.kindling.utils.FloatableComponent +import io.github.inductiveautomation.kindling.utils.PopupMenuCustomizer import net.miginfocom.swing.MigLayout import java.nio.file.Path import java.nio.file.spi.FileSystemProvider diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ProjectView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ProjectView.kt similarity index 95% rename from src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ProjectView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ProjectView.kt index 8a66ee2f..68f54dd9 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ProjectView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ProjectView.kt @@ -1,7 +1,7 @@ -package io.github.paulgriffith.kindling.zip.views +package io.github.inductiveautomation.kindling.zip.views import com.formdev.flatlaf.extras.FlatSVGIcon -import io.github.paulgriffith.kindling.core.Kindling +import io.github.inductiveautomation.kindling.core.Kindling import java.nio.file.FileVisitResult import java.nio.file.Path import java.nio.file.spi.FileSystemProvider diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/TextFileView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/TextFileView.kt similarity index 96% rename from src/main/kotlin/io/github/paulgriffith/kindling/zip/views/TextFileView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/TextFileView.kt index fbfc7c7c..a9bd4e69 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/TextFileView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/TextFileView.kt @@ -1,7 +1,7 @@ -package io.github.paulgriffith.kindling.zip.views +package io.github.inductiveautomation.kindling.zip.views import com.formdev.flatlaf.extras.FlatSVGIcon -import io.github.paulgriffith.kindling.core.Kindling +import io.github.inductiveautomation.kindling.core.Kindling import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement diff --git a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ToolView.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ToolView.kt similarity index 86% rename from src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ToolView.kt rename to src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ToolView.kt index 7ac87d41..6aafba41 100644 --- a/src/main/kotlin/io/github/paulgriffith/kindling/zip/views/ToolView.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/zip/views/ToolView.kt @@ -1,9 +1,9 @@ -package io.github.paulgriffith.kindling.zip.views +package io.github.inductiveautomation.kindling.zip.views import com.formdev.flatlaf.extras.FlatSVGIcon -import io.github.paulgriffith.kindling.core.Tool -import io.github.paulgriffith.kindling.core.ToolOpeningException -import io.github.paulgriffith.kindling.core.ToolPanel +import io.github.inductiveautomation.kindling.core.Tool +import io.github.inductiveautomation.kindling.core.ToolOpeningException +import io.github.inductiveautomation.kindling.core.ToolPanel import java.nio.file.Files import java.nio.file.Path import java.nio.file.spi.FileSystemProvider diff --git a/src/test/kotlin/io/github/paulgriffith/kindling/log/WrapperLogParsingTests.kt b/src/test/kotlin/io/github/inductiveautomation/kindling/log/WrapperLogParsingTests.kt similarity index 99% rename from src/test/kotlin/io/github/paulgriffith/kindling/log/WrapperLogParsingTests.kt rename to src/test/kotlin/io/github/inductiveautomation/kindling/log/WrapperLogParsingTests.kt index 12c6a360..85689afc 100644 --- a/src/test/kotlin/io/github/paulgriffith/kindling/log/WrapperLogParsingTests.kt +++ b/src/test/kotlin/io/github/inductiveautomation/kindling/log/WrapperLogParsingTests.kt @@ -1,4 +1,4 @@ -package io.github.paulgriffith.kindling.log +package io.github.inductiveautomation.kindling.log import io.kotest.assertions.asClue import io.kotest.core.spec.style.FunSpec diff --git a/src/test/kotlin/io/github/paulgriffith/kindling/thread/ThreadViewTests.kt b/src/test/kotlin/io/github/inductiveautomation/kindling/thread/ThreadViewTests.kt similarity index 94% rename from src/test/kotlin/io/github/paulgriffith/kindling/thread/ThreadViewTests.kt rename to src/test/kotlin/io/github/inductiveautomation/kindling/thread/ThreadViewTests.kt index cfc443c4..0221758f 100644 --- a/src/test/kotlin/io/github/paulgriffith/kindling/thread/ThreadViewTests.kt +++ b/src/test/kotlin/io/github/inductiveautomation/kindling/thread/ThreadViewTests.kt @@ -1,7 +1,7 @@ -package io.github.paulgriffith.kindling.thread +package io.github.inductiveautomation.kindling.thread -import io.github.paulgriffith.kindling.thread.model.Thread.Companion.extractPool -import io.github.paulgriffith.kindling.thread.model.ThreadDump +import io.github.inductiveautomation.kindling.thread.model.Thread.Companion.extractPool +import io.github.inductiveautomation.kindling.thread.model.ThreadDump import io.kotest.assertions.asClue import io.kotest.core.spec.style.FunSpec import io.kotest.data.blocking.forAll diff --git a/src/test/resources/io/github/paulgriffith/kindling/thread/deadlockThreadDump.json b/src/test/resources/io/github/inductiveautomation/kindling/thread/deadlockThreadDump.json similarity index 100% rename from src/test/resources/io/github/paulgriffith/kindling/thread/deadlockThreadDump.json rename to src/test/resources/io/github/inductiveautomation/kindling/thread/deadlockThreadDump.json diff --git a/src/test/resources/io/github/paulgriffith/kindling/thread/legacyDeadlockThreadDump.txt b/src/test/resources/io/github/inductiveautomation/kindling/thread/legacyDeadlockThreadDump.txt similarity index 100% rename from src/test/resources/io/github/paulgriffith/kindling/thread/legacyDeadlockThreadDump.txt rename to src/test/resources/io/github/inductiveautomation/kindling/thread/legacyDeadlockThreadDump.txt diff --git a/src/test/resources/io/github/paulgriffith/kindling/thread/legacyScriptThreadDump.txt b/src/test/resources/io/github/inductiveautomation/kindling/thread/legacyScriptThreadDump.txt similarity index 100% rename from src/test/resources/io/github/paulgriffith/kindling/thread/legacyScriptThreadDump.txt rename to src/test/resources/io/github/inductiveautomation/kindling/thread/legacyScriptThreadDump.txt diff --git a/src/test/resources/io/github/paulgriffith/kindling/thread/legacyWebThreadDump.txt b/src/test/resources/io/github/inductiveautomation/kindling/thread/legacyWebThreadDump.txt similarity index 100% rename from src/test/resources/io/github/paulgriffith/kindling/thread/legacyWebThreadDump.txt rename to src/test/resources/io/github/inductiveautomation/kindling/thread/legacyWebThreadDump.txt diff --git a/src/test/resources/io/github/paulgriffith/kindling/thread/threadDump.json b/src/test/resources/io/github/inductiveautomation/kindling/thread/threadDump.json similarity index 100% rename from src/test/resources/io/github/paulgriffith/kindling/thread/threadDump.json rename to src/test/resources/io/github/inductiveautomation/kindling/thread/threadDump.json