big update

Calculator.java

@@ -1,61 +1,62 @@
+import java.math.BigInteger;
 
-/**
- * Write a description of class Calculator here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
 public class Calculator
 {
     public static void  runCommandLoop() {
         Display display = new Display();
+
         Memory memory = new Memory();
         memory.resetMemory();
+
+        DisplayMode conversion = new DisplayMode();
+        int modeOrdinal = 0;
+
         String initial = Console.getStringInput("Enter number");
         display.setDisplay(initial);
+
         while (true) {  
             String command = Console.getStringInput("Choose a command");
-            if (command.equalsIgnoreCase("off")) {
+            if (command.equalsIgnoreCase("off") || command.equalsIgnoreCase("exit")) {
                 Console.println("Thank you for using our product!");
                 break;
             }
-            if (command.equalsIgnoreCase("c")) {
+            if (command.equalsIgnoreCase("c") || command.equalsIgnoreCase("clear")) {
                 display.setDisplay("0");
                 Console.println(display.getDisplay());
                 String resetValue = Console.getStringInput("Enter number");
                 display.setDisplay(resetValue);
             }
-            if (command.equalsIgnoreCase("+")) {
-                //int first = Console.getIntegerInput("Enter first number");
+            if (command.equalsIgnoreCase("+") || command.equalsIgnoreCase("add")) {
                 double first = Double.parseDouble(display.getDisplay());
                 double second = Console.getDoubleInput("Enter number");
                 double out = Core.add(first, second);
                 Console.println(Double.toString(out));
                 display.setDisplay(Double.toString(out));
             }
-            if (command.equalsIgnoreCase("-")) {
-                //int first = Console.getIntegerInput("Enter first number");
+            if (command.equalsIgnoreCase("-") || command.equalsIgnoreCase("subtract")) {
                 double first = Double.parseDouble(display.getDisplay());
                 double second = Console.getDoubleInput("Enter number");
                 double out = Core.subtract(first, second);
                 Console.println(Double.toString(out));
                 display.setDisplay(Double.toString(out));
             }
-            if (command.equalsIgnoreCase("*")) {
-                //int first = Console.getIntegerInput("Enter first number");
+            if (command.equalsIgnoreCase("*") || command.equalsIgnoreCase("multiply")) {
                 double first = Double.parseDouble(display.getDisplay());
                 double second = Console.getDoubleInput("Enter number");
                 double out = Core.multiply(first, second);
                 Console.println(Double.toString(out));
                 display.setDisplay(Double.toString(out));
             }
-            if (command.equalsIgnoreCase("/")) {
-                //int first = Console.getIntegerInput("Enter first number");
+            if (command.equalsIgnoreCase("/") || command.equalsIgnoreCase("divide")) {
                 double first = Double.parseDouble(display.getDisplay());
                 double second = Console.getDoubleInput("Enter number");
                 double out = Core.divide(first, second);
-                Console.println(Double.toString(out));
-                display.setDisplay(Double.toString(out));
+                if (Double.toString(out) == "NaN" || Double.toString(out) == "Infinity" || Double.toString(out) == "-Infinity") {
+                    display.errorDisplay();
+                } else {
+                    Console.println(Double.toString(out));
+                    display.setDisplay(Double.toString(out));
+                }
             }
             if (command.equalsIgnoreCase("sq")) {
                 double first = Double.parseDouble(display.getDisplay());
@@ -69,20 +70,24 @@ public class Calculator
                 Console.println(Double.toString(out));
                 display.setDisplay(Double.toString(out));
             }
-            if (command.equalsIgnoreCase("^")) {
+            if (command.equalsIgnoreCase("^") || command.equalsIgnoreCase("pow")) {
                 double first = Double.parseDouble(display.getDisplay());
                 double second = Console.getDoubleInput("Enter number");
                 double out = Core.exponentiation(first, second);
                 Console.println(Double.toString(out));
                 display.setDisplay(Double.toString(out));
             }
-            if (command.equalsIgnoreCase("/x")) {
+            if (command.equalsIgnoreCase("/x") || command.equalsIgnoreCase("inverse")) {
                 double first = Double.parseDouble(display.getDisplay());
                 double out = Core.inverse(first);
-                Console.println(Double.toString(out));
-                display.setDisplay(Double.toString(out));
+                if (Double.toString(out) == "NaN" || Double.toString(out) == "Infinity" || Double.toString(out) == "-Infinity") {
+                    display.errorDisplay();
+                } else {
+                    Console.println(Double.toString(out));
+                    display.setDisplay(Double.toString(out));
+                }
             }
-            if (command.equalsIgnoreCase("+-")) {
+            if (command.equalsIgnoreCase("+-") || command.equalsIgnoreCase("reverse")) {
                 double first = Double.parseDouble(display.getDisplay());
                 double out = Core.reverse(first);
                 Console.println(Double.toString(out));
@@ -101,21 +106,103 @@ public class Calculator
                 memory.resetMemory();
                 Console.println(display.getDisplay());
             }
-            /*String s = Console.getStringInput("Enter a string");
-            Integer i = Console.getIntegerInput("Enter an integer");
-            Double d = Console.getDoubleInput("Enter a double.");
-
-            Console.println("The user input %s as a string", s);
-            Console.println("The user input %s as a integer", i);
-            Console.println("The user input %s as a d", d);
-
-            Console.println("What operation would you like to do");
-            int first = Console.getIntegerInput("Enter first number");
-            int second = Console.getIntegerInput("Enter second number");
-            Integer out = Core.add(first, second);
-
-            Console.println(out.toString());*/
-
+            if (command.equalsIgnoreCase("bin") || command.equalsIgnoreCase("binary")) {
+                Console.println(conversion.switchDisplayMode(DisplayMode.Mode.Binary, display.getDisplay()));
+            }
+            if (command.equalsIgnoreCase("hex") || command.equalsIgnoreCase("hexadecimal")) {
+                Console.println(conversion.switchDisplayMode(DisplayMode.Mode.Hexadecimal, display.getDisplay()));
+            }
+            if (command.equalsIgnoreCase("oct") || command.equalsIgnoreCase("octal")) {
+                Console.println(conversion.switchDisplayMode(DisplayMode.Mode.Octal, display.getDisplay()));
+            }
+            if (command.equalsIgnoreCase("dec") || command.equalsIgnoreCase("decimal")) {
+                Console.println(conversion.switchDisplayMode(DisplayMode.Mode.Decimal, display.getDisplay()));
+            }
+            if (command.equalsIgnoreCase("switch")) {
+                Console.println(conversion.switchDisplayMode(DisplayMode.Mode.values()[modeOrdinal], display.getDisplay()));
+                if (modeOrdinal < 3) {
+                    modeOrdinal++; 
+                } else  
+                {
+                    modeOrdinal = 0;
+                }
+            }
+            if (command.equalsIgnoreCase("round") || command.equalsIgnoreCase("R")) {
+                double out = Custom.round(Double.parseDouble(display.getDisplay()));
+                Console.println(Double.toString(out));
+                display.setDisplay(Double.toString(out));
+            }
+            if (command.equalsIgnoreCase("abs")) {
+                double out = Custom.abs(Double.parseDouble(display.getDisplay()));
+                Console.println(Double.toString(out));
+                display.setDisplay(Double.toString(out));
+            }
+            if (command.equalsIgnoreCase("sin")) {
+                double first = Double.parseDouble(display.getDisplay());
+                double out = Scientific.sine(first);
+                if (Double.toString(out) == "NaN") {
+                    display.errorDisplay();
+                } else {
+                    Console.println(Double.toString(out));
+                    display.setDisplay(Double.toString(out));
+                }
+            }
+            if (command.equalsIgnoreCase("cos")) {
+                double first = Double.parseDouble(display.getDisplay());
+                double out = Scientific.cosine(first);
+                if (Double.toString(out) == "NaN") {
+                    display.errorDisplay();
+                } else {
+                    Console.println(Double.toString(out));
+                    display.setDisplay(Double.toString(out));
+                }
+            }
+            if (command.equalsIgnoreCase("tan")) {
+                double first = Double.parseDouble(display.getDisplay());
+                double out = Scientific.tangent(first);
+                if (Double.toString(out) == "NaN") {
+                    display.errorDisplay();
+                } else {
+                    Console.println(Double.toString(out));
+                    display.setDisplay(Double.toString(out));
+                }
+            }
+            if (command.equalsIgnoreCase("asin")) {
+                double first = Double.parseDouble(display.getDisplay());
+                double out = Scientific.inverseSin(first);
+                if (Double.toString(out) == "NaN") {
+                    display.errorDisplay();
+                } else {
+                    Console.println(Double.toString(out));
+                    display.setDisplay(Double.toString(out));
+                }
+            }
+            if (command.equalsIgnoreCase("acos")) {
+                double first = Double.parseDouble(display.getDisplay());
+                double out = Scientific.inverseCosine(first);
+                if (Double.toString(out) == "NaN") {
+                    display.errorDisplay();
+                } else {
+                    Console.println(Double.toString(out));
+                    display.setDisplay(Double.toString(out));
+                }
+            }
+            if (command.equalsIgnoreCase("atan")) {
+                double first = Double.parseDouble(display.getDisplay());
+                double out = Scientific.inverseTangent(first);
+                if (Double.toString(out) == "NaN") {
+                    display.errorDisplay();
+                } else {
+                    Console.println(Double.toString(out));
+                    display.setDisplay(Double.toString(out));
+                }
+            }
+            if (command.equalsIgnoreCase("fact") || command.equalsIgnoreCase("!x")) {
+                double first = Custom.round(Double.parseDouble(display.getDisplay()));
+                BigInteger out = Scientific.factorial(first);
+                Console.println(out.toString());
+                display.setDisplay(out.toString());
+            }
         }
     }
 }

Console.java

@@ -1,7 +1,5 @@
- 
 
 import java.util.Scanner;
-
 /**
  * Created by leon on 2/9/18.
  */
@@ -23,14 +21,14 @@ public class Console {
     }
 
     public static Integer getIntegerInput(String prompt) {
-       Scanner scanner = new Scanner(System.in);
+        Scanner scanner = new Scanner(System.in);
         println(prompt);
         Integer userInput = scanner.nextInt();
         return userInput;
     }
 
     public static Double getDoubleInput(String prompt) {
-       Scanner scanner = new Scanner(System.in);
+        Scanner scanner = new Scanner(System.in);
         println(prompt);
         double userInput = scanner.nextDouble();
         return userInput;

ConversionTest.java

@@ -0,0 +1,42 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class ConversionTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class ConversionTest
+{
+    /**
+     * Default constructor for test class ConversionTest
+     */
+    public ConversionTest()
+    {
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+}

Core.java

@@ -8,17 +8,11 @@
 public class Core
 {
 
-    // instance variables - replace the example below with your own
-    private double x;
-
     /**
      * Constructor for objects of class Core
      */
     public Core()
     {
-        // initialise instance variables
-        //x = 0;
-            
     }
 
     public static double add(double x, double y)
@@ -34,44 +28,29 @@ public class Core
 
     public static double divide(double x, double y)
     {
-        String resetValue = new String();
-        if (y == 0) {
-            Console.println("ERR: Division by zero is not allowed");
-            resetValue = Console.getStringInput("Enter number");
-            //Display display = new Display();
-            //display.setDisplay(resetValue);
-        } else 
-           return x / y;
-        return Double.parseDouble(resetValue);
-        
+        return x / y;
     }
 
     public static double multiply(double x, double y)
     {
         return x * y;
     }
-    
+
     public static double squareRoot(double x)
     {
         return Math.sqrt(x);
     }
-    
+
     public static double exponentiation(double x, double y)
     {
         return Math.pow(x, y);
     }
-    
+
     public static double inverse(double x)
     {
-        if (x == 0) {
-            Console.println("ERR: Division by zero is not allowed");
-            String resetValue = Console.getStringInput("Enter number");
-            //display.setDisplay(resetValue);
-        } else 
-           return 1 / x;
-        return 0;
+        return 1 / x;
     }
-    
+
     public static double reverse(double x)
     {
         return -1*x;

Custom.java

@@ -0,0 +1,19 @@
+
+/**
+ * Write a description of class Custom here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class Custom
+{
+    public static double round(double x)
+    {
+        return Math.round (x);
+    }
+    
+    public static double abs(double x)
+    {
+        return Math.abs (x);
+    }
+}

CustomTest.java

@@ -0,0 +1,42 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class CustomTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class CustomTest
+{
+    /**
+     * Default constructor for test class CustomTest
+     */
+    public CustomTest()
+    {
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+}

Display.java

@@ -7,18 +7,31 @@
  */
 public class Display
 {
-        private String displayValue;
+    private String displayValue;
 
     public String getDisplay() {
         return displayValue;
     }
-    
+
     public void setDisplay(String prompt) {
         displayValue = prompt;
     }
-    
+
     public void resetDisplay(String prompt) {
         displayValue = "0";
     }
-    
+
+    public void errorDisplay() {
+        int Error = 1;
+        while (Error == 1){
+            String command = Console.getStringInput("ERROR. Please clear the display");
+            if (command.equalsIgnoreCase("c") || command.equalsIgnoreCase("clear")) {
+                Error = 0;
+                setDisplay("0");
+                Console.println(getDisplay());
+                String resetValue = Console.getStringInput("Enter number");
+                setDisplay(resetValue);
+            }
+        }    
+    }
 }

DisplayMode.java

@@ -0,0 +1,36 @@
+
+/**
+ * Write a description of class Conversion here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class DisplayMode
+{
+    enum Mode {
+        Binary,
+        Octal, 
+        Decimal, 
+        Hexadecimal
+    }
+    
+    String switchedValue = new String();
+    
+    public String switchDisplayMode(Mode mode, String displayValue) {
+        switch (mode) {
+            case Binary:
+                 switchedValue = Long.toBinaryString(Double.doubleToLongBits(Double.parseDouble(displayValue)));
+                 break;
+            case Octal:
+                 switchedValue = Long.toOctalString(Double.doubleToLongBits(Double.parseDouble(displayValue)));
+                 break;
+            case Decimal:
+                 switchedValue = displayValue;
+                 break;
+            case Hexadecimal:
+                 switchedValue = Double.toHexString(Double.parseDouble(displayValue));
+                 break;
+        }
+        return switchedValue;
+    }
+}

MemoryTest.java

@@ -0,0 +1,42 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class MemoryTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class MemoryTest
+{
+    /**
+     * Default constructor for test class MemoryTest
+     */
+    public MemoryTest()
+    {
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+}

Scientific.java

@@ -1,10 +1,5 @@
+import java.math.BigInteger;
 
-/**
- * Write a description of class Scientific here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
 public class Scientific
 {
     // instance variables - replace the example below with your own
@@ -22,27 +17,23 @@ public class Scientific
     public static double sine(double angle)
     {
         angle = Math.toRadians(angle);
-
         return Math.sin(angle) ;
     }
 
     public static double cosine(double angle)
     {
         angle = Math.toRadians(angle);
-
         return Math.cos(angle) ;
     }
 
     public static double tangent(double angle)
     {
         angle = Math.toRadians(angle);
-
         return Math.tan(angle) ;
     }
 
     public static double inverseSin(double angle)
     {   angle = Math.toRadians(angle);
-
         return Math.asin(angle) ;
 
     }
@@ -50,23 +41,23 @@ public class Scientific
     public static double inverseCosine(double angle)
     {
         angle = Math.toRadians(angle);
-
         return Math.acos(angle) ;
     }
 
     public static double inverseTangent(double angle)
     {
         angle = Math.toRadians(angle);
-
         return Math.atan(angle) ;
     }
-    public static double factorial(double x)
+    public static BigInteger factorial(double x)
     {
-        double result = double.valueof(number);
-        for (double factor = y; factor <= x.doubleValue(); factor++){
-        result = result.multiply(double.valueof(factor));
+        int y = (int) x;
+        BigInteger factorialValue = BigInteger.valueOf(1);
+        for (int i=1; i<=y; i++) {
+            factorialValue = factorialValue.multiply(BigInteger.valueOf(i));
+        }
+        return factorialValue;
         }
 
-        return result ;
     }
-}
+

doc/Conversion.Mode.html

@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sun May 27 15:23:51 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Conversion.Mode</title>
+<meta name="date" content="2018-05-27">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Conversion.Mode";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<h2 title="Enum Conversion.Mode" class="title">Enum Conversion.Mode</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Enum&lt;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>Conversion.Mode</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a>&gt;</dd>
+</dl>
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="Conversion.html" title="class in &lt;Unnamed&gt;">Conversion</a></dd>
+</dl>
+<hr>
+<br>
+<pre>static enum <span class="typeNameLabel">Conversion.Mode</span>
+extends java.lang.Enum&lt;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a>&gt;</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="Conversion.Mode.html#Binary">Binary</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="Conversion.Mode.html#Decimal">Decimal</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="Conversion.Mode.html#Hexadecimal">Hexadecimal</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="Conversion.Mode.html#Octal">Octal</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="Conversion.Mode.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="Conversion.Mode.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
+<code>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="Binary">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Binary</h4>
+<pre>public static final&nbsp;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a> Binary</pre>
+</li>
+</ul>
+<a name="Decimal">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Decimal</h4>
+<pre>public static final&nbsp;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a> Decimal</pre>
+</li>
+</ul>
+<a name="Hexadecimal">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Hexadecimal</h4>
+<pre>public static final&nbsp;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a> Hexadecimal</pre>
+</li>
+</ul>
+<a name="Octal">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Octal</h4>
+<pre>public static final&nbsp;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a> Octal</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a>[]&nbsp;values()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (Conversion.Mode c : Conversion.Mode.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+</body>
+</html>

doc/allclasses-frame.html

@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sun May 27 15:23:51 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>All Classes</title>
+<meta name="date" content="2018-05-27">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="Conversion.html" title="class in &lt;Unnamed&gt;" target="classFrame">Conversion</a></li>
+<li><a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;" target="classFrame">Conversion.Mode</a></li>
+</ul>
+</div>
+</body>
+</html>

doc/allclasses-noframe.html

@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sun May 27 15:23:51 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>All Classes</title>
+<meta name="date" content="2018-05-27">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="Conversion.html" title="class in &lt;Unnamed&gt;">Conversion</a></li>
+<li><a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a></li>
+</ul>
+</div>
+</body>
+</html>

doc/constant-values.html

@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sun May 27 15:23:51 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Constant Field Values</title>
+<meta name="date" content="2018-05-27">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Constant Field Values";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+</body>
+</html>

doc/index.html

@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sun May 27 15:23:51 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Generated Documentation (Untitled)</title>
+<script type="text/javascript">
+    tmpTargetPage = "" + window.location.search;
+    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+        tmpTargetPage = tmpTargetPage.substring(1);
+    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
+        tmpTargetPage = "undefined";
+    targetPage = tmpTargetPage;
+    function validURL(url) {
+        try {
+            url = decodeURIComponent(url);
+        }
+        catch (error) {
+            return false;
+        }
+        var pos = url.indexOf(".html");
+        if (pos == -1 || pos != url.length - 5)
+            return false;
+        var allowNumber = false;
+        var allowSep = false;
+        var seenDot = false;
+        for (var i = 0; i < url.length - 5; i++) {
+            var ch = url.charAt(i);
+            if ('a' <= ch && ch <= 'z' ||
+                    'A' <= ch && ch <= 'Z' ||
+                    ch == '$' ||
+                    ch == '_' ||
+                    ch.charCodeAt(0) > 127) {
+                allowNumber = true;
+                allowSep = true;
+            } else if ('0' <= ch && ch <= '9'
+                    || ch == '-') {
+                if (!allowNumber)
+                     return false;
+            } else if (ch == '/' || ch == '.') {
+                if (!allowSep)
+                    return false;
+                allowNumber = false;
+                allowSep = false;
+                if (ch == '.')
+                     seenDot = true;
+                if (ch == '/' && seenDot)
+                     return false;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+    function loadFrames() {
+        if (targetPage != "" && targetPage != "undefined")
+             top.classFrame.location = top.targetPage;
+    }
+</script>
+</head>
+<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
+<frame src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
+<frame src="Conversion.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<noframes>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="Conversion.html">Non-frame version</a>.</p>
+</noframes>
+</frameset>
+</html>

doc/logfile.txt

@@ -0,0 +1,63 @@
+Class documentation
+<---- javadoc command: ---->
+/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/JDK/Home/bin/javadoc
+-author
+-version
+-nodeprecated
+-package
+-Xdoclint:none
+-noindex
+-notree
+-nohelp
+-nonavbar
+-source
+1.8
+-classpath
+/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/Resources/Java/bluejcore.jar:/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/Resources/Java/junit-4.11.jar:/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/Resources/Java/hamcrest-core-1.3.jar:/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/Resources/Java/lang-stride.jar:/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/Resources/Java/userlib/pi4j-core.jar:/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/Resources/Java/userlib/pi4j-gpio-extension.jar:/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/Resources/Java/userlib/pi4j-service.jar:/private/var/folders/ry/7sfbcy5s6z5cnghq2d48twp80000gp/T/AppTranslocation/B15256E4-D1A2-40A6-A5D6-ECBEE4282437/d/BlueJ.app/Contents/Resources/Java/userlib/pi4j-device.jar:/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator
+-d
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc
+-encoding
+UTF-8
+-charset
+UTF-8
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Conversion.java
+<---- end of javadoc command ---->
+Loading source file /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Conversion.java...
+Constructing Javadoc information...
+Standard Doclet version 1.8.0_144
+Building tree for all the packages and classes...
+Generating /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc/Conversion.html...
+Generating /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc/Conversion.Mode.html...
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Scientific.java:65: error: class expected
+        double result = double.valueof(number);
+                               ^
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Scientific.java:65: error: ';' expected
+        double result = double.valueof(number);
+                                      ^
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Scientific.java:65: error: not a statement
+        double result = double.valueof(number);
+                                       ^
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Scientific.java:65: error: ';' expected
+        double result = double.valueof(number);
+                                             ^
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Scientific.java:67: error: class expected
+        result = result.multiply(double.valueof(factor));
+                                        ^
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Scientific.java:67: error: ')' expected
+        result = result.multiply(double.valueof(factor));
+                                               ^
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Scientific.java:67: error: not a statement
+        result = result.multiply(double.valueof(factor));
+                                                ^
+/Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/Scientific.java:67: error: ';' expected
+        result = result.multiply(double.valueof(factor));
+                                                      ^
+Generating /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc/package-frame.html...
+Generating /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc/package-summary.html...
+Generating /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc/constant-values.html...
+Building index for all the packages and classes...
+Building index for all classes...
+Generating /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc/allclasses-frame.html...
+Generating /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc/allclasses-noframe.html...
+Generating /Users/yauhenip/ZCW-MacroLabs-OOP-ScientificCalculator/doc/index.html...
+8 errors

doc/package-frame.html

@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sun May 27 15:23:51 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>&lt;Unnamed&gt;</title>
+<meta name="date" content="2018-05-27">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="package-summary.html" target="classFrame">&lt;Unnamed&gt;</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="Conversion.html" title="class in &lt;Unnamed&gt;" target="classFrame">Conversion</a></li>
+</ul>
+<h2 title="Enums">Enums</h2>
+<ul title="Enums">
+<li><a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;" target="classFrame">Conversion.Mode</a></li>
+</ul>
+</div>
+</body>
+</html>

doc/package-list

@@ -0,0 +1 @@
+

doc/package-summary.html

@@ -0,0 +1,55 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sun May 27 15:23:51 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="date" content="2018-05-27">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;&lt;Unnamed&gt;</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="Conversion.html" title="class in &lt;Unnamed&gt;">Conversion</a></td>
+<td class="colLast">
+<div class="block">Write a description of class Conversion here.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
+<caption><span>Enum Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Enum</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="Conversion.Mode.html" title="enum in &lt;Unnamed&gt;">Conversion.Mode</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+</body>
+</html>

doc/script.js

@@ -0,0 +1,30 @@
+function show(type)
+{
+    count = 0;
+    for (var key in methods) {
+        var row = document.getElementById(key);
+        if ((methods[key] &  type) != 0) {
+            row.style.display = '';
+            row.className = (count++ % 2) ? rowColor : altColor;
+        }
+        else
+            row.style.display = 'none';
+    }
+    updateTabs(type);
+}
+
+function updateTabs(type)
+{
+    for (var value in tabs) {
+        var sNode = document.getElementById(tabs[value][0]);
+        var spanNode = sNode.firstChild;
+        if (value == type) {
+            sNode.className = activeTableTab;
+            spanNode.innerHTML = tabs[value][1];
+        }
+        else {
+            sNode.className = tableTab;
+            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
+        }
+    }
+}

doc/stylesheet.css

@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}

package.bluej

@@ -1,44 +1,53 @@
 #BlueJ package file
-dependency1.from=Calculator
-dependency1.to=Display
+dependency1.from=MainApplication
+dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=Calculator
-dependency2.to=Console
+dependency10.from=Calculator
+dependency10.to=Custom
+dependency10.type=UsesDependency
+dependency11.from=Calculator
+dependency11.to=Scientific
+dependency11.type=UsesDependency
+dependency2.from=MainApplication
+dependency2.to=Calculator
 dependency2.type=UsesDependency
-dependency3.from=Calculator
+dependency3.from=CoreTest
 dependency3.to=Core
 dependency3.type=UsesDependency
-dependency4.from=MainApplication
+dependency4.from=Display
 dependency4.to=Console
 dependency4.type=UsesDependency
-dependency5.from=MainApplication
-dependency5.to=Calculator
+dependency5.from=Calculator
+dependency5.to=Display
 dependency5.type=UsesDependency
-dependency6.from=Core
-dependency6.to=Display
+dependency6.from=Calculator
+dependency6.to=Memory
 dependency6.type=UsesDependency
-dependency7.from=Core
-dependency7.to=Console
+dependency7.from=Calculator
+dependency7.to=DisplayMode
 dependency7.type=UsesDependency
-dependency8.from=CoreTest
-dependency8.to=Core
+dependency8.from=Calculator
+dependency8.to=Console
 dependency8.type=UsesDependency
+dependency9.from=Calculator
+dependency9.to=Core
+dependency9.type=UsesDependency
 editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=-133
-editor.fx.0.y=-1023
+editor.fx.0.width=1223
+editor.fx.0.x=142
+editor.fx.0.y=110
 objectbench.height=101
 objectbench.width=677
 package.divider.horizontal=0.6
-package.divider.vertical=0.8470254957507082
-package.editor.height=591
+package.divider.vertical=0.8459343794579173
+package.editor.height=586
 package.editor.width=1034
-package.editor.x=465
-package.editor.y=-1037
-package.frame.height=764
+package.editor.x=64
+package.editor.y=87
+package.frame.height=759
 package.frame.width=1160
-package.numDependencies=8
-package.numTargets=9
+package.numDependencies=11
+package.numTargets=15
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -48,68 +57,113 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=CoreTest
+target1.name=ScientificTest
 target1.showInterface=false
 target1.type=UnitTestTargetJunit4
 target1.width=80
-target1.x=420
-target1.y=130
+target1.x=740
+target1.y=140
+target10.association=ConversionTest
+target10.height=50
+target10.name=DisplayMode
+target10.showInterface=false
+target10.type=ClassTarget
+target10.width=110
+target10.x=80
+target10.y=300
+target11.height=50
+target11.name=Calculator
+target11.showInterface=false
+target11.type=ClassTarget
+target11.width=90
+target11.x=440
+target11.y=170
+target12.height=50
+target12.name=Console
+target12.showInterface=false
+target12.type=ClassTarget
+target12.width=80
+target12.x=380
+target12.y=440
+target13.height=50
+target13.name=MainApplication
+target13.showInterface=false
+target13.type=ClassTarget
+target13.width=120
+target13.x=290
+target13.y=100
+target14.association=CoreTest
+target14.height=50
+target14.name=Core
+target14.showInterface=false
+target14.type=ClassTarget
+target14.width=80
+target14.x=710
+target14.y=50
+target15.association=DisplayTest
+target15.height=50
+target15.name=Display
+target15.showInterface=false
+target15.type=ClassTarget
+target15.width=80
+target15.x=80
+target15.y=50
+target2.association=MemoryTest
 target2.height=50
-target2.name=ScientificTest
+target2.name=Memory
 target2.showInterface=false
-target2.type=UnitTestTargetJunit4
+target2.type=ClassTarget
 target2.width=80
-target2.x=530
-target2.y=130
+target2.x=80
+target2.y=170
+target3.association=ScientificTest
 target3.height=50
-target3.name=Calculator
+target3.name=Scientific
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=90
-target3.x=290
-target3.y=70
+target3.width=80
+target3.x=710
+target3.y=170
 target4.height=50
-target4.name=Console
+target4.name=CustomTest
 target4.showInterface=false
-target4.type=ClassTarget
+target4.type=UnitTestTargetJunit4
 target4.width=80
-target4.x=120
-target4.y=300
-target5.association=ScientificTest
+target4.x=740
+target4.y=250
+target5.association=CustomTest
 target5.height=50
-target5.name=Scientific
+target5.name=Custom
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=80
-target5.x=500
-target5.y=160
+target5.x=710
+target5.y=280
 target6.height=50
-target6.name=DisplayTest
+target6.name=ConversionTest
 target6.showInterface=false
 target6.type=UnitTestTargetJunit4
-target6.width=80
-target6.x=480
-target6.y=40
+target6.width=110
+target6.x=110
+target6.y=270
 target7.height=50
-target7.name=MainApplication
+target7.name=DisplayTest
 target7.showInterface=false
-target7.type=ClassTarget
-target7.width=120
-target7.x=70
-target7.y=70
-target8.association=CoreTest
+target7.type=UnitTestTargetJunit4
+target7.width=80
+target7.x=110
+target7.y=20
 target8.height=50
-target8.name=Core
+target8.name=CoreTest
 target8.showInterface=false
-target8.type=ClassTarget
+target8.type=UnitTestTargetJunit4
 target8.width=80
-target8.x=390
-target8.y=160
-target9.association=DisplayTest
+target8.x=740
+target8.y=20
 target9.height=50
-target9.name=Display
+target9.name=MemoryTest
 target9.showInterface=false
-target9.type=ClassTarget
+target9.type=UnitTestTargetJunit4
 target9.width=80
-target9.x=450
-target9.y=70
+target9.x=110
+target9.y=140