Skip to content

Commit

Permalink
Move main
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaming32 committed Feb 15, 2022
1 parent 5ad6c80 commit 650073e
Show file tree
Hide file tree
Showing 295 changed files with 307 additions and 308 deletions.
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"type": "java",
"name": "Debug ArrayV",
"request": "launch",
"mainClass": "main.ArrayVisualizer",
"mainClass": "io.github.arrayv.main.ArrayVisualizer",
"vmArgs": ["-Dsun.java2d.d3d=false", "-cp", "bin;lib/classgraph-4.8.47.jar"]
},
{
// should match run.bat
"type": "java",
"name": "Debug ArrayV (custom max length)",
"request": "launch",
"mainClass": "main.ArrayVisualizer",
"mainClass": "io.github.arrayv.main.ArrayVisualizer",
"args": ["${input:length}"],
"vmArgs": ["-Dsun.java2d.d3d=false", "-cp", "bin;lib/classgraph-4.8.47.jar"]
}
Expand Down
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<target depends="build" name="dist-jar" description="Creates an executable JAR file in the dist directory">
<jar destfile="dist/arrayVisualizer.jar">
<manifest>
<attribute name="Main-Class" value="main.ArrayVisualizer"/>
<attribute name="Main-Class" value="io.github.arrayv.main.ArrayVisualizer"/>
<attribute name="Add-Opens" value="java.desktop/com.sun.media.sound"/>
</manifest>
<zipfileset src="lib/classgraph-4.8.47.jar"/>
Expand All @@ -73,7 +73,7 @@
</jar>
</target>
<target depends="build" name="run" description="Runs ArrayV">
<java classname="main.ArrayVisualizer" classpathref="ArrayVisualizer-master.classpath" fork="true">
<java classname="io.github.arrayv.main.ArrayVisualizer" classpathref="ArrayVisualizer-master.classpath" fork="true">
<jvmarg value="-Dsun.java2d.d3d=false"/>
</java>
</target>
Expand Down
2 changes: 1 addition & 1 deletion run.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java -Dsun.java2d.d3d=false -cp bin;lib/classgraph-4.8.47.jar main.ArrayVisualizer %1
java -Dsun.java2d.d3d=false -cp bin;lib/classgraph-4.8.47.jar io.github.arrayv.main.ArrayVisualizer %1
4 changes: 2 additions & 2 deletions run.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if [ "$1" != "" ]
then
java -Dsun.java2d.d3d=false -cp bin:lib/classgraph-4.8.47.jar main.ArrayVisualizer "$1"
java -Dsun.java2d.d3d=false -cp bin:lib/classgraph-4.8.47.jar io.github.arrayv.main.ArrayVisualizer "$1"
else
java -Dsun.java2d.d3d=false -cp bin:lib/classgraph-4.8.47.jar main.ArrayVisualizer
java -Dsun.java2d.d3d=false -cp bin:lib/classgraph-4.8.47.jar io.github.arrayv.main.ArrayVisualizer
fi
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/dialogs/ShuffleDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
import javax.swing.event.DocumentListener;

import io.github.arrayv.frames.AppFrame;
import io.github.arrayv.main.ArrayManager;
import io.github.arrayv.panels.ShufflePanel;
import io.github.arrayv.panes.JErrorPane;
import main.ArrayManager;
import utils.Distributions;
import utils.ShuffleGraph;
import utils.ShuffleInfo;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/arrayv/frames/ArrayFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;

import io.github.arrayv.main.ArrayManager;
import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.panes.JEnhancedOptionPane;
import main.ArrayManager;
import main.ArrayVisualizer;
import utils.Highlights;

/*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/arrayv/frames/UtilFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import javax.swing.JFrame;
import javax.swing.JOptionPane;

import io.github.arrayv.main.ArrayManager;
import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.prompts.ShufflePrompt;
import io.github.arrayv.prompts.SortPrompt;
import io.github.arrayv.prompts.ViewPrompt;
import main.ArrayManager;
import main.ArrayVisualizer;
import utils.Delays;
import utils.Highlights;
import utils.Sounds;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main;
package io.github.arrayv.main;

import java.util.Arrays;

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

import java.awt.BasicStroke;
import java.awt.Color;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main;
package io.github.arrayv.main;

import java.io.File;
import java.io.FileOutputStream;
Expand Down Expand Up @@ -78,6 +78,7 @@ public final class SortAnalyzer {
private static final Map.Entry<String, String>[] IMPORT_REPLACEMENTS = CommonUtils.createPairArray(
"import dialogs.", "import io.github.arrayv.dialogs.",
"import frames.", "import io.github.arrayv.frames.",
"import main.", "import io.github.arrayv.main.",
"import panels.", "import io.github.arrayv.panels.",
"import panes.", "import io.github.arrayv.panes.",
"import prompts.", "import io.github.arrayv.prompts.",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/prompts/ShufflePrompt.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import io.github.arrayv.dialogs.ShuffleDialog;
import io.github.arrayv.frames.AppFrame;
import io.github.arrayv.frames.UtilFrame;
import io.github.arrayv.main.ArrayManager;
import io.github.arrayv.panes.JErrorPane;
import main.ArrayManager;
import utils.Distributions;
import utils.Shuffles;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/arrayv/prompts/SortPrompt.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import io.github.arrayv.dialogs.ImportSortDialog;
import io.github.arrayv.frames.AppFrame;
import io.github.arrayv.frames.UtilFrame;
import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.main.SortAnalyzer;
import io.github.arrayv.panes.JErrorPane;
import io.github.arrayv.sortdata.SortInfo;
import io.github.arrayv.threads.MultipleSortThread;
Expand All @@ -39,8 +41,6 @@
import io.github.arrayv.threads.RunQuickSorts;
import io.github.arrayv.threads.RunSelectionSorts;
import io.github.arrayv.threads.RunSort;
import main.ArrayVisualizer;
import main.SortAnalyzer;

/*
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/prompts/ViewPrompt.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import io.github.arrayv.frames.AppFrame;
import io.github.arrayv.frames.UtilFrame;
import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.visuals.VisualStyles;
import main.ArrayVisualizer;

/*
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import java.lang.reflect.Constructor;
import java.util.function.Supplier;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class NewSortInstance implements Supplier<Sort> {
private static final MethodHandles.Lookup LOOKUP = MethodHandles.publicLookup();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/sortdata/SortInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import java.util.HashSet;
import java.util.function.Supplier;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class SortInfo {
private final int id;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

/*
* This version of Bitonic Sort was taken from here, written by Nikos Pitsianis:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class BitonicSortParallel extends Sort {
private int[] arr;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

/*
* This version of Bitonic Sort was taken from here, written by H.W. Lang:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class BoseNelsonSortIterative extends Sort {
public BoseNelsonSortIterative(ArrayVisualizer arrayVisualizer) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class BoseNelsonSortParallel extends Sort {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class BoseNelsonSortRecursive extends Sort {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class DiamondSortRecursive extends Sort {
private final double DELAY = 0.05;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

/*
Idea made by Control#2866 in The Studio Discord Server (https://discord.com/invite/2xGkKC2)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class MergeExchangeSortIterative extends Sort {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

/*
* This version of Odd-Even Merge Sort was taken from here, written by wkpark on StackOverflow:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

/*
* This version of Odd-Even Merge Sort was taken from here, written by H.W. Lang:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

public final class WeaveSortParallel extends Sort {
private int[] arr;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.concurrent;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.Sort;
import main.ArrayVisualizer;

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

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.BinaryQuickSorting;
import main.ArrayVisualizer;

/**
* Binary MSD Radix Sort / Binary Quicksort.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.arrayv.sorts.distribute;

import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.sorts.templates.BinaryQuickSorting;
import main.ArrayVisualizer;

/**
* Binary MSD Radix Sort / Binary Quicksort.
Expand Down
Loading

0 comments on commit 650073e

Please sign in to comment.