From cdbfe368f2a9c13ae8b2201ae85873306c676667 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 2 Oct 2015 12:01:43 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20jcontacts-business-core?= =?utf8?q?.jar=20(model/POJO/POJI=20for=20business=20contacts)=20-=20updat?= =?utf8?q?ed=20jcontacts-core=20-=20fixed=20imports=20Signed-off-by:Roland?= =?utf8?q?=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcontacts-business-core.jar | Bin 0 -> 19147 bytes lib/jcontacts-core.jar | Bin 17047 -> 18513 bytes nbproject/project.properties | 3 +++ .../client/console/ConsoleClient.java | 2 +- .../client/gui/AddressbookFrame.java | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 lib/jcontacts-business-core.jar diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..8be05cc0e86743e602cb53dcc3fa98aff1ee0258 GIT binary patch literal 19147 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 JEOm;n{ugG;Vr>8b literal 0 HcmV?d00001 diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 2248057388fbe510565b411e67b98b6b9bc87b77..9affc5432a218b0e32e995f7498d8260a45e8cb7 100644 GIT binary patch delta 1243 zcma)5OHUI~6#i~sQ_2)5<^9kpK4?p!1%fEAb_#+Ci6M|+a3LA#07FVaIw}nz#D#0c zyI@UXqFaOUm53(pSozqgiNC-Y-D^CzJZ#kvZgbCf?w2{|eCOVtjoa+qT_%qVTWv1D z31lYM<$z^*a=mlILjGGt*dGD1yq>iS7-ii8?y$HgGZ`O3&T8NqtEtqNr}RbBSV*PA zxp}ufFo%O8w?0WqgTS8wvru5V<4r;JpZf8ktBrw6<2FF-0g-YtCuRRa%G9PzHMyi~ ziHw>^=!x_D1zV<)S~|V+>%}&SYDb$BbrR|eaSX?WQH1fi(0~&zxNy>mQxZ-~Xyoe! z!D4tGKHex~aP$}{!|dZRpMfhLmYzDQ#ZV=Jno{)>TDI zC6sAx-biM4sWzf^??%zYws|{aSgE41Ii) zRrVgSTL!OC9!_ehnef4raIMSBm9h%{xl8rPGrBprub!dIf3K&!$Suf&26%0^#yeXp z*5E?{JrclBgF?uJZaP^|M4ORr57|;;G&qO>0>M(|cnQmdwdpym3}X{Ea%{q}lVd06 z85~a`J<6u>l67SR{qWQ6l+n3jHxbG~^~DOH5>-@3)T`dB*O9FcNWoI)f3k&1P9&R6 zNT$z3HbT*ckY778%q(Tr{b|b|paRfeKD+qksE@{wuSR2H+FnH?0=`Gj2?)jd1zd{_ z3)qg09{Xn!_tJobe^q&lTHBfPjDJf=&Xs)JwgX~^4kCg3w2OS6OV%!_d?>TS6^9q_#3ajqV5qs#YWCwm^ R*zOQX-1IA^3k(g2({DKjB6t7* delta 324 zcmcaOfpK~(BTs-gGYc030|x_xzUM?9O(s3hiRROpfb0tjAo7zYken>bXbhr)7_C86 zKcf?n+APe(#s;FLITVyYw5?VNH;CSBdYF@kkx7IZX6$4u7fYbIlS^G3fbx^KyBL6| zmq0-vrQ+%gqB32*LDV+aAP^PhCc}7qvZJfiGy6 kefP%-P6h@LHb+sEKDpoBMue3OB*+bfzRU~^CiWm60LWWN4FCWD diff --git a/nbproject/project.properties b/nbproject/project.properties index e6be5a9..f583da6 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -30,6 +30,7 @@ dist.jar=${dist.dir}/addressbook-swing.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= +file.reference.jcontacts-business-core.jar=lib\\jcontacts-business-core.jar file.reference.jcontacts-core.jar=lib/jcontacts-core.jar file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar file.reference.jcore-swing.jar=lib/jcore-swing.jar @@ -43,6 +44,7 @@ javac.classpath=\ ${file.reference.jcore-swing.jar}:\ ${file.reference.jcore-logger-lib.jar}:\ ${file.reference.jcontacts-core.jar}:\ + ${file.reference.jcontacts-business-core.jar}:\ ${reference.addressbook-lib.jar}:\ ${libs.jpa20-persistence.classpath} # Space-separated list of extra javac options @@ -100,6 +102,7 @@ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 +source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/ source.reference.jcontacts-core.jar=../jcontacts-core/src/ source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ source.reference.jcore-swing.jar=../jcore-swing/src diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java index 097a9e5..2824cd8 100644 --- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -25,7 +25,6 @@ import java.util.Scanner; import org.mxchange.addressbook.application.AddressbookApplication; import org.mxchange.addressbook.client.AddressbookClient; import org.mxchange.addressbook.client.BaseAddressbookClient; -import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException; import org.mxchange.addressbook.facade.contact.ContactFacade; import org.mxchange.addressbook.menu.Menu; import org.mxchange.addressbook.menu.MenuTools; @@ -36,6 +35,7 @@ import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcontacts.contact.gender.GenderUtils; +import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcore.application.Application; import org.mxchange.jcore.exceptions.MenuInitializationException; import org.mxchange.jcore.exceptions.UnhandledUserChoiceException; diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java index beea931..173f664 100644 --- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -49,10 +49,10 @@ import javax.swing.border.TitledBorder; import javax.swing.table.TableModel; import org.mxchange.addressbook.BaseAddressbookSystem; import org.mxchange.addressbook.application.AddressbookApplication; -import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException; import org.mxchange.addressbook.facade.contact.ContactFacade; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcore.application.Application; import org.mxchange.jcore.client.Client; import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException; -- 2.39.5