se elimino el exit del enum y del switch, se instanciaron las clases …

…JDialog en el cotrolador, se llama el controlador en el runner, se disminuyo el ancho y el color del boton de los JDialog
augusticor · Nov 25, 2020 · 9f7a29c · 9f7a29c
1 parent fe6b283
commit 9f7a29c
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 43 deletions.
diff --git a/src/controller/ActionsE.java b/src/controller/ActionsE.java
@@ -7,6 +7,5 @@ public enum ActionsE {
 	CONGRUENCIA_MULTIPLICATIVA,
 	DISTRO_UNIFORME,
 	DISTRO_NORMAL_EST,
-	ABOUT,
-	EXIT
+	ABOUT
 }
diff --git a/src/controller/Control.java b/src/controller/Control.java
@@ -3,43 +3,61 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import views.JDCongruenciaLineal;
+import views.JDCongruenciaMultiplicativa;
+import views.JDCuadradosMedios;
 import views.PseudoRandomMainWindow;
 
-public class Control  implements ActionListener{
-	
+public class Control implements ActionListener {
+
 	private PseudoRandomMainWindow mainWindows;
+	private JDCuadradosMedios jdCuadradosMedios;
+	private JDCongruenciaLineal jdCongruenciaLineal;
+	private JDCongruenciaMultiplicativa jdCongruenciaMultiplicativa;
 
 	public Control() {
-		
+
 		mainWindows = new PseudoRandomMainWindow(this);
+
+		jdCuadradosMedios = new JDCuadradosMedios(mainWindows);
+		jdCongruenciaLineal = new JDCongruenciaLineal(mainWindows);
+		jdCongruenciaMultiplicativa = new JDCongruenciaMultiplicativa(mainWindows);
 	}
-	
+
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		
+
 		switch (ActionsE.valueOf(e.getActionCommand())) {
-		case EXIT:
-			System.exit(0);
-			break;
 		case CUADRADOS_MEDIOS:
-			mainWindows.showDialogCuadradosMedios();
-			System.out.println("Cuadrados medios");
-			break;
-		case ABOUT:
+			showDialogCuadradosMedios();
 			break;
 		case CONGRUENCIA_LINEAL:
-			mainWindows.showDialogCongruenciaLineal();
+			showDialogCongruenciaLineal();
 			break;
 		case CONGRUENCIA_MULTIPLICATIVA:
-			mainWindows.showDialogCongruenciaMiltiplicativa();
+			showDialogCongruenciaMiltiplicativa();
 			break;
 		case DISTRO_NORMAL_EST:
 			break;
 		case DISTRO_UNIFORME:
 			break;
+		case ABOUT:
+			break;
 		default:
 			break;
 		}
 	}
 
+	public void showDialogCuadradosMedios() {
+		jdCuadradosMedios.setVisible(true);
+	}
+
+	public void showDialogCongruenciaLineal() {
+		jdCongruenciaLineal.setVisible(true);
+	}
+
+	public void showDialogCongruenciaMiltiplicativa() {
+		jdCongruenciaMultiplicativa.setVisible(true);
+	}
+
 }
diff --git a/src/runner/RunPseudoRandomNumGenerator.java b/src/runner/RunPseudoRandomNumGenerator.java
@@ -1,11 +1,12 @@
 package runner;
 
+import controller.Control;
 import views.PseudoRandomMainWindow;
 
 public class RunPseudoRandomNumGenerator {
 
 	public static void main(String[] args) {
 
-		new PseudoRandomMainWindow(null);
+		new Control();
 	}
 }
diff --git a/src/views/JDCongruenciaLineal.java b/src/views/JDCongruenciaLineal.java
@@ -2,13 +2,16 @@
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Font;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JSpinner;
 
+import constants.MyConstants;
+
 public class JDCongruenciaLineal extends JDialog{
 
 	private static final long serialVersionUID = 1L;
@@ -25,7 +28,7 @@ public class JDCongruenciaLineal extends JDialog{
 	public JDCongruenciaLineal(PseudoRandomMainWindow pseudoRandomMainWindow) {
 
 		setModal(true);
-		setSize(500, 500);
+		setSize(300, 400);
 		setTitle("datos para cuadrados medios");
 		setLocationRelativeTo(pseudoRandomMainWindow);
 		getContentPane().setBackground(Color.WHITE);
@@ -59,12 +62,14 @@ public JDCongruenciaLineal(PseudoRandomMainWindow pseudoRandomMainWindow) {
 		spG.setBorder(BorderFactory.createTitledBorder("ingrese el valor de G"));
 		add(spG );
 
-
 		button = new JButton("Calcular");
 		button.setAlignmentX(Component.CENTER_ALIGNMENT);
-		button.setBackground(Color.GREEN);
+		button.setForeground(Color.decode(MyConstants.CLR_WHITE));
+		button.setBackground(Color.decode(MyConstants.CLR_BLUE_BTNS));
+		button.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2, true));
+		button.setFont(new Font(MyConstants.FONT_ROBOTO, 1, 15));
 		add(button);
 
-		setVisible(true);
+//		setVisible(true);
 	}
 }
diff --git a/src/views/JDCongruenciaMultiplicativa.java b/src/views/JDCongruenciaMultiplicativa.java
@@ -2,13 +2,16 @@
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Font;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JSpinner;
 
+import constants.MyConstants;
+
 public class JDCongruenciaMultiplicativa extends JDialog{
 
 	private static final long serialVersionUID = 1L;
@@ -24,7 +27,7 @@ public class JDCongruenciaMultiplicativa extends JDialog{
 	public JDCongruenciaMultiplicativa(PseudoRandomMainWindow pseudoRandomMainWindow) {
 
 		setModal(true);
-		setSize(500, 500);
+		setSize(300, 400);
 		setTitle("datos para cuadrados medios");
 		setLocationRelativeTo(pseudoRandomMainWindow);
 		getContentPane().setBackground(Color.WHITE);
@@ -50,17 +53,18 @@ public JDCongruenciaMultiplicativa(PseudoRandomMainWindow pseudoRandomMainWindow
 		spT.setBorder(BorderFactory.createTitledBorder("ingrese el valor de T"));
 		add(spT );
 
-
 		spG = new JSpinner();
 		spG.setBorder(BorderFactory.createTitledBorder("ingrese el valor de G"));
 		add(spG );
 
-
 		button = new JButton("Calcular");
 		button.setAlignmentX(Component.CENTER_ALIGNMENT);
-		button.setBackground(Color.GREEN);
+		button.setForeground(Color.decode(MyConstants.CLR_WHITE));
+		button.setBackground(Color.decode(MyConstants.CLR_BLUE_BTNS));
+		button.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2, true));
+		button.setFont(new Font(MyConstants.FONT_ROBOTO, 1, 15));
 		add(button);
 
-		setVisible(true);
+//		setVisible(true);
 	}
 }
diff --git a/src/views/JDCuadradosMedios.java b/src/views/JDCuadradosMedios.java
@@ -2,14 +2,16 @@
 
 import java.awt.Color;
 import java.awt.Component;
-
+import java.awt.Font;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JSpinner;
 
+import constants.MyConstants;
+
 
 public class JDCuadradosMedios extends JDialog{
 
@@ -24,7 +26,7 @@ public class JDCuadradosMedios extends JDialog{
 	public JDCuadradosMedios(PseudoRandomMainWindow pseudoRandomMainWindow) {
 
 		setModal(true);
-		setSize(500, 500);
+		setSize(300, 400);
 		setTitle("datos para cuadrados medios");
 		setLocationRelativeTo(pseudoRandomMainWindow);
 		getContentPane().setBackground(Color.WHITE);
@@ -48,10 +50,13 @@ public JDCuadradosMedios(PseudoRandomMainWindow pseudoRandomMainWindow) {
 
 		button = new JButton("Calcular");
 		button.setAlignmentX(Component.CENTER_ALIGNMENT);
-		button.setBackground(Color.GREEN);
+		button.setForeground(Color.decode(MyConstants.CLR_WHITE));
+		button.setBackground(Color.decode(MyConstants.CLR_BLUE_BTNS));
+		button.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2, true));
+		button.setFont(new Font(MyConstants.FONT_ROBOTO, 1, 15));
 		add(button);
 
-		setVisible(true);
+//		setVisible(true);
 	}
 
 

diff --git a/src/views/PseudoRandomMainWindow.java b/src/views/PseudoRandomMainWindow.java
@@ -18,6 +18,9 @@
 public class PseudoRandomMainWindow extends JFrame {
 
 	private OwnJTable ownJTable;
+//	private JDCuadradosMedios jdCuadradosMedios;
+//	private JDCongruenciaLineal jdCongruenciaLineal;
+//	private JDCongruenciaMultiplicativa jdCongruenciaMultiplicativa;
 
 	public PseudoRandomMainWindow(ActionListener actionListener) {
 		getContentPane().setBackground(Color.WHITE);
@@ -28,7 +31,7 @@ public PseudoRandomMainWindow(ActionListener actionListener) {
 		getContentPane().setBackground(Color.WHITE);
 		setLayout(new GridBagLayout());
 		setMinimumSize(new Dimension(950, 550));
-
+		
 		GridBagConstraints c = new GridBagConstraints();
 		createGrid(c);
 
@@ -78,18 +81,17 @@ private ImageIcon createImageIcon(String path) {
 		return new ImageIcon(getClass().getResource(path));
 	}
 
-	public void showDialogCuadradosMedios() {
-		new JDCuadradosMedios(this);
-		System.out.println("paso 2");
-	}
-
-	public void showDialogCongruenciaLineal() {
-		new JDCongruenciaLineal(this);
-	}
-
-	public void showDialogCongruenciaMiltiplicativa() {
-		new JDCongruenciaMultiplicativa(this);
-	}
+//	public void showDialogCuadradosMedios() {
+//		new JDCuadradosMedios(this);
+//	}
+//	
+//	public void showDialogCongruenciaLineal() {
+//		new JDCongruenciaLineal(this);
+//	}
+//	
+//	public void showDialogCongruenciaMiltiplicativa() {
+//		new JDCongruenciaMultiplicativa(this);
+//	}
 
 	private static final long serialVersionUID = 1L;
 }