From ad298f84a249a05063ad75f286c9a642092519bc Mon Sep 17 00:00:00 2001 From: "Josiah (Gaming32) Glosson" Date: Tue, 15 Feb 2022 16:57:53 -0600 Subject: [PATCH] Move utils --- .../github/arrayv/dialogs/ShuffleDialog.java | 14 +++++------ .../io/github/arrayv/frames/ArrayFrame.java | 2 +- .../io/github/arrayv/frames/SoundFrame.java | 2 +- .../io/github/arrayv/frames/UtilFrame.java | 8 +++---- .../io/github/arrayv/main/ArrayManager.java | 18 +++++++------- .../github/arrayv/main/ArrayVisualizer.java | 24 +++++++++---------- .../io/github/arrayv/main/SortAnalyzer.java | 5 ++-- .../io/github/arrayv/panels/ShufflePanel.java | 2 +- .../github/arrayv/prompts/ShufflePrompt.java | 4 ++-- .../sorts/exchange/StableQuickSort.java | 2 +- .../arrayv/sorts/hybrid/LazierestSort.java | 2 +- .../sorts/insert/BlockInsertionSort.java | 2 +- .../sorts/merge/StacklessRotateMergeSort.java | 2 +- .../sorts/templates/BlockMergeSorting.java | 2 +- .../arrayv/sorts/templates/QuadSorting.java | 2 +- .../github/arrayv/sorts/templates/Sort.java | 8 +++---- .../arrayv/sorts/templates/TimSorting.java | 8 +++---- .../arrayv/sorts/templates/WikiSorting.java | 8 +++---- .../arrayv/sorts/tests/RotationTest.java | 2 +- .../arrayv/threads/MultipleSortThread.java | 14 +++++------ .../arrayv/threads/RunExchangeSorts.java | 2 +- .../github/arrayv/threads/RunHybridSorts.java | 2 +- .../arrayv/threads/RunInsertionSorts.java | 2 +- .../arrayv/threads/RunScriptedSorts.java | 2 +- .../io/github/arrayv/threads/RunSort.java | 10 ++++---- .../github/arrayv}/utils/AntiQSort.java | 2 +- .../github/arrayv}/utils/ArrayFileWriter.java | 2 +- .../github/arrayv}/utils/ArrayVList.java | 2 +- .../github/arrayv}/utils/CommonUtils.java | 2 +- .../{ => io/github/arrayv}/utils/Delays.java | 2 +- .../github/arrayv}/utils/Distributions.java | 2 +- .../github/arrayv}/utils/Highlights.java | 2 +- .../arrayv}/utils/IndexedRotations.java | 2 +- .../github/arrayv}/utils/MultipleScript.java | 2 +- .../github/arrayv}/utils/PerlinNoise.java | 2 +- .../{ => io/github/arrayv}/utils/Reads.java | 2 +- .../github/arrayv}/utils/Renderer.java | 2 +- .../github/arrayv}/utils/Rotations.java | 2 +- .../github/arrayv}/utils/ShuffleGraph.java | 6 ++--- .../github/arrayv}/utils/ShuffleInfo.java | 2 +- .../github/arrayv}/utils/Shuffles.java | 2 +- .../utils/SortingNetworkGenerator.java | 2 +- .../{ => io/github/arrayv}/utils/Sounds.java | 2 +- .../github/arrayv}/utils/Statistics.java | 2 +- .../github/arrayv}/utils/StopSort.java | 2 +- .../{ => io/github/arrayv}/utils/Timer.java | 2 +- .../{ => io/github/arrayv}/utils/Writes.java | 2 +- .../java/{ => io/github/arrayv}/utils/m.java | 2 +- .../arrayv}/utils/shuffleutils/AWTUtils.java | 2 +- .../utils/shuffleutils/GraphConnection.java | 2 +- .../arrayv}/utils/shuffleutils/GraphNode.java | 6 ++--- .../utils/shuffleutils/GraphReader.java | 10 ++++---- .../utils/shuffleutils/GraphWriter.java | 4 ++-- .../java/io/github/arrayv/visuals/Visual.java | 4 ++-- .../github/arrayv/visuals/VisualStyles.java | 4 ++-- .../github/arrayv/visuals/bars/BarGraph.java | 4 ++-- .../visuals/bars/DisparityBarGraph.java | 4 ++-- .../github/arrayv/visuals/bars/Rainbow.java | 4 ++-- .../github/arrayv/visuals/bars/SineWave.java | 4 ++-- .../arrayv/visuals/circles/ColorCircle.java | 4 ++-- .../visuals/circles/DisparityChords.java | 4 ++-- .../visuals/circles/DisparityCircle.java | 4 ++-- .../github/arrayv/visuals/circles/Spiral.java | 4 ++-- .../arrayv/visuals/dots/DisparityDots.java | 4 ++-- .../arrayv/visuals/dots/ScatterPlot.java | 4 ++-- .../arrayv/visuals/dots/SpiralDots.java | 4 ++-- .../github/arrayv/visuals/dots/WaveDots.java | 4 ++-- .../arrayv/visuals/image/CustomImage.java | 4 ++-- .../github/arrayv/visuals/misc/HoopStack.java | 4 ++-- .../github/arrayv/visuals/misc/PixelMesh.java | 4 ++-- 70 files changed, 146 insertions(+), 145 deletions(-) rename src/main/java/{ => io/github/arrayv}/utils/AntiQSort.java (98%) rename src/main/java/{ => io/github/arrayv}/utils/ArrayFileWriter.java (97%) rename src/main/java/{ => io/github/arrayv}/utils/ArrayVList.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/CommonUtils.java (97%) rename src/main/java/{ => io/github/arrayv}/utils/Delays.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/Distributions.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/Highlights.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/IndexedRotations.java (98%) rename src/main/java/{ => io/github/arrayv}/utils/MultipleScript.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/PerlinNoise.java (98%) rename src/main/java/{ => io/github/arrayv}/utils/Reads.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/Renderer.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/Rotations.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/ShuffleGraph.java (98%) rename src/main/java/{ => io/github/arrayv}/utils/ShuffleInfo.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/Shuffles.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/SortingNetworkGenerator.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/Sounds.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/Statistics.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/StopSort.java (82%) rename src/main/java/{ => io/github/arrayv}/utils/Timer.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/Writes.java (99%) rename src/main/java/{ => io/github/arrayv}/utils/m.java (98%) rename src/main/java/{ => io/github/arrayv}/utils/shuffleutils/AWTUtils.java (95%) rename src/main/java/{ => io/github/arrayv}/utils/shuffleutils/GraphConnection.java (98%) rename src/main/java/{ => io/github/arrayv}/utils/shuffleutils/GraphNode.java (96%) rename src/main/java/{ => io/github/arrayv}/utils/shuffleutils/GraphReader.java (98%) rename src/main/java/{ => io/github/arrayv}/utils/shuffleutils/GraphWriter.java (95%) diff --git a/src/main/java/io/github/arrayv/dialogs/ShuffleDialog.java b/src/main/java/io/github/arrayv/dialogs/ShuffleDialog.java index 6d611b97..e4e6d2fe 100644 --- a/src/main/java/io/github/arrayv/dialogs/ShuffleDialog.java +++ b/src/main/java/io/github/arrayv/dialogs/ShuffleDialog.java @@ -20,13 +20,13 @@ import io.github.arrayv.main.ArrayManager; import io.github.arrayv.panels.ShufflePanel; import io.github.arrayv.panes.JErrorPane; -import utils.Distributions; -import utils.ShuffleGraph; -import utils.ShuffleInfo; -import utils.Shuffles; -import utils.shuffleutils.GraphReader; -import utils.shuffleutils.GraphReader.MalformedGraphFileException; -import utils.shuffleutils.GraphWriter; +import io.github.arrayv.utils.Distributions; +import io.github.arrayv.utils.ShuffleGraph; +import io.github.arrayv.utils.ShuffleInfo; +import io.github.arrayv.utils.Shuffles; +import io.github.arrayv.utils.shuffleutils.GraphReader; +import io.github.arrayv.utils.shuffleutils.GraphWriter; +import io.github.arrayv.utils.shuffleutils.GraphReader.MalformedGraphFileException; /* * diff --git a/src/main/java/io/github/arrayv/frames/ArrayFrame.java b/src/main/java/io/github/arrayv/frames/ArrayFrame.java index 4f8262f0..23f4aba0 100644 --- a/src/main/java/io/github/arrayv/frames/ArrayFrame.java +++ b/src/main/java/io/github/arrayv/frames/ArrayFrame.java @@ -17,7 +17,7 @@ import io.github.arrayv.main.ArrayManager; import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.panes.JEnhancedOptionPane; -import utils.Highlights; +import io.github.arrayv.utils.Highlights; /* * diff --git a/src/main/java/io/github/arrayv/frames/SoundFrame.java b/src/main/java/io/github/arrayv/frames/SoundFrame.java index f345aac0..c8429005 100644 --- a/src/main/java/io/github/arrayv/frames/SoundFrame.java +++ b/src/main/java/io/github/arrayv/frames/SoundFrame.java @@ -43,7 +43,7 @@ of this software and associated documentation files (the "Software"), to deal import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import utils.Sounds; +import io.github.arrayv.utils.Sounds; public class SoundFrame extends JFrame { diff --git a/src/main/java/io/github/arrayv/frames/UtilFrame.java b/src/main/java/io/github/arrayv/frames/UtilFrame.java index 884ec1c3..7a6a3a1f 100644 --- a/src/main/java/io/github/arrayv/frames/UtilFrame.java +++ b/src/main/java/io/github/arrayv/frames/UtilFrame.java @@ -11,10 +11,10 @@ import io.github.arrayv.prompts.ShufflePrompt; import io.github.arrayv.prompts.SortPrompt; import io.github.arrayv.prompts.ViewPrompt; -import utils.Delays; -import utils.Highlights; -import utils.Sounds; -import utils.Timer; +import io.github.arrayv.utils.Delays; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Sounds; +import io.github.arrayv.utils.Timer; /* * diff --git a/src/main/java/io/github/arrayv/main/ArrayManager.java b/src/main/java/io/github/arrayv/main/ArrayManager.java index 95845738..eba7dce7 100644 --- a/src/main/java/io/github/arrayv/main/ArrayManager.java +++ b/src/main/java/io/github/arrayv/main/ArrayManager.java @@ -3,13 +3,13 @@ import java.util.Arrays; import io.github.arrayv.panes.JErrorPane; -import utils.Delays; -import utils.Distributions; -import utils.Highlights; -import utils.ShuffleGraph; -import utils.ShuffleInfo; -import utils.Shuffles; -import utils.Writes; +import io.github.arrayv.utils.Delays; +import io.github.arrayv.utils.Distributions; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.ShuffleGraph; +import io.github.arrayv.utils.ShuffleInfo; +import io.github.arrayv.utils.Shuffles; +import io.github.arrayv.utils.Writes; /* * @@ -39,8 +39,8 @@ of this software and associated documentation files (the "Software"), to deal */ public final class ArrayManager { - private utils.Shuffles[] shuffleTypes; - private utils.Distributions[] distributionTypes; + private io.github.arrayv.utils.Shuffles[] shuffleTypes; + private io.github.arrayv.utils.Distributions[] distributionTypes; private String[] shuffleIDs; private String[] distributionIDs; diff --git a/src/main/java/io/github/arrayv/main/ArrayVisualizer.java b/src/main/java/io/github/arrayv/main/ArrayVisualizer.java index e06f372d..86c916bb 100644 --- a/src/main/java/io/github/arrayv/main/ArrayVisualizer.java +++ b/src/main/java/io/github/arrayv/main/ArrayVisualizer.java @@ -55,6 +55,17 @@ import io.github.arrayv.panes.JErrorPane; import io.github.arrayv.sortdata.SortInfo; import io.github.arrayv.threads.RunScriptedSorts; +import io.github.arrayv.utils.AntiQSort; +import io.github.arrayv.utils.ArrayFileWriter; +import io.github.arrayv.utils.Delays; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.MultipleScript; +import io.github.arrayv.utils.Reads; +import io.github.arrayv.utils.Renderer; +import io.github.arrayv.utils.Sounds; +import io.github.arrayv.utils.Statistics; +import io.github.arrayv.utils.Timer; +import io.github.arrayv.utils.Writes; import io.github.arrayv.visuals.Visual; import io.github.arrayv.visuals.VisualStyles; import io.github.arrayv.visuals.bars.BarGraph; @@ -72,17 +83,6 @@ import io.github.arrayv.visuals.image.CustomImage; import io.github.arrayv.visuals.misc.HoopStack; import io.github.arrayv.visuals.misc.PixelMesh; -import utils.AntiQSort; -import utils.ArrayFileWriter; -import utils.Delays; -import utils.Highlights; -import utils.MultipleScript; -import utils.Reads; -import utils.Renderer; -import utils.Sounds; -import utils.Statistics; -import utils.Timer; -import utils.Writes; /* * @@ -582,7 +582,7 @@ public void run() { public void run() { ArrayVisualizer.this.visualsEnabled = true; - utils.Renderer.initializeVisuals(ArrayVisualizer.this); + io.github.arrayv.utils.Renderer.initializeVisuals(ArrayVisualizer.this); Graphics background = ArrayVisualizer.this.window.getGraphics(); background.setColor(Color.BLACK); diff --git a/src/main/java/io/github/arrayv/main/SortAnalyzer.java b/src/main/java/io/github/arrayv/main/SortAnalyzer.java index 4f96f21e..2ac6c723 100644 --- a/src/main/java/io/github/arrayv/main/SortAnalyzer.java +++ b/src/main/java/io/github/arrayv/main/SortAnalyzer.java @@ -38,10 +38,10 @@ import io.github.arrayv.sortdata.SortComparator; import io.github.arrayv.sortdata.SortInfo; import io.github.arrayv.sorts.templates.Sort; +import io.github.arrayv.utils.CommonUtils; import io.github.classgraph.ClassGraph; import io.github.classgraph.ClassInfo; import io.github.classgraph.ScanResult; -import utils.CommonUtils; /* * @@ -82,9 +82,10 @@ public final class SortAnalyzer { "import panels.", "import io.github.arrayv.panels.", "import panes.", "import io.github.arrayv.panes.", "import prompts.", "import io.github.arrayv.prompts.", - "import visuals.", "import io.github.arrayv.visuals.", "import sorts.", "import io.github.arrayv.sorts.", "import threads.", "import io.github.arrayv.threads.", + "import utils.", "import io.github.arrayv.utils.", + "import visuals.", "import io.github.arrayv.visuals.", "import sorts.templates.SortComparator;", "import io.github.arrayv.sortdata.SortComparator;" ); diff --git a/src/main/java/io/github/arrayv/panels/ShufflePanel.java b/src/main/java/io/github/arrayv/panels/ShufflePanel.java index 4569ed94..c4d948c6 100644 --- a/src/main/java/io/github/arrayv/panels/ShufflePanel.java +++ b/src/main/java/io/github/arrayv/panels/ShufflePanel.java @@ -15,7 +15,7 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; -import utils.ShuffleGraph; +import io.github.arrayv.utils.ShuffleGraph; public class ShufflePanel extends JPanel implements KeyListener { int camX = 0, camY = 0; diff --git a/src/main/java/io/github/arrayv/prompts/ShufflePrompt.java b/src/main/java/io/github/arrayv/prompts/ShufflePrompt.java index aecb1024..9d4ad837 100644 --- a/src/main/java/io/github/arrayv/prompts/ShufflePrompt.java +++ b/src/main/java/io/github/arrayv/prompts/ShufflePrompt.java @@ -10,8 +10,8 @@ import io.github.arrayv.frames.UtilFrame; import io.github.arrayv.main.ArrayManager; import io.github.arrayv.panes.JErrorPane; -import utils.Distributions; -import utils.Shuffles; +import io.github.arrayv.utils.Distributions; +import io.github.arrayv.utils.Shuffles; /* * diff --git a/src/main/java/io/github/arrayv/sorts/exchange/StableQuickSort.java b/src/main/java/io/github/arrayv/sorts/exchange/StableQuickSort.java index 3e7fd002..6b35907e 100644 --- a/src/main/java/io/github/arrayv/sorts/exchange/StableQuickSort.java +++ b/src/main/java/io/github/arrayv/sorts/exchange/StableQuickSort.java @@ -2,7 +2,7 @@ import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.sorts.templates.Sort; -import utils.ArrayVList; +import io.github.arrayv.utils.ArrayVList; /* * diff --git a/src/main/java/io/github/arrayv/sorts/hybrid/LazierestSort.java b/src/main/java/io/github/arrayv/sorts/hybrid/LazierestSort.java index 0b1687d4..b884680a 100644 --- a/src/main/java/io/github/arrayv/sorts/hybrid/LazierestSort.java +++ b/src/main/java/io/github/arrayv/sorts/hybrid/LazierestSort.java @@ -2,7 +2,7 @@ import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.sorts.templates.Sort; -import utils.IndexedRotations; +import io.github.arrayv.utils.IndexedRotations; /* * diff --git a/src/main/java/io/github/arrayv/sorts/insert/BlockInsertionSort.java b/src/main/java/io/github/arrayv/sorts/insert/BlockInsertionSort.java index f59b7811..e12a6fa2 100644 --- a/src/main/java/io/github/arrayv/sorts/insert/BlockInsertionSort.java +++ b/src/main/java/io/github/arrayv/sorts/insert/BlockInsertionSort.java @@ -2,7 +2,7 @@ import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.sorts.templates.GrailSorting; -import utils.Rotations; +import io.github.arrayv.utils.Rotations; public final class BlockInsertionSort extends GrailSorting { public BlockInsertionSort(ArrayVisualizer arrayVisualizer) { diff --git a/src/main/java/io/github/arrayv/sorts/merge/StacklessRotateMergeSort.java b/src/main/java/io/github/arrayv/sorts/merge/StacklessRotateMergeSort.java index 9e1c6c25..d17aac87 100644 --- a/src/main/java/io/github/arrayv/sorts/merge/StacklessRotateMergeSort.java +++ b/src/main/java/io/github/arrayv/sorts/merge/StacklessRotateMergeSort.java @@ -2,7 +2,7 @@ import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.sorts.templates.Sort; -import utils.IndexedRotations; +import io.github.arrayv.utils.IndexedRotations; /* * diff --git a/src/main/java/io/github/arrayv/sorts/templates/BlockMergeSorting.java b/src/main/java/io/github/arrayv/sorts/templates/BlockMergeSorting.java index 1e296cf5..68a2efd2 100644 --- a/src/main/java/io/github/arrayv/sorts/templates/BlockMergeSorting.java +++ b/src/main/java/io/github/arrayv/sorts/templates/BlockMergeSorting.java @@ -1,7 +1,7 @@ package io.github.arrayv.sorts.templates; import io.github.arrayv.main.ArrayVisualizer; -import utils.IndexedRotations; +import io.github.arrayv.utils.IndexedRotations; /* * diff --git a/src/main/java/io/github/arrayv/sorts/templates/QuadSorting.java b/src/main/java/io/github/arrayv/sorts/templates/QuadSorting.java index b9f7b3fb..3673a391 100644 --- a/src/main/java/io/github/arrayv/sorts/templates/QuadSorting.java +++ b/src/main/java/io/github/arrayv/sorts/templates/QuadSorting.java @@ -1,7 +1,7 @@ package io.github.arrayv.sorts.templates; import io.github.arrayv.main.ArrayVisualizer; -import utils.*; +import io.github.arrayv.utils.*; /* Copyright (C) 2014-2021 Igor van den Hoven ivdhoven@gmail.com diff --git a/src/main/java/io/github/arrayv/sorts/templates/Sort.java b/src/main/java/io/github/arrayv/sorts/templates/Sort.java index a9e321bf..97aa915f 100644 --- a/src/main/java/io/github/arrayv/sorts/templates/Sort.java +++ b/src/main/java/io/github/arrayv/sorts/templates/Sort.java @@ -1,10 +1,10 @@ package io.github.arrayv.sorts.templates; import io.github.arrayv.main.ArrayVisualizer; -import utils.Delays; -import utils.Highlights; -import utils.Reads; -import utils.Writes; +import io.github.arrayv.utils.Delays; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Reads; +import io.github.arrayv.utils.Writes; public abstract class Sort { private boolean sortEnabled; diff --git a/src/main/java/io/github/arrayv/sorts/templates/TimSorting.java b/src/main/java/io/github/arrayv/sorts/templates/TimSorting.java index 9a51d3db..12737237 100644 --- a/src/main/java/io/github/arrayv/sorts/templates/TimSorting.java +++ b/src/main/java/io/github/arrayv/sorts/templates/TimSorting.java @@ -1,10 +1,10 @@ package io.github.arrayv.sorts.templates; import io.github.arrayv.main.ArrayVisualizer; -import utils.Delays; -import utils.Highlights; -import utils.Reads; -import utils.Writes; +import io.github.arrayv.utils.Delays; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Reads; +import io.github.arrayv.utils.Writes; /* * Copyright (C) 2008 The Android Open Source Project diff --git a/src/main/java/io/github/arrayv/sorts/templates/WikiSorting.java b/src/main/java/io/github/arrayv/sorts/templates/WikiSorting.java index 2a8b401a..0cec6df4 100644 --- a/src/main/java/io/github/arrayv/sorts/templates/WikiSorting.java +++ b/src/main/java/io/github/arrayv/sorts/templates/WikiSorting.java @@ -2,10 +2,10 @@ import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.sorts.insert.InsertionSort; -import utils.Delays; -import utils.Highlights; -import utils.Reads; -import utils.Writes; +import io.github.arrayv.utils.Delays; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Reads; +import io.github.arrayv.utils.Writes; /* * diff --git a/src/main/java/io/github/arrayv/sorts/tests/RotationTest.java b/src/main/java/io/github/arrayv/sorts/tests/RotationTest.java index 4be3d757..ddb7b146 100644 --- a/src/main/java/io/github/arrayv/sorts/tests/RotationTest.java +++ b/src/main/java/io/github/arrayv/sorts/tests/RotationTest.java @@ -2,7 +2,7 @@ import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.sorts.templates.Sort; -import utils.Rotations; +import io.github.arrayv.utils.Rotations; /* * diff --git a/src/main/java/io/github/arrayv/threads/MultipleSortThread.java b/src/main/java/io/github/arrayv/threads/MultipleSortThread.java index 1bbc6409..7b801fe2 100644 --- a/src/main/java/io/github/arrayv/threads/MultipleSortThread.java +++ b/src/main/java/io/github/arrayv/threads/MultipleSortThread.java @@ -5,13 +5,13 @@ import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.panes.JErrorPane; import io.github.arrayv.sorts.templates.Sort; -import utils.Delays; -import utils.Highlights; -import utils.Reads; -import utils.Sounds; -import utils.StopSort; -import utils.Timer; -import utils.Writes; +import io.github.arrayv.utils.Delays; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Reads; +import io.github.arrayv.utils.Sounds; +import io.github.arrayv.utils.StopSort; +import io.github.arrayv.utils.Timer; +import io.github.arrayv.utils.Writes; public abstract class MultipleSortThread { protected ArrayManager arrayManager; diff --git a/src/main/java/io/github/arrayv/threads/RunExchangeSorts.java b/src/main/java/io/github/arrayv/threads/RunExchangeSorts.java index d213ca89..11c9b9c5 100644 --- a/src/main/java/io/github/arrayv/threads/RunExchangeSorts.java +++ b/src/main/java/io/github/arrayv/threads/RunExchangeSorts.java @@ -32,7 +32,7 @@ import io.github.arrayv.sorts.exchange.UnoptimizedBubbleSort; import io.github.arrayv.sorts.exchange.UnoptimizedCocktailShakerSort; import io.github.arrayv.sorts.templates.Sort; -import utils.Shuffles; +import io.github.arrayv.utils.Shuffles; /* * diff --git a/src/main/java/io/github/arrayv/threads/RunHybridSorts.java b/src/main/java/io/github/arrayv/threads/RunHybridSorts.java index a2efb9a9..66a19cef 100644 --- a/src/main/java/io/github/arrayv/threads/RunHybridSorts.java +++ b/src/main/java/io/github/arrayv/threads/RunHybridSorts.java @@ -35,7 +35,7 @@ import io.github.arrayv.sorts.hybrid.WeaveMergeSort; import io.github.arrayv.sorts.hybrid.WikiSort; import io.github.arrayv.sorts.templates.Sort; -import utils.Shuffles; +import io.github.arrayv.utils.Shuffles; /* * diff --git a/src/main/java/io/github/arrayv/threads/RunInsertionSorts.java b/src/main/java/io/github/arrayv/threads/RunInsertionSorts.java index b0cbb8b6..98be6ea7 100644 --- a/src/main/java/io/github/arrayv/threads/RunInsertionSorts.java +++ b/src/main/java/io/github/arrayv/threads/RunInsertionSorts.java @@ -17,7 +17,7 @@ import io.github.arrayv.sorts.insert.SplaySort; import io.github.arrayv.sorts.insert.TreeSort; import io.github.arrayv.sorts.templates.Sort; -import utils.Shuffles; +import io.github.arrayv.utils.Shuffles; /* * diff --git a/src/main/java/io/github/arrayv/threads/RunScriptedSorts.java b/src/main/java/io/github/arrayv/threads/RunScriptedSorts.java index 0fef8c55..88f8ea08 100644 --- a/src/main/java/io/github/arrayv/threads/RunScriptedSorts.java +++ b/src/main/java/io/github/arrayv/threads/RunScriptedSorts.java @@ -5,7 +5,7 @@ import io.github.arrayv.dialogs.RunScriptDialog; import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.panes.JErrorPane; -import utils.MultipleScript; +import io.github.arrayv.utils.MultipleScript; /* * diff --git a/src/main/java/io/github/arrayv/threads/RunSort.java b/src/main/java/io/github/arrayv/threads/RunSort.java index 59a5c6ef..4ce53277 100644 --- a/src/main/java/io/github/arrayv/threads/RunSort.java +++ b/src/main/java/io/github/arrayv/threads/RunSort.java @@ -9,11 +9,11 @@ import io.github.arrayv.panes.JEnhancedOptionPane; import io.github.arrayv.panes.JErrorPane; import io.github.arrayv.sorts.templates.Sort; -import utils.Delays; -import utils.SortingNetworkGenerator; -import utils.Sounds; -import utils.StopSort; -import utils.Timer; +import io.github.arrayv.utils.Delays; +import io.github.arrayv.utils.SortingNetworkGenerator; +import io.github.arrayv.utils.Sounds; +import io.github.arrayv.utils.StopSort; +import io.github.arrayv.utils.Timer; /* * diff --git a/src/main/java/utils/AntiQSort.java b/src/main/java/io/github/arrayv/utils/AntiQSort.java similarity index 98% rename from src/main/java/utils/AntiQSort.java rename to src/main/java/io/github/arrayv/utils/AntiQSort.java index 157b9343..786e5d6b 100644 --- a/src/main/java/utils/AntiQSort.java +++ b/src/main/java/io/github/arrayv/utils/AntiQSort.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import io.github.arrayv.main.ArrayVisualizer; diff --git a/src/main/java/utils/ArrayFileWriter.java b/src/main/java/io/github/arrayv/utils/ArrayFileWriter.java similarity index 97% rename from src/main/java/utils/ArrayFileWriter.java rename to src/main/java/io/github/arrayv/utils/ArrayFileWriter.java index 8d83a5fd..9de3c922 100644 --- a/src/main/java/utils/ArrayFileWriter.java +++ b/src/main/java/io/github/arrayv/utils/ArrayFileWriter.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.io.File; import java.io.FileWriter; diff --git a/src/main/java/utils/ArrayVList.java b/src/main/java/io/github/arrayv/utils/ArrayVList.java similarity index 99% rename from src/main/java/utils/ArrayVList.java rename to src/main/java/io/github/arrayv/utils/ArrayVList.java index 97017e77..3de58aa2 100644 --- a/src/main/java/utils/ArrayVList.java +++ b/src/main/java/io/github/arrayv/utils/ArrayVList.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.util.AbstractList; import java.util.ArrayList; diff --git a/src/main/java/utils/CommonUtils.java b/src/main/java/io/github/arrayv/utils/CommonUtils.java similarity index 97% rename from src/main/java/utils/CommonUtils.java rename to src/main/java/io/github/arrayv/utils/CommonUtils.java index f558f252..74fa6005 100644 --- a/src/main/java/utils/CommonUtils.java +++ b/src/main/java/io/github/arrayv/utils/CommonUtils.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Map; diff --git a/src/main/java/utils/Delays.java b/src/main/java/io/github/arrayv/utils/Delays.java similarity index 99% rename from src/main/java/utils/Delays.java rename to src/main/java/io/github/arrayv/utils/Delays.java index 7893d4b0..922af451 100644 --- a/src/main/java/utils/Delays.java +++ b/src/main/java/io/github/arrayv/utils/Delays.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.text.DecimalFormat; diff --git a/src/main/java/utils/Distributions.java b/src/main/java/io/github/arrayv/utils/Distributions.java similarity index 99% rename from src/main/java/utils/Distributions.java rename to src/main/java/io/github/arrayv/utils/Distributions.java index 5e4f857b..91a9ae00 100644 --- a/src/main/java/utils/Distributions.java +++ b/src/main/java/io/github/arrayv/utils/Distributions.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/utils/Highlights.java b/src/main/java/io/github/arrayv/utils/Highlights.java similarity index 99% rename from src/main/java/utils/Highlights.java rename to src/main/java/io/github/arrayv/utils/Highlights.java index af128745..0aba07b5 100644 --- a/src/main/java/utils/Highlights.java +++ b/src/main/java/io/github/arrayv/utils/Highlights.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.util.Arrays; diff --git a/src/main/java/utils/IndexedRotations.java b/src/main/java/io/github/arrayv/utils/IndexedRotations.java similarity index 98% rename from src/main/java/utils/IndexedRotations.java rename to src/main/java/io/github/arrayv/utils/IndexedRotations.java index d0479338..6c44c1c0 100644 --- a/src/main/java/utils/IndexedRotations.java +++ b/src/main/java/io/github/arrayv/utils/IndexedRotations.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; public class IndexedRotations { public static void griesMills(int[] array, int start, int mid, int end, double pause, boolean mark, boolean auxwrite) { diff --git a/src/main/java/utils/MultipleScript.java b/src/main/java/io/github/arrayv/utils/MultipleScript.java similarity index 99% rename from src/main/java/utils/MultipleScript.java rename to src/main/java/io/github/arrayv/utils/MultipleScript.java index 73c5ee3a..9b0e9069 100644 --- a/src/main/java/utils/MultipleScript.java +++ b/src/main/java/io/github/arrayv/utils/MultipleScript.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/utils/PerlinNoise.java b/src/main/java/io/github/arrayv/utils/PerlinNoise.java similarity index 98% rename from src/main/java/utils/PerlinNoise.java rename to src/main/java/io/github/arrayv/utils/PerlinNoise.java index 8a1f87ab..5c011fdb 100644 --- a/src/main/java/utils/PerlinNoise.java +++ b/src/main/java/io/github/arrayv/utils/PerlinNoise.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; // MASSIVE thanks to https://github.com/keijiro/PerlinNoise public class PerlinNoise { diff --git a/src/main/java/utils/Reads.java b/src/main/java/io/github/arrayv/utils/Reads.java similarity index 99% rename from src/main/java/utils/Reads.java rename to src/main/java/io/github/arrayv/utils/Reads.java index f7c5efa2..0bf3aa99 100644 --- a/src/main/java/utils/Reads.java +++ b/src/main/java/io/github/arrayv/utils/Reads.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.text.DecimalFormat; import java.util.ArrayList; diff --git a/src/main/java/utils/Renderer.java b/src/main/java/io/github/arrayv/utils/Renderer.java similarity index 99% rename from src/main/java/utils/Renderer.java rename to src/main/java/io/github/arrayv/utils/Renderer.java index 56040c4d..204587f1 100644 --- a/src/main/java/utils/Renderer.java +++ b/src/main/java/io/github/arrayv/utils/Renderer.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.visuals.VisualStyles; diff --git a/src/main/java/utils/Rotations.java b/src/main/java/io/github/arrayv/utils/Rotations.java similarity index 99% rename from src/main/java/utils/Rotations.java rename to src/main/java/io/github/arrayv/utils/Rotations.java index e98ae518..b5812b52 100644 --- a/src/main/java/utils/Rotations.java +++ b/src/main/java/io/github/arrayv/utils/Rotations.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import io.github.arrayv.main.ArrayVisualizer; diff --git a/src/main/java/utils/ShuffleGraph.java b/src/main/java/io/github/arrayv/utils/ShuffleGraph.java similarity index 98% rename from src/main/java/utils/ShuffleGraph.java rename to src/main/java/io/github/arrayv/utils/ShuffleGraph.java index 152d50c9..5958a72e 100644 --- a/src/main/java/utils/ShuffleGraph.java +++ b/src/main/java/io/github/arrayv/utils/ShuffleGraph.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.awt.Graphics2D; import java.awt.Point; @@ -14,8 +14,8 @@ import java.util.Set; import io.github.arrayv.main.ArrayVisualizer; -import utils.shuffleutils.GraphConnection; -import utils.shuffleutils.GraphNode; +import io.github.arrayv.utils.shuffleutils.GraphConnection; +import io.github.arrayv.utils.shuffleutils.GraphNode; public class ShuffleGraph implements Collection { public List nodes; diff --git a/src/main/java/utils/ShuffleInfo.java b/src/main/java/io/github/arrayv/utils/ShuffleInfo.java similarity index 99% rename from src/main/java/utils/ShuffleInfo.java rename to src/main/java/io/github/arrayv/utils/ShuffleInfo.java index de5c72ba..51254556 100644 --- a/src/main/java/utils/ShuffleInfo.java +++ b/src/main/java/io/github/arrayv/utils/ShuffleInfo.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/utils/Shuffles.java b/src/main/java/io/github/arrayv/utils/Shuffles.java similarity index 99% rename from src/main/java/utils/Shuffles.java rename to src/main/java/io/github/arrayv/utils/Shuffles.java index 4abe4882..f2bb3361 100644 --- a/src/main/java/utils/Shuffles.java +++ b/src/main/java/io/github/arrayv/utils/Shuffles.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/main/java/utils/SortingNetworkGenerator.java b/src/main/java/io/github/arrayv/utils/SortingNetworkGenerator.java similarity index 99% rename from src/main/java/utils/SortingNetworkGenerator.java rename to src/main/java/io/github/arrayv/utils/SortingNetworkGenerator.java index 2c690e4b..6d0b3aa2 100644 --- a/src/main/java/utils/SortingNetworkGenerator.java +++ b/src/main/java/io/github/arrayv/utils/SortingNetworkGenerator.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.awt.Desktop; import java.io.BufferedWriter; diff --git a/src/main/java/utils/Sounds.java b/src/main/java/io/github/arrayv/utils/Sounds.java similarity index 99% rename from src/main/java/utils/Sounds.java rename to src/main/java/io/github/arrayv/utils/Sounds.java index 89285124..b8e1fe15 100644 --- a/src/main/java/utils/Sounds.java +++ b/src/main/java/io/github/arrayv/utils/Sounds.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/utils/Statistics.java b/src/main/java/io/github/arrayv/utils/Statistics.java similarity index 99% rename from src/main/java/utils/Statistics.java rename to src/main/java/io/github/arrayv/utils/Statistics.java index 9bb497b9..345f97d0 100644 --- a/src/main/java/utils/Statistics.java +++ b/src/main/java/io/github/arrayv/utils/Statistics.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.text.DecimalFormat; diff --git a/src/main/java/utils/StopSort.java b/src/main/java/io/github/arrayv/utils/StopSort.java similarity index 82% rename from src/main/java/utils/StopSort.java rename to src/main/java/io/github/arrayv/utils/StopSort.java index fe7602ee..ccf5ff92 100644 --- a/src/main/java/utils/StopSort.java +++ b/src/main/java/io/github/arrayv/utils/StopSort.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; public class StopSort extends RuntimeException { diff --git a/src/main/java/utils/Timer.java b/src/main/java/io/github/arrayv/utils/Timer.java similarity index 99% rename from src/main/java/utils/Timer.java rename to src/main/java/io/github/arrayv/utils/Timer.java index f8aaf257..e27c1f0b 100644 --- a/src/main/java/utils/Timer.java +++ b/src/main/java/io/github/arrayv/utils/Timer.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.text.DecimalFormat; import java.util.Hashtable; diff --git a/src/main/java/utils/Writes.java b/src/main/java/io/github/arrayv/utils/Writes.java similarity index 99% rename from src/main/java/utils/Writes.java rename to src/main/java/io/github/arrayv/utils/Writes.java index 7048fe1e..d7666d8c 100644 --- a/src/main/java/utils/Writes.java +++ b/src/main/java/io/github/arrayv/utils/Writes.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/utils/m.java b/src/main/java/io/github/arrayv/utils/m.java similarity index 98% rename from src/main/java/utils/m.java rename to src/main/java/io/github/arrayv/utils/m.java index 1ab9af7a..060359b9 100644 --- a/src/main/java/utils/m.java +++ b/src/main/java/io/github/arrayv/utils/m.java @@ -1,4 +1,4 @@ -package utils; +package io.github.arrayv.utils; public final class m { diff --git a/src/main/java/utils/shuffleutils/AWTUtils.java b/src/main/java/io/github/arrayv/utils/shuffleutils/AWTUtils.java similarity index 95% rename from src/main/java/utils/shuffleutils/AWTUtils.java rename to src/main/java/io/github/arrayv/utils/shuffleutils/AWTUtils.java index 4ae7427d..1eaa14f3 100644 --- a/src/main/java/utils/shuffleutils/AWTUtils.java +++ b/src/main/java/io/github/arrayv/utils/shuffleutils/AWTUtils.java @@ -1,4 +1,4 @@ -package utils.shuffleutils; +package io.github.arrayv.utils.shuffleutils; import java.awt.BasicStroke; import java.awt.Graphics2D; diff --git a/src/main/java/utils/shuffleutils/GraphConnection.java b/src/main/java/io/github/arrayv/utils/shuffleutils/GraphConnection.java similarity index 98% rename from src/main/java/utils/shuffleutils/GraphConnection.java rename to src/main/java/io/github/arrayv/utils/shuffleutils/GraphConnection.java index 1df42e4c..86ec0e0f 100644 --- a/src/main/java/utils/shuffleutils/GraphConnection.java +++ b/src/main/java/io/github/arrayv/utils/shuffleutils/GraphConnection.java @@ -1,4 +1,4 @@ -package utils.shuffleutils; +package io.github.arrayv.utils.shuffleutils; import java.awt.BasicStroke; import java.awt.Color; diff --git a/src/main/java/utils/shuffleutils/GraphNode.java b/src/main/java/io/github/arrayv/utils/shuffleutils/GraphNode.java similarity index 96% rename from src/main/java/utils/shuffleutils/GraphNode.java rename to src/main/java/io/github/arrayv/utils/shuffleutils/GraphNode.java index db192cab..258ad830 100644 --- a/src/main/java/utils/shuffleutils/GraphNode.java +++ b/src/main/java/io/github/arrayv/utils/shuffleutils/GraphNode.java @@ -1,12 +1,12 @@ -package utils.shuffleutils; +package io.github.arrayv.utils.shuffleutils; import java.awt.Color; import java.awt.Graphics2D; import java.awt.Point; import java.awt.geom.Rectangle2D; -import utils.ShuffleGraph; -import utils.ShuffleInfo; +import io.github.arrayv.utils.ShuffleGraph; +import io.github.arrayv.utils.ShuffleInfo; public class GraphNode { public static final int WIDTH = 250; diff --git a/src/main/java/utils/shuffleutils/GraphReader.java b/src/main/java/io/github/arrayv/utils/shuffleutils/GraphReader.java similarity index 98% rename from src/main/java/utils/shuffleutils/GraphReader.java rename to src/main/java/io/github/arrayv/utils/shuffleutils/GraphReader.java index 70f45d63..5da5d023 100644 --- a/src/main/java/utils/shuffleutils/GraphReader.java +++ b/src/main/java/io/github/arrayv/utils/shuffleutils/GraphReader.java @@ -1,4 +1,4 @@ -package utils.shuffleutils; +package io.github.arrayv.utils.shuffleutils; import java.awt.Point; import java.io.File; @@ -11,10 +11,10 @@ import java.util.Set; import java.util.stream.Collectors; -import utils.Distributions; -import utils.ShuffleGraph; -import utils.ShuffleInfo; -import utils.Shuffles; +import io.github.arrayv.utils.Distributions; +import io.github.arrayv.utils.ShuffleGraph; +import io.github.arrayv.utils.ShuffleInfo; +import io.github.arrayv.utils.Shuffles; public final class GraphReader { public final class MalformedGraphFileException extends Exception { diff --git a/src/main/java/utils/shuffleutils/GraphWriter.java b/src/main/java/io/github/arrayv/utils/shuffleutils/GraphWriter.java similarity index 95% rename from src/main/java/utils/shuffleutils/GraphWriter.java rename to src/main/java/io/github/arrayv/utils/shuffleutils/GraphWriter.java index f113fd4d..f03db522 100644 --- a/src/main/java/utils/shuffleutils/GraphWriter.java +++ b/src/main/java/io/github/arrayv/utils/shuffleutils/GraphWriter.java @@ -1,4 +1,4 @@ -package utils.shuffleutils; +package io.github.arrayv.utils.shuffleutils; import java.io.File; import java.io.FileWriter; @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; -import utils.ShuffleGraph; +import io.github.arrayv.utils.ShuffleGraph; public final class GraphWriter { public static final int VERSION = 3; diff --git a/src/main/java/io/github/arrayv/visuals/Visual.java b/src/main/java/io/github/arrayv/visuals/Visual.java index f9d2552d..8a35ce66 100644 --- a/src/main/java/io/github/arrayv/visuals/Visual.java +++ b/src/main/java/io/github/arrayv/visuals/Visual.java @@ -5,8 +5,8 @@ import java.awt.Graphics2D; import io.github.arrayv.main.ArrayVisualizer; -import utils.Highlights; -import utils.Renderer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; public abstract class Visual { protected Graphics2D mainRender; diff --git a/src/main/java/io/github/arrayv/visuals/VisualStyles.java b/src/main/java/io/github/arrayv/visuals/VisualStyles.java index cce7e6f4..f7a08cfc 100644 --- a/src/main/java/io/github/arrayv/visuals/VisualStyles.java +++ b/src/main/java/io/github/arrayv/visuals/VisualStyles.java @@ -1,8 +1,8 @@ package io.github.arrayv.visuals; import io.github.arrayv.main.ArrayVisualizer; -import utils.Highlights; -import utils.Renderer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/bars/BarGraph.java b/src/main/java/io/github/arrayv/visuals/bars/BarGraph.java index 7ca8b10b..4ba5a169 100644 --- a/src/main/java/io/github/arrayv/visuals/bars/BarGraph.java +++ b/src/main/java/io/github/arrayv/visuals/bars/BarGraph.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; public final class BarGraph extends Visual { diff --git a/src/main/java/io/github/arrayv/visuals/bars/DisparityBarGraph.java b/src/main/java/io/github/arrayv/visuals/bars/DisparityBarGraph.java index 4d688f67..b2b3d219 100644 --- a/src/main/java/io/github/arrayv/visuals/bars/DisparityBarGraph.java +++ b/src/main/java/io/github/arrayv/visuals/bars/DisparityBarGraph.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; public final class DisparityBarGraph extends Visual { diff --git a/src/main/java/io/github/arrayv/visuals/bars/Rainbow.java b/src/main/java/io/github/arrayv/visuals/bars/Rainbow.java index 62adb48a..9535b667 100644 --- a/src/main/java/io/github/arrayv/visuals/bars/Rainbow.java +++ b/src/main/java/io/github/arrayv/visuals/bars/Rainbow.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/bars/SineWave.java b/src/main/java/io/github/arrayv/visuals/bars/SineWave.java index 2b006d54..ad43bd85 100644 --- a/src/main/java/io/github/arrayv/visuals/bars/SineWave.java +++ b/src/main/java/io/github/arrayv/visuals/bars/SineWave.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/circles/ColorCircle.java b/src/main/java/io/github/arrayv/visuals/circles/ColorCircle.java index 39f05855..6bbca359 100644 --- a/src/main/java/io/github/arrayv/visuals/circles/ColorCircle.java +++ b/src/main/java/io/github/arrayv/visuals/circles/ColorCircle.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/circles/DisparityChords.java b/src/main/java/io/github/arrayv/visuals/circles/DisparityChords.java index ba13499f..6aebcc3e 100644 --- a/src/main/java/io/github/arrayv/visuals/circles/DisparityChords.java +++ b/src/main/java/io/github/arrayv/visuals/circles/DisparityChords.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/circles/DisparityCircle.java b/src/main/java/io/github/arrayv/visuals/circles/DisparityCircle.java index 89d208bc..287799f5 100644 --- a/src/main/java/io/github/arrayv/visuals/circles/DisparityCircle.java +++ b/src/main/java/io/github/arrayv/visuals/circles/DisparityCircle.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/circles/Spiral.java b/src/main/java/io/github/arrayv/visuals/circles/Spiral.java index 91a66cae..c62f3dd9 100644 --- a/src/main/java/io/github/arrayv/visuals/circles/Spiral.java +++ b/src/main/java/io/github/arrayv/visuals/circles/Spiral.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/dots/DisparityDots.java b/src/main/java/io/github/arrayv/visuals/dots/DisparityDots.java index 8b32f2c7..690cc4a7 100644 --- a/src/main/java/io/github/arrayv/visuals/dots/DisparityDots.java +++ b/src/main/java/io/github/arrayv/visuals/dots/DisparityDots.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/dots/ScatterPlot.java b/src/main/java/io/github/arrayv/visuals/dots/ScatterPlot.java index d8827fe1..b4bfce50 100644 --- a/src/main/java/io/github/arrayv/visuals/dots/ScatterPlot.java +++ b/src/main/java/io/github/arrayv/visuals/dots/ScatterPlot.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/dots/SpiralDots.java b/src/main/java/io/github/arrayv/visuals/dots/SpiralDots.java index ec8eed24..863cb3a9 100644 --- a/src/main/java/io/github/arrayv/visuals/dots/SpiralDots.java +++ b/src/main/java/io/github/arrayv/visuals/dots/SpiralDots.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/dots/WaveDots.java b/src/main/java/io/github/arrayv/visuals/dots/WaveDots.java index 43f9b718..47d89ab7 100644 --- a/src/main/java/io/github/arrayv/visuals/dots/WaveDots.java +++ b/src/main/java/io/github/arrayv/visuals/dots/WaveDots.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/image/CustomImage.java b/src/main/java/io/github/arrayv/visuals/image/CustomImage.java index dcbf4ad2..5b9dc409 100644 --- a/src/main/java/io/github/arrayv/visuals/image/CustomImage.java +++ b/src/main/java/io/github/arrayv/visuals/image/CustomImage.java @@ -18,9 +18,9 @@ import io.github.arrayv.frames.ImageFrame; import io.github.arrayv.main.ArrayVisualizer; import io.github.arrayv.panes.JErrorPane; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/misc/HoopStack.java b/src/main/java/io/github/arrayv/visuals/misc/HoopStack.java index d51aee70..b0535cbb 100644 --- a/src/main/java/io/github/arrayv/visuals/misc/HoopStack.java +++ b/src/main/java/io/github/arrayv/visuals/misc/HoopStack.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* * diff --git a/src/main/java/io/github/arrayv/visuals/misc/PixelMesh.java b/src/main/java/io/github/arrayv/visuals/misc/PixelMesh.java index 8dd4e55f..3610acfd 100644 --- a/src/main/java/io/github/arrayv/visuals/misc/PixelMesh.java +++ b/src/main/java/io/github/arrayv/visuals/misc/PixelMesh.java @@ -3,9 +3,9 @@ import java.awt.Color; import io.github.arrayv.main.ArrayVisualizer; +import io.github.arrayv.utils.Highlights; +import io.github.arrayv.utils.Renderer; import io.github.arrayv.visuals.Visual; -import utils.Highlights; -import utils.Renderer; /* *