Merge branch 'master' into master

Author: pH-7

src/simplejavacalculator/Calculator.java

@@ -1,3 +1,14 @@
+/**
+ * @name        Simple Java Calculator
+ * @package     ph.calculator
+ * @file        Main.java
+ * @author      SORIA Pierre-Henry
+ * @email       [email protected]
+ * @link        http://github.com/pH-7
+ * @copyright   Copyright Pierre-Henry SORIA, All Rights Reserved.
+ * @license     Apache (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
 package simplejavacalculator;
 
 import static java.lang.Double.NaN;
@@ -6,6 +17,7 @@
 import static java.lang.Math.pow;
 
 public class Calculator {
+
     public enum BiOperatorModes {
         normal, add, minus, multiply, divide , xpowerofy 
     }

src/simplejavacalculator/UI.java

@@ -28,16 +28,17 @@
 import javax.swing.JTextArea;
 
 public class UI implements ActionListener {
+
     private final JFrame frame;
     private final JPanel panel;
     private final JTextArea text;
     private final JButton but[], butAdd, butMinus, butMultiply, butDivide,
             butEqual, butCancel, butSquareRoot, butSquare, butOneDevidedBy,
-            butCos, butSin, butTan, butxpowerofy, butlog, butrate, butabs;
+            butCos, butSin, butTan, butxpowerofy, butlog, butrate, butabs, butBinary;
     private final Calculator calc;
 
-    private final String[] buttonValue = { "0", "1", "2", "3", "4", "5", "6",
-            "7", "8", "9"};
+    private final String[] buttonValue = {"0", "1", "2", "3", "4", "5", "6",
+        "7", "8", "9"};
 
     public UI() {
         frame = new JFrame("Calculator PH");
@@ -67,6 +68,7 @@ public UI() {
         butabs = new JButton("abs(x)");
 
         butCancel = new JButton("C");
+        butBinary = new JButton("Bin");
 
         calc = new Calculator();
     }
@@ -100,6 +102,8 @@ public void init() {
         panel.add(butlog);
         panel.add(butrate);
         panel.add(butabs);
+        panel.add(butabs);
+        panel.add(butBinary);
 
         panel.add(butEqual);
         panel.add(butCancel);
@@ -118,6 +122,7 @@ public void init() {
         butlog.addActionListener(this);
         butrate.addActionListener(this);
         butabs.addActionListener(this);
+        butBinary.addActionListener(this);
 
         butEqual.addActionListener(this);
         butCancel.addActionListener(this);
@@ -168,7 +173,7 @@ public void actionPerformed(ActionEvent e) {
 
         if (source == butOneDevidedBy) {
             writer(calc.calculateMono(
-                    Calculator.MonoOperatorModes.oneDevidedBy, reader()));
+                Calculator.MonoOperatorModes.oneDevidedBy, reader()));
         }
 
         if (source == butCos) {
@@ -205,9 +210,21 @@ public void actionPerformed(ActionEvent e) {
             writer(calc.reset());
         }
 
+        if (source == butBinary) {
+            parsetoBinary();
+        }
+
         text.selectAll();
     }
 
+    private void parsetoBinary() {
+        try {
+            text.setText("" + Long.toBinaryString(Long.parseLong(text.getText())));
+        } catch (NumberFormatException ex) {
+            System.err.println("Error while parse to binary." + ex.toString());
+        }
+    }
+
     public Double reader() {
         Double num;
         String str;