Convert to BlueJ

.gitignore

@@ -152,4 +152,28 @@ fabric.properties
 
 
 #maven build target
-target/
+target/
+
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*

src/main/java/com/zipcodewilmington/scientificcalculator/Console.java → Console.java

@@ -1,4 +1,4 @@
-package com.zipcodewilmington.scientificcalculator;
+ 
 
 import java.util.Scanner;
 

src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java → MainApplication.java

@@ -1,4 +1,4 @@
-package com.zipcodewilmington.scientificcalculator;
+ 
 
 /**
  * Created by leon on 2/9/18.

README.md

@@ -16,23 +16,23 @@ All features must be tested. Tests must include normal behavior, and any possibl
 
 ### Documentation
 
-You must produce UML diagrams for your program. All classes (excluding test classes) must be included in the UML class diagrams.
+You must produce UML diagrams for your program. All classes (excluding test classes) must be included in the UML class diagrams. Your UML must be approved by an instructure by 5PM on Friday.
 
-### Core Features 
+### Core Features
 
 All calculators should have the following features:
 
-- A state, representing the value currently displayed on the calculator (default 0) *
-- Get the current number on the display *
-- Clear the display *
-- Change the number on the display *
+- A state, representing the value currently displayed on the calculator (default 0)
+- Get the current number on the display
+- Clear the display
+- Change the number on the display
 - Add, subtract, multiply, and divide the value on the display by a given number
-- Calculate the square (x<sup>2</sup>) and square root (√x) of the number on the display *
+- Calculate the square (x<sup>2</sup>) and square root (√x) of the number on the display
 - Calculate variable exponentiation (x<sup>y</sup>)
-- Calculate the inverse of the number on the display (1/x) *
+- Calculate the inverse of the number on the display (1/x)
 - Invert the sign of the number on the display (switch between positive and negative)
-- Update the display to `Err` if an error occurs (eg: Division by zero) *
-- Errors must be cleared before any other operation can take place *
+- Update the display to `Err` if an error occurs (eg: Division by zero)
+- Errors must be cleared before any other operation can take place
 
 Each operation should automatically update the display
 
@@ -56,12 +56,15 @@ Each operation should automatically update the display
 - Switch trig units mode (Degrees, Radians)
   - `switchUnitsMode()` should rotate through the options
   - `switchUnitsMode(String mode)` should set the trig units to the type given
+
+### Bonus
+- Factorial function  
 - Logarithmic functions
   - Log
   - 10<sup>x</sup> (inverse logarithm)
   - Ln (natural logarithm)
   - e<sup>x</sup> (inverse natural logarithm)
-- Factorial function  
+
 
 
 ### Custom Features
@@ -86,4 +89,4 @@ The following functions should take the displayed value (x) and updated it accor
 
 ## Submission
 
-Completed projects should be submitted by submitting a pull request against the [original repository](https://github.com/Zipcoder/project-1-calculator). All work should be done in your own repository.
+Completed projects should be submitted by submitting a pull request against the [original repository](https://git.zipcode.rocks/ZipCodeWilmington/ZCW-MacroLabs-OOP-ScientificCalculator). All work should be done in your own repository.

package.bluej

@@ -0,0 +1,42 @@
+#BlueJ package file
+dependency1.from=MainApplication
+dependency1.to=Console
+dependency1.type=UsesDependency
+editor.fx.0.height=722
+editor.fx.0.width=800
+editor.fx.0.x=640
+editor.fx.0.y=23
+objectbench.height=214
+objectbench.width=595
+package.divider.horizontal=0.6
+package.divider.vertical=0.6847360912981455
+package.editor.height=473
+package.editor.width=493
+package.editor.x=35
+package.editor.y=60
+package.frame.height=759
+package.frame.width=619
+package.numDependencies=1
+package.numTargets=2
+package.showExtends=true
+package.showUses=true
+project.charset=UTF-8
+readme.height=58
+readme.name=@README
+readme.width=47
+readme.x=10
+readme.y=10
+target1.height=50
+target1.name=Console
+target1.showInterface=false
+target1.type=ClassTarget
+target1.width=80
+target1.x=80
+target1.y=200
+target2.height=50
+target2.name=MainApplication
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=120
+target2.x=70
+target2.y=70

pom.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.zipcodewilmington</groupId>
-    <artifactId>scientific_calculator</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-
-</project>

src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java

@@ -1,7 +0,0 @@
-package com.zipcodewilmington.scientific_calculator;
-
-/**
- * Created by leon on 2/9/18.
- */
-public class TestMainApplication {
-}