Add Exception to the System

Author: Sky

src/controller/manager/AssetManager.java

@@ -21,9 +21,7 @@ public class AssetManager {
 	private static Vector<Motorcycle> motorcycles = new Vector<>();
 	private static Vector<Gold> golds = new Vector<>();
 	private static Vector<BankAccount> bankAccounts = new Vector<>();
-	
-	Vector assets = new Vector();
-	
+		
 	// Add to the Vector to contains All 
 	public static int addLand(Land land){
 		return lands.add(land) ? 1 : 0;
@@ -56,7 +54,27 @@ public static Vector<Land> getLands()
 		return new Vector<>(lands);
 	}
 
+	public static Vector<House> getHouses()
+	{
+		return new Vector<>(houses);
+	}
+	
 	public static Vector<Car> getCars(){
 		return new Vector<>(cars);
 	}
+	
+	public static Vector<Motorcycle> getMotorcycles()
+	{
+		return new Vector<>(motorcycles);
+	}
+	
+	public static Vector<Gold> getGolds()
+	{
+		return new Vector<>(golds);
+	}
+	
+	public static Vector<BankAccount> getBankAccounts()
+	{
+		return new Vector<>(bankAccounts);
+	}
 }

src/controller/validator/InvalidNumberException.java

@@ -0,0 +1,17 @@
+package controller.validator;
+
+public class InvalidNumberException extends Exception{
+    private static final long serialVersionUID = 1L;
+
+    public InvalidNumberException(String val1){
+        super(val1 + " is not a number.");
+    }
+    
+    public InvalidNumberException(String val1, String val2){
+        super(val1 + " or " + val2 + " is not a number.");
+    }
+    
+    public InvalidNumberException(String val1, String val2, String val3){
+        super(val1 + " or " + val2 + " or " + val3 + " is not a number.");
+    }
+}

src/controller/validator/MinimumNumberException.java

@@ -0,0 +1,20 @@
+package controller.validator;
+
+public class MinimumNumberException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    // House, Car, Motorcycle
+    public MinimumNumberException(double val1, int maximum) {
+        super("Input value " + val1  + " must be greater than or equals to " + maximum + ".");
+    }
+    
+    // Land, BankAccount
+    public MinimumNumberException(double val1, double val2, int maximum) {
+        super("Input value " + val1 + " or " + val2 + " must be greater than or equals to " + maximum + ".");
+    }
+    
+    // Gold
+    public MinimumNumberException(double val1, double val2, double val3, int maximum) {
+        super("Input value " + val1 + " or " + val2 + " or " + val3 + " must be greater than or equals to " + maximum + ".");
+    }
+}

src/controller/validator/Validator.java

@@ -0,0 +1,64 @@
+package controller.validator;
+
+public class Validator {
+	// House, Car, Motorcycle
+    public static void validate(String val1, boolean required)throws MinimumNumberException,InvalidNumberException
+    {
+    	double number = 0;
+    	try {
+            number = Double.parseDouble(val1);
+
+        } catch (NumberFormatException e) {
+            throw new InvalidNumberException(val1);
+        }
+    	
+    	// Check minimum value
+        if(number < 0)
+        {
+        	throw new MinimumNumberException(number, 0);
+        }
+    }
+    
+	// Land, Bank Account
+    public static void validate(String val1, String val2, boolean required)throws MinimumNumberException,InvalidNumberException
+    {
+    	double number1 = 0, number2 = 0;
+    	
+    	try {
+            number1 = Double.parseDouble(val1);
+            number2 = Double.parseDouble(val2);
+
+        } catch (NumberFormatException e) {
+            throw new InvalidNumberException(val1, val2);
+        }
+    	
+    	// Check minimum value
+        if(number1 < 0 || number2 < 0)
+        {
+        	throw new MinimumNumberException(number1, number2, 0);
+        }
+    }
+    
+    // Gold
+    public static void validate(String val1, String val2, String val3, boolean required)throws MinimumNumberException, InvalidNumberException
+    {
+    	
+    	double number1 = 0, number2 = 0, number3 = 0;
+    	
+    	try {
+            number1 = Double.parseDouble(val1);
+            number2 = Double.parseDouble(val2);
+            number3 = Double.parseDouble(val3);
+
+        } catch (NumberFormatException e) {
+            throw new InvalidNumberException(val1, val2, val3);
+        }
+    	
+    	// Check minimum value
+        if(number1 < 0 || number2 < 0 || number3 < 0)
+        {
+        	throw new MinimumNumberException(number1, number2, number3, 0);
+        }
+    }
+    
+}

src/model/BankAccount.java

@@ -47,7 +47,15 @@ public void setInterestRate(double interestRate) {
 
 	public double calculateMonetaryValue()
 	{
-		return this.balance * (1 + this.interestRate);
+		double total = 0;
+		
+		try {
+			 total = this.balance * (1 + this.interestRate);
+		}catch(ArithmeticException e) {
+			System.out.println("Please Check Value key in to the system, Error in Calculating your Monetary Value.");
+		}
+		
+		return total;
 	}
 
 	public void deposit(double amount)

src/view/AssetManagementSystem.java

@@ -5,10 +5,14 @@
 import view.AssetView;
 import view.View;
 
+/*
+ * Author: Quek Yao Jing B031810136
+ */
+
 public class AssetManagementSystem extends View {
 
 	public void displayOptions(){
-        System.out.println("Welcome to Asset Management System");
+        System.out.println("Welcome to Wealth Management System");
         System.out.println("---------------------------------------");
         System.out.println("1 \t Manage Asset");
         System.out.println("0 \t Exit");
@@ -19,18 +23,11 @@ public void processOption(Scanner scanner, int choice) {
             case 1: {
                 AssetView av = new AssetView();
                 av.displayOptions();
-                av.selectOption(scanner, 9); // I use '0' as escape character
+                av.selectOption(scanner, 9); 
 
                 displayOptions();
                 break;
 
-            } case 2: {
-                System.out.println("You've selected: Manage Customers");
-                break;
-
-            } case 3: {
-                System.out.println("You're selected: Manage Rentals");
-                break;
             }
         }
     }
@@ -41,7 +38,7 @@ public static void main(String args[]){
         AssetManagementSystem assems = new AssetManagementSystem();
 
         assems.displayOptions();
-        assems.selectOption(scanner, 3); // I use '0' as escape character
+        assems.selectOption(scanner, 3); 
     }
 
 }