Skip to content

Commit

Permalink
Move utils
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaming32 committed Feb 15, 2022
1 parent 650073e commit ad298f8
Show file tree
Hide file tree
Showing 70 changed files with 146 additions and 145 deletions.
14 changes: 7 additions & 7 deletions src/main/java/io/github/arrayv/dialogs/ShuffleDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/frames/ArrayFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/frames/SoundFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/github/arrayv/frames/UtilFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/io/github/arrayv/main/ArrayManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down Expand Up @@ -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;

Expand Down
24 changes: 12 additions & 12 deletions src/main/java/io/github/arrayv/main/ArrayVisualizer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/*
*
Expand Down Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/io/github/arrayv/main/SortAnalyzer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down Expand Up @@ -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;"
);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/panels/ShufflePanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/arrayv/prompts/ShufflePrompt.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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 [email protected]
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/github/arrayv/sorts/templates/Sort.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/io/github/arrayv/threads/MultipleSortThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/threads/RunHybridSorts.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/io/github/arrayv/threads/RunSort.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils;
package io.github.arrayv.utils;

import io.github.arrayv.main.ArrayVisualizer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils;
package io.github.arrayv.utils;

import java.io.File;
import java.io.FileWriter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils;
package io.github.arrayv.utils;

import java.util.AbstractList;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils;
package io.github.arrayv.utils;

import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils;
package io.github.arrayv.utils;

import java.text.DecimalFormat;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils;
package io.github.arrayv.utils;

import java.io.File;
import java.io.FileNotFoundException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils;
package io.github.arrayv.utils;

import java.util.Arrays;

Expand Down
Loading

0 comments on commit ad298f8

Please sign in to comment.