Merge pull request #3 from SiowYenChong/dev#1

Dev#1

Author: ayj69

.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1692244280313</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

bin/.gitignore

@@ -0,0 +1 @@
+/simplejavacalculator/

bin/simplejavacalculator/Calculator$MonoOperatorModes.class

@@ -23,7 +23,7 @@ public enum BiOperatorModes {
     }
 
     public enum MonoOperatorModes {
-        square, squareRoot, oneDividedBy, cos, sin, tan, log, rate, abs, ln,
+        square,factorial, squareRoot, oneDividedBy, cos, sin, tan, log, rate, abs, ln,
     }
 
     private Double num1, num2;
@@ -85,6 +85,13 @@ public Double reset() {
 
 
     public Double calculateMono(MonoOperatorModes newMode, Double num) {
+    	if (newMode == MonoOperatorModes.factorial) {
+    		double facResult = 1;
+    		for(int i=1;i<=num;i++){    
+    			facResult=facResult*i;    
+    		  }    
+            return facResult;
+        }
         if (newMode == MonoOperatorModes.square) {
             return num * num;
         }

bin/simplejavacalculator/Calculator.class

@@ -51,7 +51,7 @@ public class UI implements ActionListener {
    private final JTextArea text;
 
    private final JButton but[], butAdd, butMinus, butMultiply, butDivide,
-      butEqual, butCancel, butSquareRoot, butSquare, butOneDividedBy,
+      butEqual, butCancel, butSquareRoot, butSquare, butOneDividedBy,butFactorial,
       butCos, butSin, butTan, butxpowerofy, butlog, butrate, butabs, butBinary, butln;
    private final Calculator calc;
 
@@ -96,7 +96,8 @@ public UI() throws IOException {
       butMultiply = new JButton("*");      
       butDivide = new JButton("/");      
       butEqual = new JButton("=");      
-      butSquareRoot = new JButton("sqrt");      
+      butSquareRoot = new JButton("sqrt");  
+      butFactorial = new JButton("!");      
       butSquare = new JButton("x*x");      
       butOneDividedBy = new JButton("1/x");      
       butCos = new JButton("Cos");      
@@ -134,6 +135,7 @@ public void init() {
       butEqual.setFont(font);
       butSquareRoot.setFont(font);
       butSquare.setFont(font);
+      butFactorial.setFont(font);
       butOneDividedBy.setFont(font);
       butCos.setFont(font);
       butSin.setFont(font);
@@ -181,6 +183,7 @@ public void init() {
       panel.add(panelSub5);
 
       panelSub6.add(butSquare);
+      panelSub6.add(butFactorial);
       panelSub6.add(butSquareRoot);
       panelSub6.add(butOneDividedBy);
       panelSub6.add(butxpowerofy);
@@ -204,6 +207,7 @@ public void init() {
       butMinus.addActionListener(this);
       butMultiply.addActionListener(this);
       butDivide.addActionListener(this);
+      butFactorial.addActionListener(this);
       butSquare.addActionListener(this);
       butSquareRoot.addActionListener(this);
       butOneDividedBy.addActionListener(this);
@@ -268,6 +272,10 @@ public void actionPerformed(ActionEvent e) {
             writer(calc.calculateBi(Calculator.BiOperatorModes.xpowerofy, reader()));
          }
 
+         if (source == butFactorial) {
+             writer(calc.calculateMono(Calculator.MonoOperatorModes.factorial, reader()));
+          }
+         
          if (source == butSquare) {
             writer(calc.calculateMono(Calculator.MonoOperatorModes.square, reader()));
          }