made sure all the intellij stuff works

.gitignore

@@ -1,27 +1,106 @@
-*.class
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
 
-# BlueJ files
-*.ctxt
+# External tool builders
+.externalToolBuilders/
 
-# Package Files #
-*.war
-*.ear
+# Locally stored "Eclipse launch configurations"
+*.launch
 
-# Eclipse #
-.classpath
-.project
-.settings/
-bin/
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
 
-# IDEA #
-.idea/
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+.idea/*
 *.iml
-out/
 
-# Maven #
-dependency-reduced-pom.xml
-target/
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
 
-# logs #
-*.log
-logs/
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+target/*
+
+.project
+.classpath
+.settings

Account.java

@@ -1,43 +0,0 @@
- 
-
-/**
- * @author ZipCodeWilmington
- */
-public abstract class Account {
-
-    private AccountData accountData;
-
-    public Account(AccountData accountData) {
-        this.accountData = accountData;
-    }
-
-    public AccountData getAccountData() {
-        return accountData;
-    }
-
-    public void deposit(int amount) {
-        updateBalance(getBalance() + amount);
-    }
-
-    public boolean withdraw(int amount) {
-        if (canWithdraw(amount)) {
-            updateBalance(getBalance() - amount);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    protected boolean canWithdraw(int amount) {
-        return getBalance() >= amount;
-    }
-
-    public int getBalance() {
-        return accountData.getBalance();
-    }
-
-    private void updateBalance(int newBalance) {
-        accountData = new AccountData(accountData.getId(), accountData.getName(), accountData.getEmail(),
-                newBalance);
-    }
-}

AccountData.java

@@ -1,44 +0,0 @@
- 
-
-/**
- * @author ZipCodeWilmington
- */
-public final class AccountData {
-
-    private final int id;
-    private final String name;
-    private final String email;
-
-    private final int balance;
-
-    AccountData(int id, String name, String email, int balance) {
-        this.id = id;
-        this.name = name;
-        this.email = email;
-        this.balance = balance;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public int getBalance() {
-        return balance;
-    }
-
-    @Override
-    public String toString() {
-        return "Account id: " + id + '\n' +
-                "Name: " + name + '\n' +
-                "Email: " + email + '\n' +
-                "Balance: " + balance;
-    }
-}

ActionResult.java

@@ -1,38 +0,0 @@
- 
-
-/**
- * @author ZipCodeWilmington
- */
-public class ActionResult<T> {
-
-    private T data;
-    private String errorMessage;
-
-    private ActionResult(T data) {
-        this.data = data;
-    }
-
-    private ActionResult(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public boolean isSuccess() {
-        return data != null;
-    }
-
-    public static <E> ActionResult<E> success(E data) {
-        return new ActionResult<E>(data);
-    }
-
-    public static <E> ActionResult<E> fail(String errorMessage) {
-        return new ActionResult<E>(errorMessage);
-    }
-}

Bank.java

@@ -1,52 +0,0 @@
- 
-
-//import rocks.zipcode.atm.ActionResult;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author ZipCodeWilmington
- */
-public class Bank {
-
-    private Map<Integer, Account> accounts = new HashMap<>();
-
-    public Bank() {
-        accounts.put(1000, new BasicAccount(new AccountData(
-                1000, "Example 1", "example1@gmail.com", 500
-        )));
-
-        accounts.put(2000, new PremiumAccount(new AccountData(
-                2000, "Example 2", "example2@gmail.com", 200
-        )));
-    }
-
-    public ActionResult<AccountData> getAccountById(int id) {
-        Account account = accounts.get(id);
-
-        if (account != null) {
-            return ActionResult.success(account.getAccountData());
-        } else {
-            return ActionResult.fail("No account with id: " + id + "\nTry account 1000 or 2000");
-        }
-    }
-
-    public ActionResult<AccountData> deposit(AccountData accountData, int amount) {
-        Account account = accounts.get(accountData.getId());
-        account.deposit(amount);
-
-        return ActionResult.success(account.getAccountData());
-    }
-
-    public ActionResult<AccountData> withdraw(AccountData accountData, int amount) {
-        Account account = accounts.get(accountData.getId());
-        boolean ok = account.withdraw(amount);
-
-        if (ok) {
-            return ActionResult.success(account.getAccountData());
-        } else {
-            return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
-        }
-    }
-}

BasicAccount.java

@@ -1,11 +0,0 @@
- 
-
-/**
- * @author ZipCodeWilmington
- */
-public class BasicAccount extends Account {
-
-    public BasicAccount(AccountData accountData) {
-        super(accountData);
-    }
-}

CashMachine.java

@@ -1,75 +0,0 @@
- 
-
-//import rocks.zipcode.atm.bank.AccountData;
-//import rocks.zipcode.atm.bank.Bank;
-
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-/**
- * @author ZipCodeWilmington
- */
-public class CashMachine {
-
-    private final Bank bank;
-    private AccountData accountData = null;
-
-    public CashMachine(Bank bank) {
-        this.bank = bank;
-    }
-
-    private Consumer<AccountData> update = data -> {
-        accountData = data;
-    };
-
-    public void login(int id) {
-        tryCall(
-                () -> bank.getAccountById(id),
-                update
-        );
-    }
-
-    public void deposit(int amount) {
-        if (accountData != null) {
-            tryCall(
-                    () -> bank.deposit(accountData, amount),
-                    update
-            );
-        }
-    }
-
-    public void withdraw(int amount) {
-        if (accountData != null) {
-            tryCall(
-                    () -> bank.withdraw(accountData, amount),
-                    update
-            );
-        }
-    }
-
-    public void exit() {
-        if (accountData != null) {
-            accountData = null;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";
-    }
-
-    private <T> void tryCall(Supplier<ActionResult<T> > action, Consumer<T> postAction) {
-        try {
-            ActionResult<T> result = action.get();
-            if (result.isSuccess()) {
-                T data = result.getData();
-                postAction.accept(data);
-            } else {
-                String errorMessage = result.getErrorMessage();
-                throw new RuntimeException(errorMessage);
-            }
-        } catch (Exception e) {
-            System.out.println("Error: " + e.getMessage());
-        }
-    }
-}

CashMachineApp.java

@@ -1,78 +0,0 @@
- 
-
-
-import javafx.application.Application;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-import javafx.stage.Stage;
-import javafx.scene.layout.FlowPane;
-
-/**
- * @author ZipCodeWilmington
- */
-public class CashMachineApp extends Application {
-
-    private TextField field = new TextField();
-    private CashMachine cashMachine = new CashMachine(new Bank());
-
-    private Parent createContent() {
-        VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
-
-        TextArea areaInfo = new TextArea();
-
-        Button btnSubmit = new Button("Set Account ID");
-        btnSubmit.setOnAction(e -> {
-            int id = Integer.parseInt(field.getText());
-            cashMachine.login(id);
-
-            areaInfo.setText(cashMachine.toString());
-        });
-
-        Button btnDeposit = new Button("Deposit");
-        btnDeposit.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
-            cashMachine.deposit(amount);
-
-            areaInfo.setText(cashMachine.toString());
-        });
-
-        Button btnWithdraw = new Button("Withdraw");
-        btnWithdraw.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
-            cashMachine.withdraw(amount);
-
-            areaInfo.setText(cashMachine.toString());
-        });
-
-        Button btnExit = new Button("Exit");
-        btnExit.setOnAction(e -> {
-            cashMachine.exit();
-
-            areaInfo.setText(cashMachine.toString());
-        });
-
-        FlowPane flowpane = new FlowPane();
-
-        flowpane.getChildren().add(btnSubmit);
-        flowpane.getChildren().add(btnDeposit);
-        flowpane.getChildren().add(btnWithdraw);
-        flowpane.getChildren().add(btnExit);
-        vbox.getChildren().addAll(field, flowpane, areaInfo);
-        return vbox;
-    }
-
-    @Override
-    public void start(Stage stage) throws Exception {
-        stage.setScene(new Scene(createContent()));
-        stage.show();
-    }
-
-    public static void main(String[] args) {
-        launch(args);
-    }
-}

PremiumAccount.java

@@ -1,18 +0,0 @@
- 
-
-/**
- * @author ZipCodeWilmington
- */
-public class PremiumAccount extends Account {
-
-    private static final int OVERDRAFT_LIMIT = 100;
-
-    public PremiumAccount(AccountData accountData) {
-        super(accountData);
-    }
-
-    @Override
-    protected boolean canWithdraw(int amount) {
-        return getBalance() + OVERDRAFT_LIMIT >= amount;
-    }
-}

README.TXT

@@ -1,5 +1,5 @@
 ****************
-CashMachineBlueJ
+  CashMachine
 ****************
 
 A simple cash account <-> bank system implementation (very loosely modelled!)

package.bluej

@@ -1,115 +0,0 @@
-#BlueJ package file
-dependency1.from=Account
-dependency1.to=AccountData
-dependency1.type=UsesDependency
-dependency10.from=Bank
-dependency10.to=PremiumAccount
-dependency10.type=UsesDependency
-dependency11.from=Bank
-dependency11.to=ActionResult
-dependency11.type=UsesDependency
-dependency2.from=CashMachineApp
-dependency2.to=CashMachine
-dependency2.type=UsesDependency
-dependency3.from=CashMachineApp
-dependency3.to=Bank
-dependency3.type=UsesDependency
-dependency4.from=CashMachine
-dependency4.to=Bank
-dependency4.type=UsesDependency
-dependency5.from=CashMachine
-dependency5.to=AccountData
-dependency5.type=UsesDependency
-dependency6.from=CashMachine
-dependency6.to=ActionResult
-dependency6.type=UsesDependency
-dependency7.from=Bank
-dependency7.to=Account
-dependency7.type=UsesDependency
-dependency8.from=Bank
-dependency8.to=BasicAccount
-dependency8.type=UsesDependency
-dependency9.from=Bank
-dependency9.to=AccountData
-dependency9.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=788
-editor.fx.0.y=119
-objectbench.height=101
-objectbench.width=461
-package.divider.horizontal=0.6
-package.divider.vertical=0.8007380073800738
-package.editor.height=427
-package.editor.width=674
-package.editor.x=664
-package.editor.y=27
-package.frame.height=600
-package.frame.width=800
-package.numDependencies=11
-package.numTargets=8
-package.showExtends=true
-package.showUses=true
-project.charset=UTF-8
-project.invoke.thread=FX
-readme.height=58
-readme.name=@README
-readme.width=47
-readme.x=10
-readme.y=10
-target1.height=50
-target1.name=Account
-target1.showInterface=false
-target1.type=AbstractTarget
-target1.width=80
-target1.x=450
-target1.y=70
-target2.height=50
-target2.name=Bank
-target2.showInterface=false
-target2.type=ClassTarget
-target2.width=80
-target2.x=280
-target2.y=20
-target3.height=50
-target3.name=CashMachine
-target3.showInterface=false
-target3.type=ClassTarget
-target3.width=110
-target3.x=50
-target3.y=110
-target4.height=50
-target4.name=ActionResult
-target4.showInterface=false
-target4.type=ClassTarget
-target4.width=130
-target4.x=150
-target4.y=180
-target5.height=50
-target5.name=AccountData
-target5.showInterface=false
-target5.type=ClassTarget
-target5.width=110
-target5.x=550
-target5.y=290
-target6.height=50
-target6.name=PremiumAccount
-target6.showInterface=false
-target6.type=ClassTarget
-target6.width=130
-target6.x=510
-target6.y=200
-target7.height=50
-target7.name=BasicAccount
-target7.showInterface=false
-target7.type=ClassTarget
-target7.width=110
-target7.x=370
-target7.y=160
-target8.height=50
-target8.name=CashMachineApp
-target8.showInterface=false
-target8.type=ClassTarget
-target8.width=130
-target8.x=70
-target8.y=10