Merge branch 'master' into master

Author: pH-7

.gitignore

@@ -1,2 +1,8 @@
+/nbproject/private/
 /build/
-/dist/
+/dist/
+*.class
+
+# Mac OS System
+.DS_Store*
+._*

README.md

@@ -1,5 +1,7 @@
 # Simple Java Calculator
 
+![Logo Simple Java Calculator](logo.png)
+
 This project was originally written using Eclipse, but I have migrated it to NetBeans.
 This calculator is simple with an easy code to help novices learn how to create a calculator program with Java.
 

SimpleJavaCalculator.jar

@@ -1,12 +1,16 @@
 package simplejavacalculator;
 
+import static java.lang.Math.log;
+import static java.lang.Math.log10;
+import static java.lang.Math.pow;
+
 public class Calculator {
     public enum BiOperatorModes {
-        normal, add, minus, multiply, divide
+        normal, add, minus, multiply, divide , xpowerofy 
     }
 
     public enum MonoOperatorModes {
-        square, squareRoot, oneDevidedBy, cos, sin, tan
+        square, squareRoot, oneDevidedBy, cos, sin, tan ,log , rate, abs
     }
 
     private Double num1, num2;
@@ -28,6 +32,9 @@ private Double calculateBiImpl() {
         if (mode == BiOperatorModes.divide) {
             return num1 / num2;
         }
+        if (mode == BiOperatorModes.xpowerofy) {
+            return pow(num1,num2);
+        }
 
         // never reach
         throw new Error();
@@ -78,6 +85,17 @@ public Double calculateMono(MonoOperatorModes newMode, Double num) {
         if (newMode == MonoOperatorModes.tan) {
             return Math.tan(num);
         }
+        if (newMode == MonoOperatorModes.log) {
+            return log10(num);
+        }
+        if (newMode == MonoOperatorModes.rate) {
+           return num / 100;
+        }
+        if(newMode == MonoOperatorModes.abs){
+            return Math.abs(num);
+        }
+        
+
 
         // never reach
         throw new Error();

logo.png

@@ -10,8 +10,10 @@
  * @create      2012-03-30
  *
  * @modifiedby  Achintha Gunasekara
+ * @modifiedby  Kydon Chantzaridis
  * @modweb      http://www.achinthagunasekara.com
  * @modemail    contact@achinthagunasekara.com
+ * @modemail    kchantza@csd.auth.gr
  */
 package simplejavacalculator;
 
@@ -31,7 +33,7 @@ public class UI implements ActionListener {
     private final JTextArea text;
     private final JButton but[], butAdd, butMinus, butMultiply, butDivide,
             butEqual, butCancel, butSquareRoot, butSquare, butOneDevidedBy,
-            butCos, butSin, butTan, butBinary;
+            butCos, butSin, butTan, butxpowerofy, butlog, butrate, butabs, butBinary;
     private final Calculator calc;
 
     private final String[] buttonValue = {"0", "1", "2", "3", "4", "5", "6",
@@ -59,6 +61,10 @@ public UI() {
         butCos = new JButton("Cos");
         butSin = new JButton("Sin");
         butTan = new JButton("Tan");
+        butxpowerofy = new JButton("x^y");
+        butlog = new JButton("log10(x)");
+        butrate = new JButton("x%");
+        butabs = new JButton("abs(x)");
 
         butCancel = new JButton("C");
         butBinary = new JButton("Bin");
@@ -68,15 +74,18 @@ public UI() {
 
     public void init() {
         frame.setVisible(true);
-        frame.setSize(350, 280);
+        frame.setSize(330, 300);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.add(panel);
 
         panel.add(text);
-        for (int i = 0; i < 10; i++) {
+       
+        for (int i = 1; i < 10; i++) {
             panel.add(but[i]);
             but[i].addActionListener(this);
         }
+        panel.add(but[0]);
+        but[0].addActionListener(this);
 
         panel.add(butAdd);
         panel.add(butMinus);
@@ -88,6 +97,11 @@ public void init() {
         panel.add(butCos);
         panel.add(butSin);
         panel.add(butTan);
+        panel.add(butxpowerofy);
+        panel.add(butlog);
+        panel.add(butrate);
+        panel.add(butabs);
+        panel.add(butabs);
         panel.add(butBinary);
 
         panel.add(butEqual);
@@ -103,9 +117,14 @@ public void init() {
         butCos.addActionListener(this);
         butSin.addActionListener(this);
         butTan.addActionListener(this);
+        butxpowerofy.addActionListener(this);
+        butlog.addActionListener(this);
+        butrate.addActionListener(this);
+        butabs.addActionListener(this);
+        butBinary.addActionListener(this);
+
         butEqual.addActionListener(this);
         butCancel.addActionListener(this);
-        butBinary.addActionListener(this);
     }
 
     @Override
@@ -129,43 +148,58 @@ public void actionPerformed(ActionEvent e) {
 
         if (source == butMultiply) {
             writer(calc.calculateBi(Calculator.BiOperatorModes.multiply,
-                    reader()));
+                reader()));
         }
 
         if (source == butDivide) {
             writer(calc
-                    .calculateBi(Calculator.BiOperatorModes.divide, reader()));
+                .calculateBi(Calculator.BiOperatorModes.divide, reader()));
+        }
+        if (source == butxpowerofy) {
+            writer(calc
+                .calculateBi(Calculator.BiOperatorModes.xpowerofy, reader()));
         }
 
         if (source == butSquare) {
             writer(calc.calculateMono(Calculator.MonoOperatorModes.square,
-                    reader()));
+                reader()));
         }
 
         if (source == butSquareRoot) {
             writer(calc.calculateMono(Calculator.MonoOperatorModes.squareRoot,
-                    reader()));
+                reader()));
         }
 
         if (source == butOneDevidedBy) {
             writer(calc.calculateMono(
-                    Calculator.MonoOperatorModes.oneDevidedBy, reader()));
+                Calculator.MonoOperatorModes.oneDevidedBy, reader()));
         }
 
         if (source == butCos) {
             writer(calc.calculateMono(Calculator.MonoOperatorModes.cos,
-                    reader()));
+                reader()));
         }
 
         if (source == butSin) {
             writer(calc.calculateMono(Calculator.MonoOperatorModes.sin,
-                    reader()));
+                reader()));
         }
 
         if (source == butTan) {
             writer(calc.calculateMono(Calculator.MonoOperatorModes.tan,
-                    reader()));
+                reader()));
+        }
+        if (source == butlog) {
+            writer(calc.calculateMono(Calculator.MonoOperatorModes.log,
+                reader()));
+        }
+         if (source == butrate) {
+            writer(calc.calculateMono(Calculator.MonoOperatorModes.rate,
+                reader()));
         }
+         if(source == butabs){
+             writer(calc.calculateMono(Calculator.MonoOperatorModes.abs, reader()));
+         }
 
         if (source == butEqual) {
             writer(calc.calculateEqual(reader()));