SortingAlgorithm added

Author: Rustam-Z

InsertionSort.java

@@ -11,14 +11,14 @@
 import javax.swing.SwingWorker;
 
 public class InsertionSort extends JPanel {
-    private final int WIDTH = 1000, HEIGHT = WIDTH * 9 /16;
+    private final int WIDTH = 800, HEIGHT = WIDTH * 9 /16;
     private final int SIZE = 200; // the number if sorting elements
     private final float BAR_WIDTH = (float)WIDTH / SIZE; // bar width
     private float[] bar_height = new float[SIZE]; // height of bars
     private SwingWorker<Void, Void> shuffler, sorter;
     private int current_index, traversing_index;
 
-    private InsertionSort() {
+    InsertionSort() {
         setBackground(Color.BLACK);
         setPreferredSize(new Dimension(WIDTH, HEIGHT));
         initBarHeight(); // initialize the height of each bar
@@ -54,7 +54,7 @@ public void initBarHeight() {
         }
     }
 
-    private void initSorter() {
+    public void initSorter() {
         sorter = new SwingWorker<>() {
             @Override
             public Void doInBackground() throws InterruptedException {
@@ -76,7 +76,7 @@ public Void doInBackground() throws InterruptedException {
         };
     }
 
-    private void initShuffler() {
+    public void initShuffler() {
         shuffler = new SwingWorker<>() {
             @Override
             public Void doInBackground() throws InterruptedException {
@@ -93,7 +93,7 @@ public Void doInBackground() throws InterruptedException {
                 }
                 return null;
             }
-            
+
             @Override
 			public void done() {
 				super.done();
@@ -103,7 +103,7 @@ public void done() {
         shuffler.execute();
     }
 
-    private void swap(int indexA, int indexB) {
+    public void swap(int indexA, int indexB) {
         float temp = bar_height[indexA];
         bar_height[indexA] = bar_height[indexB];
         bar_height[indexB] = temp;

Main.java

@@ -64,12 +64,12 @@ public void actionPerformed(ActionEvent e) {
             else if (e.getSource() == menuItem2) {
                 // Creating Object
                 Sorting sort = new Sorting();   
-                setVisible(false); // will close the previous window
                 System.out.println("Menu Item 2 choosed");
             }
             else if (e.getSource() == menuItem2) {
                 System.out.println("Menu Item 3 choosed");
             }
+            setVisible(false); // will close the previous window
         }
     }
 

Sorting.java

@@ -4,6 +4,8 @@
 import java.util.*;
 
 public class Sorting extends Main {
+    SortingAlgorithm sortAlgo = new SortingAlgorithm();
+
     // Values
     ArrayList<Integer> list=new ArrayList<Integer>();//Creating arraylist
 
@@ -27,7 +29,11 @@ public class Sorting extends Main {
 
         // Panel for main algorithm
         pPanel2 = new JPanel();
-        pPanel2.setLayout(new GridLayout(10, 1));
+        pPanel2.setLayout(new BorderLayout());
+
+        // Set backgrounds for Panels
+        pPanel1.setBackground(Color.CYAN);
+        pPanel2.setBackground(Color.YELLOW);
 
         // Buttons for sorting
         jbtRandomize = new JButton("Randomize");//create button
@@ -48,11 +54,8 @@ public class Sorting extends Main {
         pPanel1.add(jbtBubble); pPanel1.add(jbtInsertion); pPanel1.add(jbtStart);
 
         // Adding elements to Panel 2
-        pPanel2.add(jb1, BorderLayout.WEST);
-
-        // Set backgrounds for Panels
-        pPanel1.setBackground(Color.CYAN);
-        pPanel2.setBackground(Color.YELLOW);
+        pPanel2.add(sortAlgo, BorderLayout.CENTER);
+        // pPanel2.add(jb1, BorderLayout.WEST);
 
         // Register listeners
         ListenerClass listener = new ListenerClass();
@@ -77,11 +80,13 @@ else if (e.getSource() == jbtMerge)
             else if (e.getSource() == jbtBubble)
                 System.out.println("jbtBubble button clicked");
             else if (e.getSource() == jbtInsertion)
-                System.out.println("jbtInsertion button clicked");
+                new SortingAlgorithm(); // Sorting algotithm
             else if (e.getSource() == jbtSelection)
                 System.out.println("jbtSelection button clicked");
             else if (e.getSource() == jbtStart)
                 System.out.println("jbtStart button clicked");
+
+            // setVisible(false); // will close the previous window
         }
     } 
 }

SortingAlgorithm.java

@@ -0,0 +1,11 @@
+import java.awt.Color;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+public class SortingAlgorithm extends JPanel {
+    SortingAlgorithm() {
+        setBackground(Color.BLUE);
+    }
+
+}