From e436b4a3c96881f99dabd2bbc32327a5f72bcb43 Mon Sep 17 00:00:00 2001 From: Sherwin Price Date: Wed, 18 Feb 2026 23:06:25 -0500 Subject: [PATCH] update project. --- .gradle/9.3.1/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/9.3.1/checksums/sha1-checksums.bin | Bin 19631 -> 19739 bytes .../executionHistory/executionHistory.bin | Bin 108764 -> 115665 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/9.3.1/fileHashes/fileHashes.bin | Bin 25797 -> 25797 bytes .gradle/9.3.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../9.3.1/fileHashes/resourceHashesCache.bin | Bin 19755 -> 19891 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes .settings/org.eclipse.buildship.core.prefs | 12 ++-- .../edu/bookocontacts/ControlDDXDialog.java | 8 +-- .../edu/bookocontacts/ViewController.java | 58 ++++++++---------- .../java/edu/bookocontacts/model/Contact.java | 20 +++--- .../edu/bookocontacts/model/EmailAddress.java | 5 ++ .../java/edu/bookocontacts/model/Factory.java | 13 +++- .../edu/bookocontacts/model/PhoneNumber.java | 13 ++-- src/main/resources/media/TableView.fxml | 2 +- 17 files changed, 69 insertions(+), 62 deletions(-) diff --git a/.gradle/9.3.1/checksums/checksums.lock b/.gradle/9.3.1/checksums/checksums.lock index f257aad80d137dedf173531ad112885a075ec77a..ef411d9b83afcaa4b25640494db1b3962c40fa2d 100755 GIT binary patch literal 17 UcmZRUo-Lys_4uYW0|e**04E9qb^rhX literal 17 UcmZRUo-Lys_4uYW0|aOQ04D|masU7T diff --git a/.gradle/9.3.1/checksums/sha1-checksums.bin b/.gradle/9.3.1/checksums/sha1-checksums.bin index 65ead6a9d64a46dd9dbce615dd9747cdc0bc7d76..3dc6aae3b8b99ee4cdbf6b6dc402a0b1edefeba0 100755 GIT binary patch delta 182 zcmZ2KlX3Pe#tkMCjN+3`B@6_n-Ti77U$bWo0~q+M-yAE^!6*Df($-S zC*PHfX0+U>_(Oc7!2{9Fjvjd|ImQeO47v;q45}b3vRAk*tJ7un@0L?14tFm9KF>bn zM-l@A@Cc_}QLr`)kdI58gMu@P0Q$7fUr*7srpS GAYA~9!a9xs delta 39 vcmbO|i*fx-#tkMCjG~iGB@8y#N;EJ|7L^KSn9ZoNhJit1 zDgy&U>BhnZ;*%vMb{Va>^B)RKm+7{2y)v2zQJV7=D*WHUDSuhD;J!kzIK!9En^`3d z7TJ_!8x@zPlvSA~=2azUR%I6En--SlW|t=lM4h{KSIf|2R_Q4&wM9bVr`Rw=HW%)8 zW)e~ee-wZCbMW==&pL%3o_3qYxOnn}y-J&3?Db$0nDMm1JIR+PK6?LfGS|UY33OBLw``hs+<1rB^m-vi85R(4`g|cqMOF~& z_+*D&h7hq|LX1$BzA&Sh1iF1-)yDG#C$HNjr3c|WWMpO#m>wm`HfNr~s*vy*dS4{! z4>L1hxN7s+L-kTFqDvSUM3>CYDo@QRH_kLpElW<$N-iqNC@acLt;{P)DHT|@srrVi zuxC|_(44)J%j1d^Fhn*dCcCpRNgtkk@tN~vnMXO3A3h15erqlxuVivgVsSCEz@oM( z%d%yibQJIUq|1a#onTx#ed1h3`N@l3L`=`0$0#TcRku<9UV9v$q*&1F_44=LXX{OO zXkrurt6&4G_%iw8v!Ln!=P|NR_g%s$Ey66YRR710m5YMw5>;X+JdR-5%(!*>+j)$V zVCm_G3m7#gUwEMf(!l|9%a)DYCoVg7rkkvj+da>3Qy=33kPaz`1=m3qOcr>?y7|E) zMMi<7Q_}Mfx6jZ@&=%!yl(D)sS@6k)$ul2EPM2NC$N_V-n9Z%HoQG~5sMu2fu66r~ z=aU7WNP!hhzVjqUsP6XEM}m9!Cvp@B8t1iT>o6{zetsdNJjA+}Q0v$yA9yA(dGa&c z$;)3PP2T^UQ$SN>$B|bxnl&1yAM0J+?fV%V5|cMP7Xzzs*vKx#Ea3ERM$4`E4Izf% zA4EUi?6HBV;h((VMUjAibMpFw9Ln8)Ryf~%^h$RNLU#UP_Q^gkvjtk$3Ga$l>3v!C zUF~jV!zw3)igg>=!S?jO0@<^ml~KFPP^6PFd7I^y`wJ5x>Kb0v3sfyVns|*(V1eHr z_f(f3?^`GHzb>B6)WE1YIpMX` zGwYYz!Y$i#QlB@8-#(dlg=u<2KjZw(zKa4Grx#3QoGv6?bJ=yihAd>Fd9$ynZ#Hv$n@s9mC~!PKeznMN#9bDu$*c7!AwT?$rDxvZZ=zTj){?bGUEqN zK>_pt0ogHk@`DM&+uu)P{LMPKrn!2u;#xO}bj5D}kGY#Xcs!G~PG93;a%?6j;Fh{i zu3sx^7&qlb;K5rBPnN!)sBBKN&QaB3b z{AizSo}S=h@aVkO=E=hSj0>m7Phu1UMHd%5NVh9^F(xq+8>YPF0@HtRF^Wz13TAW> zKo8mJ^MV;81<-?ZI(rDC7e;7KPYhvfRj|12bY#LJ24|0b@6*mlGYc=71&W)76%V*U zp)GZMdZG>Ef$0q$jC!`XYex$MoAc4}IWs0~Uo0N~K;ywSHUV^@?T)#Od~Dl)_Av(W z3rwDJ@9kq>Q@77nEj%iB&+ptGJ&$n#qmX>;-r%>#E*W$_aIU?2u=pzD(#iXuN=)BZ z&&UHRDduiJw}4TWNuXAD0e{Jj)~#k2bY`aMY?GZV_(Wv#hUa|KWfwEr2uMEZpK{+| zB3F64y}|an3!KvhEg5U3KV8hI%5tT7)4b_?OBm%O&?}Gk&7cbQoaS_wC5&b)w?XRa zmN2Ta+ySwcFJaU%oDNpeFTvR7oS#>cm|UUS2tMfwh-g=$@4c#h@h9; zy&%K9+8E`gFI~ncz|sfe*0eFoOuxE}QNR(zJ#M_in3+L<>56VOuY`xdm4ugb{;giF z&&(j;!pdTJ^1H_?`+H7GY)MI{nHdDo%iT$Fn%n)CGv+a7Gv!oI^ZzNo*852Nokd6N zzn=iRYxQwPP{LBMG-hCsdc(jV^#p|RW#0#}$3JY3lwEN|W2vS}W_H_4W&w1e=@Ua4 y?Y2({Wwak@8MtBkg&am!g~c+Q&vY29R?grpnG}8gDC^XDpj>=^{X$4C{s;h9lID*9 delta 2557 zcmccE&VJ`2+XN9t_KBjV$_!sVGcbr>X8-|4l{E|u5>r7;2F9GP3=Gn%7#J8bH#W`? zpEyBevZTZ=qfoa0P++=Dx25Zq(L{)9TSutye+Q@hWz~ZF3c=zGv(Id1l{8pnV_aNN zQB;V4>!zQJeliY zs|32P*XzGbI&Qp2dV0MOqYMj(H+{YkqarJab$qhJE<=deFCj)KOJA5#jRP!eyqI_L zx?NIw5Y9tJW(EN<-O#38PbLao6zEF*rf4L=%z)vF&1VnQOSuS(GB5~>&Mr(eE=tKV zORq}GC@je}sVvFNP03Hm$}ct%2=JWxLA&A@KZD7o@}A5TYZ(lY&56nGEKK5uCog>E zJXz*Z4&(L73tt6IzW9>l}oWzFltEmDTU?MvHL`NS`pK(wAW8*uNB?Ecw!w@y_IhufnE( zmSZ%V9QHC>AYXFj@k)DL221t>d2^0`*fja#%c%k`?MkJUrHYo4n}6C*jq`DueDS67 zWQUFHlNY?o7BJemm^JfTb{^-_|J!`(R=o#H&OgjPIqYT9f@@*+LE}Y?%O^j4r7-!!8@9;?Z@ssd$TJ2rO?MPzRGt1tk#V)4SaPZG4AYfa zTq#1k1a{oMv1fAQJL~D3LX1k2Wy__u%PTX=GsVWK`SE$IUpMaq_t@I&9*{7#PHlO)fkw zqg+>Y|2gZEW!uiI*z)7t^!dIU*#*#rrcVrIwA(%*l+lTE^5YAh0_<^ilYPRql!T;x zU6K;a&rWCD%qY3JxWJfc@`W4IM3@CGA2I%7pir{ceY45NCA_l)7-vs+G-ec@9DkFY z@$Te{H{2%gyBRLREWq)1(&;6~UhVYinS3G!iYLX@6 z?8$+*r6xbTI&=DgU5uKOA6)R-eDzuYD?A|HCAvz_WMGhzFkI}v6P#MgkP(e^LdCl{_07OL!;u4FY!)Vu2AiOR_1Z#OWm2I=7e z>w#vk>2DV@E|}h!!>9>%)%5prjI7hATQC|=ZhQ|F;$O@tEW#|X;_JN>@jeFom;2sC zU7oMtz_<*QR;SA@X0#DlG-<27p6*n|8AfgSGRNYhrwdv#R!?8Ogi*tA(K=A_>z82c zbI#8zNlY$*WM~Ef^m1Z7SmAoP=`2eb)#5jUc{BMLdjr7Eh3P^sKBj`z{pMku0#OI` z7EC#MsWBU@{3G}D=B13P(%ZniIsD8F0()Cnli8=k63KG|@igcN#FatSQGfRAzdd}9)pc7srte(FC=-ZYmRtjC-D}9qAmHwQ_=e-Y zlf{ZwSC{@Ws!3sH5V&0_?X%-jHFx~gQ&!VspMk0j^wMQgoaT1_<&1fZ(;GS%^=xrh zokyPK8(;7!tjOg~QE$>zUUGt209^>49i&ACxHeo5HqF&!a@+5qc&g~J!}jQTj0+g? zWrOX83mA7X3Eg<9IK}nT65}Pu11FyP%Up+?0{`v)f0;qAKqdFIz{@{djhaCzux9$x z#f+*fzt(-3G@Wk=qny-3_V-J!MD!B4%a<_f7_MFSWzunDBGT{yutI1WW;p^fN^dEnD$6wxD|{)V3d=+g zt9~h?rtERBT5#g4TAH^w`^0CntIMvJiVGI)f+n}=x0f;sv3vyS__&l&PKu+sU_NJb zv*wP?CD#nkKECk@Y{D{LNaC7qzl>3c>oZvFHY`20t`puBtbu(A%7#@=U%}F_ z^fZ0(GDaa5kQgWl={SA|%kD5{W)Seo(|wq%GI3L>V@&q0U2%7r83d-Vuy$Tl7RjCS zVZm?TJeCq>1_3vhec$E;E&H`Hz^V1t!JTj5Nk)EAnwfm9`O&%Ceti4!a;1&YEpSjT LI?f2Hg%m6S<4JQ- diff --git a/.gradle/9.3.1/executionHistory/executionHistory.lock b/.gradle/9.3.1/executionHistory/executionHistory.lock index e6f37f4b8ff590c9e1704545d77f9c25a2dde150..acffcc0a3f0f70355e552b3c36cfe56166ea2447 100755 GIT binary patch literal 17 UcmZSXH>umx74fHr0RpZ705$jpF8}}l literal 17 UcmZSXH>umx74fHr0RoN#05$6cA^-pY diff --git a/.gradle/9.3.1/fileHashes/fileHashes.bin b/.gradle/9.3.1/fileHashes/fileHashes.bin index c7cbe9bd904d6059f64ec5c4d8f1685f732d5a5b..bbb97af412203bc27413d838f48ef97c2134fe05 100755 GIT binary patch delta 914 zcmX?llJV$C#tn|q3QRfG)BJzRuk}9CerM4U`|k`4jB|?5GDSM2uxn7he?$1`c`^fewP5FI|p z7#JAp85kIpmtty(oAM&?;H`!yOW#j&QQW3i4ApW2VhOJbrVfkSPDdszVsQ4@_de}> zG_x>7hc8Ga17n2a)SoKi}^!3RS&U`#B!02p&Ju-zTq)FOvusSa`7X=_^Z-6(wd*JXU(a6iv2H07X+{ z`Q+S$1eW46jngMzOpsDYIwd{-aQh6c1Z`3NMj5MHVC82T&wwmuV307I%$=wPQayjN zX(CwvvdQU*dOXEvnm8d!I9`L2h4{M}Ew|z~gcyc@5dCfdXR9$YwJ1QTXHk>cX|P0hfR5{tnS$ zzLBK=Tc>>lkYa56{^GH{wp}kDky0EC^2`qnXk2rmSXt6jAQp?c2V!`C6aVr#( zMW?$hNxyyY{i&c+f|Np3lv{7p+uc*!nwT9L^!^uvmB)%ZK+NRVpUj=8 z22$-Z*)$QX-+gj=qMlh%tau?r3CC;90N`jYn9mvAthr-z$u+~Xk8eN?Et-59Vn*@g zzYs?0Wc?(tsil(>A&m0Llan?m^i2J;A^hY*Bfr%0F2`4=c)~VR7C=_V-J!MDLf0)T+ZCcRoZbCEtu_0O|0HzVQm8gLe;_4s`}a0c=_j=^vs60I!)Dd;kCd diff --git a/.gradle/9.3.1/fileHashes/fileHashes.lock b/.gradle/9.3.1/fileHashes/fileHashes.lock index 53ee3834657f74a0988378e07e9e781580862c8f..61d6feed55f9a9684804efe3531c5c770c8f20ea 100755 GIT binary patch literal 17 VcmZS1 literal 17 VcmZS1HX%Ga9G5GpU z{wldaKz7NY<%WyXSW@FfhoWs*sP}8~pazC4iR { Callback aRC = (buttonType) -> { if (buttonType == ButtonType.OK) { - if (getFirstName().isBlank() && (getEmail().isBlank() || getPhoneNumber().isBlank())) { + if (getFirstName().isBlank() && (getEmail().isBlank() || getPhoneNo().isBlank())) { return null; } if (getFirstName().isBlank() || getStreet().isEmpty() || getCity().isEmpty() || getState().isEmpty() @@ -72,8 +72,8 @@ public class ControlDDXDialog extends Dialog { return null; } - return new Contact(getFirstName(), getLastName(), new PhoneNumber(getPhoneNumber()), - new EmailAddress(getEmail()), new Address(getStreet(), getCity(), getState(), getZip())); + return new Contact(getFirstName(), getLastName(), new EmailAddress(getEmail()), + new PhoneNumber(getPhoneNo()), new Address(getStreet(), getCity(), getState(), getZip())); } return null; }; @@ -88,7 +88,7 @@ public class ControlDDXDialog extends Dialog { return ""; } - private String getPhoneNumber() { + private String getPhoneNo() { return ""; } diff --git a/src/main/java/edu/bookocontacts/ViewController.java b/src/main/java/edu/bookocontacts/ViewController.java index bdaa22e..81eb11e 100755 --- a/src/main/java/edu/bookocontacts/ViewController.java +++ b/src/main/java/edu/bookocontacts/ViewController.java @@ -10,6 +10,7 @@ import java.util.logging.Logger; import edu.bookocontacts.model.Factory; import edu.bookocontacts.model.Person; import edu.bookocontacts.model.Address; +import edu.bookocontacts.model.PhoneNumber; import edu.bookocontacts.model.Contact; import java.net.URL; @@ -42,29 +43,24 @@ public class ViewController implements Initializable { Logger logger = Logger.getLogger(getClass().getName()); @FXML - private TableView personView = new TableView<>(); + private TableView personView = new TableView<>(); @FXML - private TableColumn personViewIdCol; + private TableColumn personViewIdCol; @FXML - private TableColumn personViewNameCol; + private TableColumn personViewNameCol; @FXML - private TableColumn personViewAgeCol; + private TableColumn personViewPhoneNoCol; @FXML Pagination pagination; @FXML private Button save; - @FXML - private TextField idTxt; - @FXML - private TextField nameTxt; - @FXML - private TextField ageTxt; + private Button id = new Button("ID"); private ImageView upImg = new ImageView(new Image("/media/up.png")); private ImageView downImg = new ImageView(new Image("/media/down.png")); - private ObservableList persons = null; + private ObservableList contacts = null; private int pageCount = 5; private int itemsPerPage = 4; @@ -72,7 +68,7 @@ public class ViewController implements Initializable { private boolean order = true; private void log(String message) { - logger.log(Level.FINE, message); + logger.log(Level.INFO, message); } /** @@ -80,12 +76,12 @@ public class ViewController implements Initializable { */ public void initialize(URL location, ResourceBundle resources) { log("initialize"); - persons = FXCollections.observableArrayList(Factory.getAll(new Person())); - log(String.format("Person size: %d", persons.size())); + contacts = FXCollections.observableArrayList(Factory.getAll(new Contact())); + log(String.format("Person size: %d", contacts.size())); sort(); initializeTable(); - pageCount = getPageCount(persons.size(), itemsPerPage); + pageCount = getPageCount(contacts.size(), itemsPerPage); log("pageCount=" + pageCount); pagination.setPageCount(pageCount); @@ -108,9 +104,9 @@ public class ViewController implements Initializable { Optional result = dialog.showAndWait(); if (result.isPresent()) { - System.out.println("result is present."); + log("result is present."); // add to storage - // persons.add((Address) result.get()); + // contacts.add((Address) result.get()); // bind to model // tvInventory.refresh(); // @@ -126,9 +122,9 @@ public class ViewController implements Initializable { public void handle(javafx.event.ActionEvent t) { sort(); if (order) { - Collections.reverse(persons); + Collections.reverse(contacts); } - log(" order = " + order + "; data = " + persons); + log(" order = " + order + "; data = " + contacts); order = !order; id.setGraphic((order) ? upImg : downImg); updatePersonView(); @@ -138,9 +134,9 @@ public class ViewController implements Initializable { } private void sort() { - Collections.sort(persons, new Comparator() { + Collections.sort(contacts, new Comparator() { @Override - public int compare(Person t, Person t1) { + public int compare(Contact t, Contact t1) { log(" comparator called"); return t.getId().compareTo(t1.getId()); } @@ -148,20 +144,20 @@ public class ViewController implements Initializable { } public void updatePersonView() { - log("updatePersonView"); + log("update View"); personView.getItems() - .setAll(persons.subList(currentPageIndex * itemsPerPage, - ((currentPageIndex * itemsPerPage + itemsPerPage <= persons.size()) + .setAll(contacts.subList(currentPageIndex * itemsPerPage, + ((currentPageIndex * itemsPerPage + itemsPerPage <= contacts.size()) ? currentPageIndex * itemsPerPage + itemsPerPage - : persons.size()))); + : contacts.size()))); } private void initializeTable() { - personViewIdCol.setCellValueFactory(new PropertyValueFactory("Id")); + personViewIdCol.setCellValueFactory(new PropertyValueFactory("Id")); id.setGraphic(upImg); personViewIdCol.setGraphic(id); personViewIdCol.setSortable(false); - personViewNameCol.setCellValueFactory(new PropertyValueFactory("Name")); + personViewNameCol.setCellValueFactory(new PropertyValueFactory("Name")); personViewNameCol.sortTypeProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue paramObservableValue, SortType paramT1, @@ -170,10 +166,10 @@ public class ViewController implements Initializable { id.setGraphic(null); } }); - personViewAgeCol.setCellValueFactory(new PropertyValueFactory("Age")); - personViewAgeCol.setText("AGE"); - personViewAgeCol.setSortable(false); - personView.getItems().setAll(persons.subList(0, itemsPerPage)); + personViewPhoneNoCol.setCellValueFactory(new PropertyValueFactory("PhoneNo")); + personViewPhoneNoCol.setText("PhoneNo"); + personViewPhoneNoCol.setSortable(false); + personView.getItems().setAll(contacts.subList(0, itemsPerPage)); } public int getItemsPerPage() { diff --git a/src/main/java/edu/bookocontacts/model/Contact.java b/src/main/java/edu/bookocontacts/model/Contact.java index ea66ab5..2d858d8 100644 --- a/src/main/java/edu/bookocontacts/model/Contact.java +++ b/src/main/java/edu/bookocontacts/model/Contact.java @@ -23,7 +23,7 @@ public class Contact { this.last_name = last_name; } - public Contact(String first_name, String last_name, PhoneNumber phone_number, EmailAddress email_address, + public Contact(String first_name, String last_name, EmailAddress email_address, PhoneNumber phone_number, Address mailing_address) throws IllegalArgumentException { this.phone_number = phone_number; @@ -33,14 +33,8 @@ public class Contact { this.first_name = first_name; this.last_name = last_name; - if (phone_number == null) { - throw new IllegalArgumentException(String.format("%s %s", "Contact: requires phone number")); - } - if (mailing_address == null) { - throw new IllegalArgumentException(String.format("%s %s", "Contact: requires mailing address")); - } - if (email_address == null) { - throw new IllegalArgumentException(String.format("%s %s", "Contact: requires email address")); + if (this.first_name==null && (email_address.isBlank() || phone_number.isBlank())){ + throw new IllegalArgumentException(String.format("%s %s", "Contact: requires Phone Number or Email Address")); } this.phone_number = phone_number; @@ -122,7 +116,7 @@ public class Contact { this.last_name = last_name; } - public PhoneNumber getPhone_number() { + public PhoneNumber getPhoneNo() { return phone_number; } @@ -138,11 +132,11 @@ public class Contact { this.mailing_address = mailing_address; } - public EmailAddress getEmail_address() { + public EmailAddress getEmail() { return email_address; } - public void setEmail_address(EmailAddress email_address) { + public void setEmail(EmailAddress email_address) { this.email_address = email_address; } @@ -188,7 +182,7 @@ public class Contact { } public void update(Contact ct) { - this.setEmail_address(ct.email_address); + this.setEmail(ct.email_address); this.setPhone_number(ct.phone_number); this.setMailing_address(ct.mailing_address); } diff --git a/src/main/java/edu/bookocontacts/model/EmailAddress.java b/src/main/java/edu/bookocontacts/model/EmailAddress.java index 1c8cc16..95705ac 100644 --- a/src/main/java/edu/bookocontacts/model/EmailAddress.java +++ b/src/main/java/edu/bookocontacts/model/EmailAddress.java @@ -48,5 +48,10 @@ public class EmailAddress{ sb.append("}}"); return sb.toString(); } + + public boolean isBlank() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'isBlank'"); + } } diff --git a/src/main/java/edu/bookocontacts/model/Factory.java b/src/main/java/edu/bookocontacts/model/Factory.java index 60855f9..2d35951 100755 --- a/src/main/java/edu/bookocontacts/model/Factory.java +++ b/src/main/java/edu/bookocontacts/model/Factory.java @@ -46,11 +46,20 @@ public class Factory { public static List getAllContacts() { ArrayList list = new ArrayList<>(); + list.add(createContact(1, "Jose", "Cezone", "cezon50@yahoo.com", "410-456-9876")); + list.add(createContact(2,"Jack", "Bolt", "jbolt100@hotmail.com", "443-266-9776")); + list.add(createContact(3,"David", "Rossi", null, "210-356-9876")); + list.add(createContact(4, "Sheila", "Philster", null, "410-356-5876")); + list.add(createContact(5, "Adam", "Zhaine", null, "410-456-1876")); + list.add(createContact(6, "Amanda", "Kelstone", null, "410-456-2876")); + return list; } - static Person createContact(String _name, int _age) { - return new Person(Integer.toString(id++),_name, _age); + static Contact createContact(Integer id, String first_name, String last_name, String email, String phone_number) { + Contact c = new Contact(first_name, last_name, new EmailAddress(email), new PhoneNumber(phone_number), (Address)null); + c.setId(id); + return c; } } diff --git a/src/main/java/edu/bookocontacts/model/PhoneNumber.java b/src/main/java/edu/bookocontacts/model/PhoneNumber.java index 4e846b4..cba6466 100644 --- a/src/main/java/edu/bookocontacts/model/PhoneNumber.java +++ b/src/main/java/edu/bookocontacts/model/PhoneNumber.java @@ -5,6 +5,9 @@ public class PhoneNumber { public PhoneNumber(String phone_number) { this.phone_number = phone_number; + if( phone_number == null ){ + phone_number = ""; + } } public String getphone_number() { @@ -42,10 +45,10 @@ public class PhoneNumber { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("{ \"PhoneNumber\":{"); - sb.append("\"phone\": \"" + phone_number + "\""); - sb.append("}}"); - return sb.toString(); + return String.format("%s", phone_number); + } + + public boolean isBlank() { + return this.phone_number == null || this.phone_number.isBlank(); } } diff --git a/src/main/resources/media/TableView.fxml b/src/main/resources/media/TableView.fxml index f4c4d12..7185c3a 100755 --- a/src/main/resources/media/TableView.fxml +++ b/src/main/resources/media/TableView.fxml @@ -16,7 +16,7 @@ - +