Build

AnanasikDev · Apr 12, 2024 · b53be8a · b53be8a
1 parent df32c2c
commit b53be8a
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 10 deletions.
diff --git a/.idea/artifacts/Calculator_jar.xml b/.idea/artifacts/Calculator_jar.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: calculator.Calculator
+
diff --git a/src/calculator/Calculator.java b/src/calculator/Calculator.java
@@ -69,8 +69,8 @@ public void componentResized(ComponentEvent e) {
     }
     public void UpdateHistoryScroll(int scrollValue){
         int shift = -scrollValue * historyFontSize;
-        if (history.getFirst().getLabel().getY() + shift > 20) return;
-        if (history.getLast().getLabel().getY() + shift < historyPanel.getHeight() - 20) return;
+        if (Utils.getFirst(history).getLabel().getY() + shift > 20) return;
+        if (Utils.getLast(history).getLabel().getY() + shift < historyPanel.getHeight() - 20) return;
         for (HistoryToken token : history){
             token.getLabel().setBounds(token.getLabel().getX(), token.getLabel().getY() + shift, token.getLabel().getWidth(), token.getLabel().getHeight());
         }
@@ -214,47 +214,47 @@ private void adjustHistoryPanel(){
     private List<CalculatorButton> getCalculatorButtons() {
         List<CalculatorButton> buttons = new ArrayList<>();
         buttons.add(new CalculatorButton("=", "", new Color(217, 137, 91), true));
-        buttons.getLast().jButton.addActionListener(new ActionListener() {
+        Utils.getLast(buttons).jButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 evaluate();
             }
         });
 
         buttons.add(new CalculatorButton("C", "", new Color(117, 117, 117), true));
-        buttons.getLast().jButton.addActionListener(new ActionListener() {
+        Utils.getLast(buttons).jButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 textField.setText("");
             }
         });
 
         buttons.add(new CalculatorButton("del", "", new Color(117, 117, 117), true));
-        buttons.getLast().jButton.addActionListener(new ActionListener() {
+        Utils.getLast(buttons).jButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 textField.setText(textField.getText().isEmpty() ? "" : textField.getText().substring(0, textField.getText().length()-1) );
             }
         });
 
         buttons.add(new CalculatorButton("ans", "", new Color(117, 117, 117), true));
-        buttons.getLast().jButton.addActionListener(new ActionListener() {
+        Utils.getLast(buttons).jButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 textField.setText(textField.getText() + (history.isEmpty() ? "" : history.get(history.size()-1).getValue()));
             }
         });
 
         buttons.add(new CalculatorButton("last", "", new Color(117, 117, 117), true));
-        buttons.getLast().jButton.addActionListener(new ActionListener() {
+        Utils.getLast(buttons).jButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 textField.setText(textField.getText() + (history.isEmpty() ? "" : history.get(history.size()-1).getExpression()));
             }
         });
 
         buttons.add(new CalculatorButton(solver.degMod ? "deg" : "rad", "", new Color(117, 117, 117), true));
-        buttons.getLast().jButton.addActionListener(new ActionListener() {
+        Utils.getLast(buttons).jButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 solver.setDegMod(!solver.degMod);
@@ -283,7 +283,7 @@ public void actionPerformed(ActionEvent e) {
         buttons.add(new CalculatorButton(".", ".", new Color(135, 222, 184)));
         buttons.add(new CalculatorButton("0", "0", new Color(135, 222, 184)));
         buttons.add(new CalculatorButton("-", "", new Color(135, 222, 184), true));
-        buttons.getLast().jButton.addActionListener(new ActionListener() {
+        Utils.getLast(buttons).jButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 textField.setText("-(" + textField.getText() + ")");

diff --git a/src/calculator/Utils.java b/src/calculator/Utils.java
@@ -0,0 +1,19 @@
+package calculator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Utils {
+    public static <T> T getFirst(ArrayList<T> list){
+        return list.get(0);
+    }
+    public static <T> T getLast(ArrayList<T> list){
+        return list.get(list.size() - 1);
+    }
+    public static <T> T getFirst(List<T> list){
+        return list.get(0);
+    }
+    public static <T> T getLast(List<T> list){
+        return list.get(list.size() - 1);
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Manifest-Version: 1.0
		Main-Class: calculator.Calculator