Attempt to make styling consistent

Also, I'm trying to match the styling in the JDK
Gaming32 · Dec 31, 2021 · b893426 · b893426
1 parent c121b3a
commit b893426
Show file tree

Hide file tree

Showing 72 changed files with 1,510 additions and 1,652 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ ant
 java -cp bin;lib/classgraph-4.8.47.jar main.ArrayVisualizer
 ```
 To build a runnable jar, simply run Apache Ant inside the 'dist' directory (but make sure you did the above first)!
-If you don't want to use Apache Ant or the Java command line, a runnable jar that is up to a month old is available from the `dist` directory. 
+If you don't want to use Apache Ant or the Java command line, a runnable jar that is up to a month old is available from the `dist` directory.
 
 ### Features:
 - 40+ new sorting algorithms

diff --git a/Shuffles copy.java b/Shuffles copy.java
diff --git a/SortPrompt_old.java b/SortPrompt_old.java
@@ -20,7 +20,7 @@
 import threads.RunDistributionSort;
 
 /*
- * 
+ *
 MIT License
 
 Copyright (c) 2019 w0rthy
@@ -53,20 +53,20 @@ of this software and associated documentation files (the "Software"), to deal
 final public class SortPrompt extends javax.swing.JFrame implements AppFrame {
 
     private static final long serialVersionUID = 1L;
-    
+
     private int[] array;
-    
+
     private ArrayVisualizer ArrayVisualizer;
     private JFrame Frame;
     private UtilFrame UtilFrame;
-    
+
     @SuppressWarnings("unchecked")
     public SortPrompt(int[] array, ArrayVisualizer arrayVisualizer, JFrame frame, UtilFrame utilFrame) {
         this.array = array;
         this.ArrayVisualizer = arrayVisualizer;
         this.Frame = frame;
         this.UtilFrame = utilFrame;
-        
+
         setAlwaysOnTop(true);
         setUndecorated(true);
         initComponents();
@@ -104,7 +104,7 @@ private void initComponents() {
         jScrollPane1.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 
         jList2.setModel(new javax.swing.AbstractListModel() {
-            
+
             private static final long serialVersionUID = 1L;
 
             String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
@@ -126,7 +126,7 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
         jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 
         jList1.setModel(new javax.swing.AbstractListModel() {
-            
+
             private static final long serialVersionUID = 1L;
 
             String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
@@ -152,7 +152,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 jButton1ActionPerformed();
             }
         });
-        
+
         jButton2.setText("Import Sort");
         jButton2.addActionListener(new java.awt.event.ActionListener() {
             @Override

diff --git a/src/dialogs/FileDialog.java b/src/dialogs/FileDialog.java
@@ -25,8 +25,7 @@ public FileDialog() {
     public static void initialize() {
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         FileDialog.fileDialog = new JFileChooser();

diff --git a/src/dialogs/LoadingDialog.java b/src/dialogs/LoadingDialog.java
@@ -16,7 +16,7 @@ public class LoadingDialog {
     private JDialog dialog;
 
     public LoadingDialog(String resource, JFrame parent) {
-        this.pane = new JOptionPane("Loading " + resource + "...", JOptionPane.INFORMATION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, new Object[] {}, null);
+        this.pane = new JOptionPane("Loading " + resource + "...", JOptionPane.INFORMATION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, new Object[] { }, null);
         this.dialog = this.pane.createDialog(parent, "Info");
         this.dialog.setModalityType(ModalityType.MODELESS);
         this.dialog.setAlwaysOnTop(this.dialog.isAlwaysOnTopSupported());

diff --git a/src/dialogs/ShuffleDialog.java b/src/dialogs/ShuffleDialog.java
@@ -95,8 +95,8 @@ public ShuffleDialog(ArrayManager ArrayManager, JFrame frame, UtilFrame utilFram
         bypassEvents = true;
         this.shuffleEditor.graph = ArrayManager.getShuffle();
         jList4.setListData(ArrayManager.getDistributionIDs());
-        for(int i = 0; i < ArrayManager.getDistributions().length; i++) {
-            if(ArrayManager.getDistribution().equals(ArrayManager.getDistributions()[i])) {
+        for (int i = 0; i < ArrayManager.getDistributions().length; i++) {
+            if (ArrayManager.getDistribution().equals(ArrayManager.getDistributions()[i])) {
                 jList4.setSelectedIndex(i);
                 break;
             }

diff --git a/src/frames/AppFrame.java b/src/frames/AppFrame.java
@@ -1,7 +1,7 @@
 package frames;
 
 /*
- * 
+ *
 MIT License
 
 Copyright (c) 2019 w0rthy

diff --git a/src/frames/ArrayFrame.java b/src/frames/ArrayFrame.java
@@ -26,7 +26,7 @@
 import utils.Highlights;
 
 /*
- * 
+ *
 MIT License
 
 Copyright (c) 2019 w0rthy
@@ -60,7 +60,7 @@ final public class ArrayFrame extends javax.swing.JFrame {
     final private static long serialVersionUID = 1L;
 
     private int[] array;
-    
+
     private ArrayManager ArrayManager;
     private ArrayVisualizer ArrayVisualizer;
     private AppFrame abstractFrame;
@@ -72,14 +72,14 @@ final public class ArrayFrame extends javax.swing.JFrame {
 
     public ArrayFrame(int[] array, ArrayVisualizer arrayVisualizer) {
         this.array = array;
-        
+
         this.ArrayVisualizer = arrayVisualizer;
         this.ArrayManager = ArrayVisualizer.getArrayManager();
-        
+
         this.Highlights = ArrayVisualizer.getHighlights();
         this.Frame = ArrayVisualizer.getMainWindow();
         this.UtilFrame = ArrayVisualizer.getUtilFrame();
-        
+
         setUndecorated(true);
         initComponents();
         setLocation(Math.min((int) Toolkit.getDefaultToolkit().getScreenSize().getWidth() - getWidth(), Frame.getX() + Frame.getWidth()), Frame.getY() + 29);
@@ -90,7 +90,7 @@ public ArrayFrame(int[] array, ArrayVisualizer arrayVisualizer) {
     public void reposition(){
         toFront();
         setLocation(Math.min((int) Toolkit.getDefaultToolkit().getScreenSize().getWidth() - getWidth() - UtilFrame.getWidth(), Frame.getX() + Frame.getWidth()), Frame.getY() + 29);
-        if(this.abstractFrame != null && abstractFrame.isVisible())
+        if (this.abstractFrame != null && abstractFrame.isVisible())
             abstractFrame.reposition();
     }
 
@@ -131,14 +131,14 @@ private void initComponents() {
             if (!os.equals("Linux")) {
                 UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             JErrorPane.invokeErrorMessage(e);
         }
 
         KeyListener kListener = new KeyListener() {
             @Override
-            public void keyTyped(KeyEvent e) { }
+            public void keyTyped(KeyEvent e) {
+            }
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_SHIFT)
@@ -158,7 +158,7 @@ public void keyReleased(KeyEvent e) {
         this.jLabel2 = new javax.swing.JLabel();
         this.jSlider1 = new javax.swing.JSlider(SwingConstants.VERTICAL, 100000, usePower, useDefault);
         this.jSlider2 = new javax.swing.JSlider(SwingConstants.VERTICAL, 100000, usePower, useDefault);
-        
+
         jLabel1.setText("Array Size");
         jLabel2.setText("Unique Elements");
 
@@ -167,7 +167,7 @@ public void keyReleased(KeyEvent e) {
         Hashtable<Integer, JLabel> labels = new Hashtable<>();
         int pow = 1;
         int value = ArrayVisualizer.getMinimumLength();
-        while(value <= ArrayVisualizer.getMaximumLength()) {
+        while (value <= ArrayVisualizer.getMaximumLength()) {
             labels.put(pow * 100000, new JLabel(Integer.toString(value)));
             pow += 1;
             value *= 2;
@@ -181,7 +181,7 @@ public void keyReleased(KeyEvent e) {
         jSlider1.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent event) {
-                if(ArrayManager.isLengthMutable()) {
+                if (ArrayManager.isLengthMutable()) {
                     int value = jSlider1.getValue();
                     if (lockToPow2) {
                         value = (int)(Math.round(value / 100000.0) * 100000);
@@ -194,13 +194,12 @@ public void stateChanged(ChangeEvent event) {
                     jSlider2.setValue((int)(value / divver));
                     //ArrayVisualizer.setEqualItems((int) Math.pow(2, jSlider.getValue()));
                     ArrayManager.initializeArray(array);
-                }
-                else {
+                } else {
                     int currentLength = ArrayVisualizer.getCurrentLength();
                     jSlider1.setValue(calculateSliderValue(currentLength));
                 }
-                //if(ArrayVisualizer.getVisualStyles() == visuals.VisualStyles.CIRCULAR && jSlider1.getValue() == 1) jSlider1.setValue(2);
-                
+                //if (ArrayVisualizer.getVisualStyles() == visuals.VisualStyles.CIRCULAR && jSlider1.getValue() == 1) jSlider1.setValue(2);
+
                 Highlights.clearAllMarks();
             }
         });
@@ -211,8 +210,8 @@ public void mouseClicked(MouseEvent event) {
                     int newSize = 0;
                     try {
                         newSize = getSomethingSize("Array Size", "Enter new array size:");
+                    } catch (Exception e) {
                     }
-                    catch(Exception e) { }
                     if (newSize >= 2) {
                         jSlider1.setValue(calculateSliderValue(newSize));
                         ArrayVisualizer.setCurrentLength(newSize);
@@ -221,13 +220,17 @@ public void mouseClicked(MouseEvent event) {
                 }
             }
             @Override
-            public void mousePressed(MouseEvent e) { }
+            public void mousePressed(MouseEvent e) {
+            }
             @Override
-            public void mouseReleased(MouseEvent e) { }
+            public void mouseReleased(MouseEvent e) {
+            }
             @Override
-            public void mouseEntered(MouseEvent e) { }
+            public void mouseEntered(MouseEvent e) {
+            }
             @Override
-            public void mouseExited(MouseEvent e) { }
+            public void mouseExited(MouseEvent e) {
+            }
         });
         jSlider1.addKeyListener(kListener);
 
@@ -239,11 +242,10 @@ public void mouseExited(MouseEvent e) { }
         jSlider2.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent event) {
-                if(ArrayManager.isLengthMutable()) {
+                if (ArrayManager.isLengthMutable()) {
                     if (jSlider2.getValue() > jSlider1.getValue()) {
                         jSlider2.setValue(jSlider1.getValue());
-                    }
-                    else {
+                    } else {
                         int value = jSlider2.getValue();
                         if (lockToPow2) {
                             value = (int)(Math.round(value / 100000.0) * 100000);
@@ -253,12 +255,11 @@ public void stateChanged(ChangeEvent event) {
                         //ArrayVisualizer.setEqualItems((int) Math.pow(2, jSlider2.getValue()));
                         ArrayManager.initializeArray(array);
                     }
-                }
-                else {
+                } else {
                     int currentItems = ArrayVisualizer.getUniqueItems();
                     jSlider2.setValue(calculateSliderValue(currentItems));
                 }
-                
+
                 Highlights.clearAllMarks();
             }
         });
@@ -269,8 +270,8 @@ public void mouseClicked(MouseEvent event) {
                     int newSize = 0;
                     try {
                         newSize = getSomethingSize("Unique Elements", "Enter new number of unique elements:");
+                    } catch (Exception e) {
                     }
-                    catch(Exception e) { }
                     if (newSize >= 2) {
                         jSlider2.setValue(calculateSliderValue(newSize));
                         ArrayVisualizer.setUniqueItems(newSize);
@@ -279,13 +280,17 @@ public void mouseClicked(MouseEvent event) {
                 }
             }
             @Override
-            public void mousePressed(MouseEvent e) { }
+            public void mousePressed(MouseEvent e) {
+            }
             @Override
-            public void mouseReleased(MouseEvent e) { }
+            public void mouseReleased(MouseEvent e) {
+            }
             @Override
-            public void mouseEntered(MouseEvent e) { }
+            public void mouseEntered(MouseEvent e) {
+            }
             @Override
-            public void mouseExited(MouseEvent e) { }
+            public void mouseExited(MouseEvent e) {
+            }
         });
         jSlider2.addKeyListener(kListener);
 

diff --git a/src/frames/ImageFrame.java b/src/frames/ImageFrame.java
@@ -23,13 +23,13 @@ public class ImageFrame extends JFrame {
     public static ImageFrame defaultFrame;
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 1L;
     private volatile JPanel contentPane;
 
     private volatile JLabel lblNewLabel_2;
-    
+
     /**
      * Create the frame.
      */
@@ -46,23 +46,23 @@ public ImageFrame(CustomImage visual) {
         gbl_contentPane.columnWeights = new double[]{1.0, 1.0, Double.MIN_VALUE};
         gbl_contentPane.rowWeights = new double[]{0.0, 1.0, 0.0, 0.0, Double.MIN_VALUE};
         contentPane.setLayout(gbl_contentPane);
-        
+
         JLabel lblNewLabel = new JLabel("Current image:");
         GridBagConstraints gbc_lblNewLabel = new GridBagConstraints();
         gbc_lblNewLabel.anchor = GridBagConstraints.EAST;
         gbc_lblNewLabel.insets = new Insets(0, 0, 5, 5);
         gbc_lblNewLabel.gridx = 0;
         gbc_lblNewLabel.gridy = 0;
         contentPane.add(lblNewLabel, gbc_lblNewLabel);
-        
+
         JLabel lblNewLabel_1 = new JLabel(visual.getCurrentImageName());
         GridBagConstraints gbc_lblNewLabel_1 = new GridBagConstraints();
         gbc_lblNewLabel_1.anchor = GridBagConstraints.WEST;
         gbc_lblNewLabel_1.insets = new Insets(0, 0, 5, 0);
         gbc_lblNewLabel_1.gridx = 1;
         gbc_lblNewLabel_1.gridy = 0;
         contentPane.add(lblNewLabel_1, gbc_lblNewLabel_1);
-        
+
         this.lblNewLabel_2 = new JLabel(" ");
         lblNewLabel_2.setHorizontalAlignment(SwingConstants.CENTER);
         GridBagConstraints gbc_lblNewLabel_2 = new GridBagConstraints();
@@ -72,7 +72,7 @@ public ImageFrame(CustomImage visual) {
         gbc_lblNewLabel_2.gridx = 0;
         gbc_lblNewLabel_2.gridy = 1;
         contentPane.add(this.lblNewLabel_2, gbc_lblNewLabel_2);
-        
+
         JButton btnNewButton = new JButton("Load default artwork");
         btnNewButton.addActionListener(new ActionListener() {
             @Override
@@ -88,7 +88,7 @@ public void actionPerformed(ActionEvent e) {
         gbc_btnNewButton.gridx = 0;
         gbc_btnNewButton.gridy = 2;
         contentPane.add(btnNewButton, gbc_btnNewButton);
-        
+
         JButton btnNewButton_1 = new JButton("Choose image...");
         btnNewButton_1.addActionListener(new ActionListener() {
             @Override