From 11959210b22f7951e61e2ec927401d629f94c7c9 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 1 Oct 2015 14:49:25 +0200
Subject: [PATCH] =?utf8?q?Continued=20rewriting:=20-=20added=20jcontacts-l?=
 =?utf8?q?ib=20-=20updated=20jars=20-=20fixed=20imports=20-=20updated=20mi?=
 =?utf8?q?nd=20map=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mxchange.?=
 =?utf8?q?org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 docs/mindmaps/Addressbook Application.mm      |  15 +++++++--------
 lib/jcontacts-lib.jar                         | Bin 0 -> 17047 bytes
 lib/jcore-swing.jar                           | Bin 6826 -> 6822 bytes
 lib/jcore.jar                                 | Bin 30691 -> 13594 bytes
 nbproject/project.properties                  |   3 +++
 .../client/console/ConsoleClient.java         |  10 +++++-----
 .../client/gui/AddressbookFrame.java          |   4 ++--
 .../addressbook/client/gui/SwingClient.java   |   4 ++--
 8 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 lib/jcontacts-lib.jar

diff --git a/docs/mindmaps/Addressbook Application.mm b/docs/mindmaps/Addressbook Application.mm
index 677e988..6fb7293 100644
--- a/docs/mindmaps/Addressbook Application.mm	
+++ b/docs/mindmaps/Addressbook Application.mm	
@@ -15,7 +15,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="MapStyle" zoom="1.25">
     <properties show_icon_for_attributes="true" show_note_icons="true"/>
@@ -220,7 +219,7 @@
 <font NAME="Liberation Sans"/>
 </node>
 </node>
-<node TEXT="Add new private address" ID="ID_167887175" CREATED="1443603837016" MODIFIED="1443614745427">
+<node TEXT="Add private address" ID="ID_167887175" CREATED="1443603837016" MODIFIED="1443691842246">
 <font NAME="Liberation Sans"/>
 <node TEXT="Enter personal data" ID="ID_1304960332" CREATED="1443605949952" MODIFIED="1443614745427">
 <font NAME="Liberation Sans"/>
@@ -232,13 +231,13 @@
 <font NAME="Liberation Sans"/>
 </node>
 </node>
-<node TEXT="First name" ID="ID_592998632" CREATED="1443605980762" MODIFIED="1443614745428">
+<node TEXT="Titles (Dr., Prof.)" ID="ID_1117613838" CREATED="1443613582457" MODIFIED="1443614745428">
 <font NAME="Liberation Sans"/>
 </node>
-<node TEXT="Family name" ID="ID_24593473" CREATED="1443605990099" MODIFIED="1443614745428">
+<node TEXT="First name" ID="ID_592998632" CREATED="1443605980762" MODIFIED="1443614745428">
 <font NAME="Liberation Sans"/>
 </node>
-<node TEXT="Titles (Dr., Prof.)" ID="ID_1117613838" CREATED="1443613582457" MODIFIED="1443614745428">
+<node TEXT="Family name" ID="ID_24593473" CREATED="1443605990099" MODIFIED="1443614745428">
 <font NAME="Liberation Sans"/>
 </node>
 <node TEXT="Street + house number" ID="ID_465313977" CREATED="1443605997774" MODIFIED="1443615241203">
@@ -357,7 +356,7 @@
 <font NAME="Liberation Sans"/>
 </node>
 </node>
-<node TEXT="Add/edit HQ" ID="ID_45090171" CREATED="1443613128085" MODIFIED="1443614745436">
+<node TEXT="Add HQ" ID="ID_45090171" CREATED="1443613128085" MODIFIED="1443692193209">
 <font NAME="Liberation Sans"/>
 <node TEXT="Table: &quot;company hq&quot;" ID="ID_1912188815" CREATED="1443613492026" MODIFIED="1443614745437">
 <font NAME="Liberation Sans"/>
@@ -394,9 +393,9 @@
 <font NAME="Liberation Sans"/>
 <node TEXT="Only if different to basic data" ID="ID_398382209" CREATED="1443613164078" MODIFIED="1443614745439">
 <icon BUILTIN="idea"/>
-<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="9" FONT_FAMILY="Liberation Sans" DESTINATION="ID_311175298" STARTINCLINATION="230;0;" ENDINCLINATION="230;0;" STARTARROW="NONE" ENDARROW="DEFAULT"/>
-<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="9" FONT_FAMILY="Liberation Sans" DESTINATION="ID_683654765" STARTINCLINATION="237;0;" ENDINCLINATION="237;0;" STARTARROW="NONE" ENDARROW="DEFAULT"/>
 <font NAME="Liberation Sans"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="9" FONT_FAMILY="Liberation Sans" DESTINATION="ID_683654765" STARTINCLINATION="237;0;" ENDINCLINATION="237;0;" STARTARROW="NONE" ENDARROW="DEFAULT"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="9" FONT_FAMILY="Liberation Sans" DESTINATION="ID_311175298" STARTINCLINATION="230;0;" ENDINCLINATION="230;0;" STARTARROW="NONE" ENDARROW="DEFAULT"/>
 </node>
 </node>
 <node TEXT="Fax number(s)" ID="ID_311175298" CREATED="1443613158788" MODIFIED="1443614745439">
diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar
new file mode 100644
index 0000000000000000000000000000000000000000..60591263ad819c32c5279302610321f13bfab3b1
GIT binary patch
literal 17047
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
GPW>9ww<7ES

literal 0
HcmV?d00001

diff --git a/lib/jcore-swing.jar b/lib/jcore-swing.jar
index bcf9b93079c88d93034bb5b39be2ae8e5c77b143..c751f576a07947da18dcbd7c3eda7b5d1373c1cb 100644
GIT binary patch
delta 419
zcmZ2wy3CX}z?+$ci-CcIfg!)taU!n<a~_bgn8pm^U6cn?pEW?#WI0A-Fdf2Z1*Ru5
z+JWgyjFw=UkI5cP2Qaw{0@b_!$vniJ&BVX}!X}d+FiKC}FU~&Mo`rw%O(q>FEe%bd
z{GxRI+=}Fk#Ju!W{jB8typqJ^lH$#Z%%)5rlQu`P+OUBcGq?{i3W3a=wmtXAG@x5S
z*qLGSLkYdfwNm1nH}d{v5?8}v+;M?ER<Oe&#4JF*n><+z;?S#N`e1Q(aSJf*B<>8R
zJH)-f^i^>`Fs&xx38srA{K51QiEv&N4^GyQ3<b+HNJ=w#u}*%-s4#i2q%>IQHc+UO
c8!RLtC9Z(!2?jV=(&)zv^^!W9s~AWe0D0noa{vGU

delta 425
zcmZ2xy2_L{z?+$ci-CcIfkDUHZX&M+vo?^jn8pm^U6cn?pEW?#WI0A-Fdf2Z1*Ru5
z+JWgyjFw=UkI5cP2Qaw{0oA)dHR)o?Wny3eVH1YQ3&j;D+p_RazR9G+qNAbdGx;Nr
zFl%mpN@~t#d1g~4kk-xNtTt?5#x(9jjDjFT#5_*r&j30Ogq<fpU{su3&%`%*HJ{+-
zmAuT%j2cL$92V$f1v?-_%mU<#$^Bvw2VE4?2a7X{TYzahac3~yBJKsIFN*ttX(b6y
zFr6pi52g=Dg!7_!WU`86C|IUOQkuz!b@D?-g~>Z5r4>Mmgx;7OtYc(g0AWoA1X$A8
k%?(y4A|(!1h~guJI)){U0lZ*^P!CS-k`iO{6a%RM03S<g(EtDd

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 848bebf4503c8caeeb9557874ffa4a124337d3fb..197b9734f769ec7838a7632dec07f052ddc5990f 100644
GIT binary patch
delta 2263
zcmZ`)Yitx%6#iy*c4v2(?Y_FZE!)y}?Yotih1v%ds60x6@)SV}6r_|b?Y2dWacPL6
zMibzw2}C8)MvRe&tN{{D!1#(k#MB>RF#eJF!^8xmKh#8x=iHes+X|D+{q8;YobP=1
zee;%by3f0Il|wTCH&8mf<b=1vQ9{u8ii2B|1rmO*U=VYZI*DD%Vu>#(3nYH3EMh#V
zE|kqhYI}g19np$o^ItLn{%gcwAR=}+ij#*8<YJ2lIoQg@LtJcg<6#}!4Y;s_i$`=k
z%GkrjPWISkP_f%U6usQs!_B=q9&=-#fdKm4*w3B)Y(JnQu46#QK^=n%TsueNyZd_;
z%wFBsGb(<X6%n(wv#CF|=T&XHj#lxEo=RPCS1Z9Xl$*%M91{g7G*N_Nam!QGQidTD
z2@EUn6G2aXe@}dGefRLtzW81fBiLwS6o*WdpwvVc)|z-6ohD+)GqC|1MYl1}QHCc(
zbEw424r3<PVZDMJp=dd&NuyRt=FpUoJ~&};96(4q2vwFMk<>_}G=x5AAh{HE54D;I
z6+%zdB`8%XsP9YH3M#YUpmHg>x6l$VLnXCL%NbRurj`fE8r0fMd9n-8E<im`oeG%5
zC9P|ytV2DOoRg7rI;%c_gI(1O*Y1owPCJi+2HbmxVC{U(jOZ<Qh}JL{^Eg^Gcw_Ci
zN4A?LZ4ZsCPsT(@1y7zeGOo?X0*YElRtFR}O~ZX?lr%4T+mcK(2RfC9$aM@M97Y6B
z(cB-Qxjl*+9Fw#yGy^>1G;KW=VKK3=t%+(XMVH}zG*glgtzQdTDN}@2wGB&1AgA|2
z{TC4(?K&P%!qmMK&Sg@`x~%8|R$@r;$I1Uh#$a4iSzWv%DMG_?bjZlpvZ8VfR^%y)
zJbjl)-bK7#4`KyJO69lL&z!k_uS*(hpQP7M!%D2OgIh={&$O#beB?7SG@K<3Z{I}&
z?_AEg8l5&xvrXfvx(ILeMP$v?aV~?(Gc^$&tdY~N@o^)nB#);~a?73Tn@MvqV>p^k
zBTu2NgEyA7ms9ZFK0DU5UZDxUnnB>SkEn)j`v4|^Exf%*Meb$zPr>^k0$YQ@O9)*F
zW?x45G9t|CkS8Qae83m9rM`q8U(tniErUJRmS^u+KOI)OL~NY}G6$evfbU~O-z6SC
zpoQrZdYzh^$f#oTv|By3E6}O(-JD8=ZYZ*HJbcrtj7EQR$m{x@Z_aeSOk?1`Twd4b
zHLrLz<};!?f;vJvvPEHDu@=@55zF&7iZ}AEZg6S5A)S<%kBEy>>u{6JLpBf^HqN4f
zaNA2a5~Gjp6y=w41JmVxn_ptd{kz~ftMY7dmsPn@`nje1&GKzlMXBg@$sz5lJFa*Y
zHQO=unu*U2H1czHGTtg*ruKNf#Nl|O#P{MY5`T@al-NA5Oybi6D<n=1ESEU@;QE69
zy=Wvn{Y{JyilRY&-*Ri#u9_yHBXUkXqSIO7pRe2WH!<Gj6aI>@Xw!n?ufd>9lr<Dn
z&WK5(Y8$GQmj0ob`eaBt`YTOwH5?XKhD_OYjk<P*x$9)2q>%MZTf%fA!in+Cxsrlc
zv^Qbp8cW2~hL|)L7S0lv5_2W%FJ#`7Z<}kx4+$&T*5R1?W5JYnWoe$co(RgUBj49$
zC27;}&sTZ+n;4&8Oab}ARTdE6jaWQIBQf=#5^4Ur+%NXq<}osFD<ks~_LQ_|n|}VI
li75GRPjeDZjDJ#1j+LTzG(X$PyN(|IDBhxLd`B&}{sWp2Q!M}h

literal 30691
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
YpzQ=^P{gQZLl0gcxUoRaj4}5A0SBs!5C8xG

diff --git a/nbproject/project.properties b/nbproject/project.properties
index ad7f997..5b330db 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-lib.jar=lib/jcontacts-lib.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
 file.reference.jcore-swing.jar=lib/jcore-swing.jar
 file.reference.jcore.jar=lib/jcore.jar
@@ -41,6 +42,7 @@ javac.classpath=\
     ${file.reference.jcore.jar}:\
     ${file.reference.jcore-swing.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
+    ${file.reference.jcontacts-lib.jar}:\
     ${reference.addressbook-lib.jar}:\
     ${libs.jpa20-persistence.classpath}
 # Space-separated list of extra javac options
@@ -98,6 +100,7 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
+source.reference.jcontacts-lib.jar=../jcontacts-lib/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcore-swing.jar=../jcore-swing/src
 source.reference.jcore.jar=../jcore/src
diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java
index b01739e..e040f7a 100644
--- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java
+++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java
@@ -26,19 +26,19 @@ 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.jcore.exceptions.MenuInitializationException;
 import org.mxchange.addressbook.manager.contact.ManageableContactAddressbook;
 import org.mxchange.addressbook.menu.Menu;
 import org.mxchange.addressbook.menu.MenuTools;
 import org.mxchange.addressbook.menu.console.ConsoleMenu;
 import org.mxchange.addressbook.menu.item.SelectableMenuItem;
 import org.mxchange.addressbook.menu.item.console.ConsoleMenuItem;
+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.jcore.application.Application;
+import org.mxchange.jcore.exceptions.MenuInitializationException;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
-import org.mxchange.jcore.model.contact.Contact;
-import org.mxchange.jcore.model.contact.UserContact;
-import org.mxchange.jcore.model.contact.gender.Gender;
-import org.mxchange.jcore.model.contact.gender.GenderUtils;
 
 /**
  * A client for the console
diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
index 3ad6edb..5b4e842 100644
--- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
+++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
@@ -51,12 +51,12 @@ import org.mxchange.addressbook.BaseAddressbookSystem;
 import org.mxchange.addressbook.application.AddressbookApplication;
 import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException;
 import org.mxchange.addressbook.manager.contact.ManageableContactAddressbook;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcore.application.Application;
 import org.mxchange.jcore.client.Client;
 import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException;
 import org.mxchange.jcore.manager.Manageable;
-import org.mxchange.jcore.model.contact.Contact;
-import org.mxchange.jcore.model.contact.gender.Gender;
 import org.mxchange.jcoreswing.client.gui.ClientFrame;
 import org.mxchange.jcoreswing.model.swing.contact.ContactTableModel;
 
diff --git a/src/org/mxchange/addressbook/client/gui/SwingClient.java b/src/org/mxchange/addressbook/client/gui/SwingClient.java
index 20d0e5f..7bfc503 100644
--- a/src/org/mxchange/addressbook/client/gui/SwingClient.java
+++ b/src/org/mxchange/addressbook/client/gui/SwingClient.java
@@ -21,11 +21,11 @@ import java.sql.SQLException;
 import org.mxchange.addressbook.client.AddressbookClient;
 import org.mxchange.addressbook.client.BaseAddressbookClient;
 import org.mxchange.addressbook.menu.item.SelectableMenuItem;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcore.application.Application;
 import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
-import org.mxchange.jcore.model.contact.Contact;
-import org.mxchange.jcore.model.contact.gender.Gender;
 import org.mxchange.jcoreswing.client.gui.ClientFrame;
 
 /**
-- 
2.39.5