Continued rewriting:

- added jcontacts-lib
- updated jars
- fixed imports
- updated mind map
Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/docs/mindmaps/Addressbook Application.mm b/docs/mindmaps/Addressbook Application.mm
index 677e9880ba4cca1f3df82ea053142b4b2a36fb8f..6fb72931f3258f30488ac3f28c31dc2570ba82c5 100644 (file)
--- 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 (file)
index 0000000..6059126
Binary files /dev/null and b/lib/jcontacts-lib.jar differ

diff --git a/lib/jcore-swing.jar b/lib/jcore-swing.jar
index bcf9b93079c88d93034bb5b39be2ae8e5c77b143..c751f576a07947da18dcbd7c3eda7b5d1373c1cb 100644 (file)
Binary files a/lib/jcore-swing.jar and b/lib/jcore-swing.jar differ

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 848bebf4503c8caeeb9557874ffa4a124337d3fb..197b9734f769ec7838a7632dec07f052ddc5990f 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/nbproject/project.properties b/nbproject/project.properties
index ad7f99718fba64f3f6c801b63ccc00c6c69a9bb9..5b330dbaac642a08c752221b80c0404ecb714e4b 100644 (file)
--- 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 b01739eee7226ac4354f94d8a5fff0abf9154502..e040f7a790ace6d1d5d7b298e4714b7b25662944 100644 (file)
--- 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 3ad6edb5c9db395a9d4d6e3817eeb61a2c270c14..5b4e8429a516b31eb5e9b2c3906acd5777d1e428 100644 (file)
--- 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 20d0e5fd3909eb6cb58f698ee8ed266859744720..7bfc503e5043018c07fa56331827ade31732122b 100644 (file)
--- 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;
 
 /**