Procházet zdrojové kódy

this is all i have

Jordan Elderidge před 8 roky
rodič
revize
63d6fcd7b3

+ 23
- 4
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Zobrazit soubor

@@ -1,7 +1,9 @@
1 1
 package com.zipcodewilmington.phone;
2 2
 
3 3
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
4
+import com.zipcodewilmington.tools.RandomNumberFactory;
4 5
 
6
+import java.util.Random;
5 7
 import java.util.logging.Logger;
6 8
 
7 9
 /**
@@ -20,14 +22,24 @@ public final class PhoneNumberFactory {
20 22
      * @return array of randomly generated PhoneNumber objects
21 23
      */ //TODO - Implement logic
22 24
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
23
-        return null;
25
+        PhoneNumber[] newPhoneNumbers = new PhoneNumber[phoneNumberCount];
26
+        for (int i =0; i <phoneNumberCount;i++){
27
+            createRandomPhoneNumber();
28
+        }
29
+        return newPhoneNumbers;
24 30
     }
25 31
 
26 32
     /**
27 33
      * @return an instance of PhoneNumber with randomly generated phone number value
28 34
      */ //TODO - Implement logic
29 35
     public static PhoneNumber createRandomPhoneNumber() {
30
-        return createPhoneNumberSafely(-1, -1, -1);
36
+       // return createPhoneNumberSafely(-1, -1, -1);
37
+        int newCodeNumber = RandomNumberFactory.createInteger(200,555);
38
+        int newCentralNum = RandomNumberFactory.createInteger(200,555);
39
+        int newLine = RandomNumberFactory.createInteger(2000,5555);
40
+        return createPhoneNumberSafely(newCodeNumber,newCentralNum,newLine);
41
+
42
+
31 43
     }
32 44
 
33 45
 
@@ -38,7 +50,14 @@ public final class PhoneNumberFactory {
38 50
      * @return a new phone number object
39 51
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
40 52
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
41
-        return createPhoneNumber(null);
53
+        String newNumber = "("+ areaCode +")-" + centralOfficeCode + "-" + phoneLineCode;
54
+        try {
55
+            System.out.println(newNumber);
56
+            return createPhoneNumber(newNumber);
57
+        } catch(InvalidPhoneNumberFormatException){
58
+            return createPhoneNumber(null);
59
+        }
60
+
42 61
     }
43 62
 
44 63
     /**
@@ -47,6 +66,6 @@ public final class PhoneNumberFactory {
47 66
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
48 67
      */ // TODO - Add throws statement to method signature
49 68
     public static PhoneNumber createPhoneNumber(String phoneNumberString) {
50
-        return null;
69
+        return new PhoneNumber(phoneNumberString);
51 70
     }
52 71
 }