Continued rewriting:

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

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.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 2038fcb0037127543b41258f008704d83dcfee91..6aee72279863dba4de68e0fceedd5cd3d41c58dc 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,6 +30,7 @@ dist.jar=${dist.dir}/jcore-swing.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
+file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar
 file.reference.log4j-core-2.3.jar=lib/log4j-core-2.3.jar
@@ -39,6 +40,7 @@ jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.jcore.jar}:\
+    ${file.reference.jcontacts-lib.jar}:\
     ${file.reference.log4j-api-2.3.jar}:\
     ${file.reference.log4j-core-2.3.jar}
 # Space-separated list of extra javac options
@@ -92,6 +94,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.jar=../jcore/src
 src.dir=src
 test.src.dir=test

diff --git a/src/org/mxchange/jcoreswing/client/gui/ClientFrame.java b/src/org/mxchange/jcoreswing/client/gui/ClientFrame.java
index 096ed6262f966e77d5a62d33cca664779921c3a7..a69c75e68d688d96bc9eed683907bd2d0043c3e2 100644 (file)
--- a/src/org/mxchange/jcoreswing/client/gui/ClientFrame.java
+++ b/src/org/mxchange/jcoreswing/client/gui/ClientFrame.java
@@ -17,10 +17,10 @@
 package org.mxchange.jcoreswing.client.gui;
 
 import java.io.IOException;
+import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcore.FrameworkInterface;
 import org.mxchange.jcore.client.Client;
 import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException;
-import org.mxchange.jcore.model.contact.Contact;
 
 /**
  * An interface for applications with a Swing frame

diff --git a/src/org/mxchange/jcoreswing/model/swing/contact/ContactTableModel.java b/src/org/mxchange/jcoreswing/model/swing/contact/ContactTableModel.java
index d47822438c67d61928874ff9651a732ee96520c2..e89186f498fa6207ab2ee0deadcce08dbf26dd3b 100644 (file)
--- a/src/org/mxchange/jcoreswing/model/swing/contact/ContactTableModel.java
+++ b/src/org/mxchange/jcoreswing/model/swing/contact/ContactTableModel.java
@@ -17,8 +17,8 @@
 package org.mxchange.jcoreswing.model.swing.contact;
 
 import javax.swing.table.TableModel;
+import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcore.manager.Manageable;
-import org.mxchange.jcore.model.contact.Contact;
 import org.mxchange.jcoreswing.model.BaseModel;
 import org.mxchange.jcoreswing.model.Model;