angel/calc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Update src/main/java/dev/sillyangel/calc/Calculator.java

Browse Source
This commit is contained in:
angel
2025-11-14 12:54:59 -06:00
parent 02467170a8
commit c785d221d2
1 changed files with 94 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/main/java/dev/sillyangel/calc/Calculator.java
View File

@@ -21,8 +21,6 @@ import javax.swing.JMenuBar;
import javax.swing.JMenu; import javax.swing.JMenu;
import javax.swing.JMenuItem; import javax.swing.JMenuItem;
public class Calculator extends JFrame implements KeyListener { public class Calculator extends JFrame implements KeyListener {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -31,6 +29,10 @@ public class Calculator extends JFrame implements KeyListener {
private String operand1; private String operand1;
private String operator; private String operator;
private String operand2; private String operand2;
private JButton btnDiv;
private JButton btnMul;
private JButton btnMin;
private JButton btnPlus;
protected boolean resultVisible; protected boolean resultVisible;
protected double result; protected double result;
@@ -74,7 +76,6 @@ public class Calculator extends JFrame implements KeyListener {
exitItem.addActionListener(e -> System.exit(0)); exitItem.addActionListener(e -> System.exit(0));
setJMenuBar(menuBar); setJMenuBar(menuBar);
fileMenu.add(exitItem); fileMenu.add(exitItem);
menuBar.add(fileMenu); menuBar.add(fileMenu);
@@ -242,20 +243,15 @@ public class Calculator extends JFrame implements KeyListener {
}); });
// math stuff // math stuff
btnDiv = new JButton("/");
JButton btnDiv = new JButton("/"); btnMul = new JButton("*");
JButton btnMul = new JButton("*"); btnMin = new JButton("-");
JButton btnMin = new JButton("-"); btnPlus = new JButton("+");
JButton btnPlus = new JButton("+");
btnDiv.setFont(new Font("Tahoma", Font.PLAIN, 29)); btnDiv.setFont(new Font("Tahoma", Font.PLAIN, 29));
btnDiv.addActionListener(new ActionListener() { btnDiv.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
setOperator(e.getActionCommand()); setOperator(e.getActionCommand());
btnDiv.setForeground(new Color(30, 144, 255));
btnMul.setForeground(new Color(0, 0, 0));
btnPlus.setForeground(new Color(0, 0, 0));
btnMin.setForeground(new Color(0, 0, 0));
} }
}); });
@@ -263,10 +259,6 @@ public class Calculator extends JFrame implements KeyListener {
btnMul.addActionListener(new ActionListener() { btnMul.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
setOperator(e.getActionCommand()); setOperator(e.getActionCommand());
btnDiv.setForeground(new Color(0, 0, 0));
btnMul.setForeground(new Color(30, 144, 255));
btnPlus.setForeground(new Color(0, 0, 0));
btnMin.setForeground(new Color(0, 0, 0));
} }
}); });
@@ -274,10 +266,6 @@ public class Calculator extends JFrame implements KeyListener {
btnMin.addActionListener(new ActionListener() { btnMin.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
setOperator(e.getActionCommand()); setOperator(e.getActionCommand());
btnDiv.setForeground(new Color(0, 0, 0));
btnMul.setForeground(new Color(0, 0, 0));
btnPlus.setForeground(new Color(0, 0, 0));
btnMin.setForeground(new Color(30, 144, 255));
} }
}); });
@@ -285,10 +273,6 @@ public class Calculator extends JFrame implements KeyListener {
btnPlus.addActionListener(new ActionListener() { btnPlus.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
setOperator(e.getActionCommand()); setOperator(e.getActionCommand());
btnDiv.setForeground(new Color(0, 0, 0));
btnMul.setForeground(new Color(0, 0, 0));
btnPlus.setForeground(new Color(30, 144, 255));
btnMin.setForeground(new Color(0, 0, 0));
} }
}); });
@@ -296,30 +280,7 @@ public class Calculator extends JFrame implements KeyListener {
btnEq.setFont(new Font("Tahoma", Font.PLAIN, 29)); btnEq.setFont(new Font("Tahoma", Font.PLAIN, 29));
btnEq.addActionListener(new ActionListener() { btnEq.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
operand2 = display.getText(); math();
double o1 = Double.parseDouble(operand1);
double o2 = Double.parseDouble(operand2);
if (operator == "+") {
result = o1+o2;
} else if (operator == "-") {
result = o1-o2;
} else if (operator == "*") {
result = o1*o2;
} else if (operator == "/") {
result = o1/o2;
}
operator = "";
operand1 = "";
operand2 = "";
btnDiv.setForeground(new Color(0, 0, 0));
btnMul.setForeground(new Color(0, 0, 0));
btnPlus.setForeground(new Color(0, 0, 0));
btnMin.setForeground(new Color(0, 0, 0));
resultVisible = true;
display.setText(""+result);
} }
}); });
@@ -363,34 +324,109 @@ public class Calculator extends JFrame implements KeyListener {
if (resultVisible == true) { if (resultVisible == true) {
display.setText(""); display.setText("");
resultVisible = false; resultVisible = false;
} }
if (actionCommand == "+") {
btnDiv.setForeground(new Color(0, 0, 0));
btnMul.setForeground(new Color(0, 0, 0));
btnPlus.setForeground(new Color(30, 144, 255));
btnMin.setForeground(new Color(0, 0, 0));
} else if (actionCommand == "*") {
btnDiv.setForeground(new Color(0, 0, 0));
btnMul.setForeground(new Color(30, 144, 255));
btnPlus.setForeground(new Color(0, 0, 0));
btnMin.setForeground(new Color(0, 0, 0));
} else if (actionCommand == "/") {
btnDiv.setForeground(new Color(30, 144, 255));
btnMul.setForeground(new Color(0, 0, 0));
btnPlus.setForeground(new Color(0, 0, 0));
btnMin.setForeground(new Color(0, 0, 0));
} else if (actionCommand == "-") {
btnDiv.setForeground(new Color(0, 0, 0));
btnMul.setForeground(new Color(0, 0, 0));
btnPlus.setForeground(new Color(0, 0, 0));
btnMin.setForeground(new Color(30, 144, 255));
}
display.setText(display.getText() + actionCommand); display.setText(display.getText() + actionCommand);
} }
protected void setOperator(String actionCommand) { protected void setOperator(String daop) {
operand1 = display.getText(); operand1 = display.getText();
operator = actionCommand; operator = daop;
display.setText(""); display.setText("");
} }
protected void math() {
operand2 = display.getText();
double op1 = Double.parseDouble(operand1);
double op2 = Double.parseDouble(operand2);
if (operator == "+") {
result = op1+op2;
} else if (operator == "-") {
result = op1-op2;
} else if (operator == "*") {
result = op1*op2;
} else if (operator == "/") {
result = op1/op2;
} else {
result = op2;
System.out.println("Op: " + op1);
System.out.println("Op2: " + op2);
}
operator = "";
operand1 = "";
operand2 = "";
btnDiv.setForeground(new Color(0, 0, 0));
btnMul.setForeground(new Color(0, 0, 0));
btnPlus.setForeground(new Color(0, 0, 0));
btnMin.setForeground(new Color(0, 0, 0));
resultVisible = true;
display.setText(""+result);
}
// Implement the keyPressed method // Implement the keyPressed method
@Override @Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
int keyCode = e.getKeyCode(); int keyCode = e.getKeyCode();
System.out.println("Key Pressed: " + KeyEvent.getKeyText(keyCode)); // System.out.println("Key Pressed: " + KeyEvent.getKeyText(keyCode));
if (KeyEvent.getKeyText(keyCode) == "Enter") {
math();
} else if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
clear();
}
} }
// Implement the keyReleased method // Implement the keyReleased method
@Override @Override
public void keyReleased(KeyEvent e) { public void keyReleased(KeyEvent e) {
int keyCode = e.getKeyCode(); // int keyCode = e.getKeyCode();
System.out.println("Key Released: " + KeyEvent.getKeyText(keyCode)); // System.out.println("Key Released: " + KeyEvent.getKeyText(keyCode));
} }
// Implement the keyTyped method // Implement the keyTyped method
@Override @Override
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e) {
char keyChar = e.getKeyChar(); char c = e.getKeyChar();
System.out.println("Key Typed: " + keyChar); // System.out.println("Key Typed: " + keyChar);
System.out.println(c + " KT");
if (c >= '0' && c <= '9') {
processDigit(String.valueOf(c));
}
if (c == '+') {
setOperator("+");
} else if (c == '*') {
setOperator("*");
} else if (c == '/') {
setOperator("/");
} else if (c == '-') {
setOperator("-");
}
if (c == '=') {
math();
}
} }
} }