From: Roland Haeder Date: Thu, 1 Oct 2015 12:50:31 +0000 (+0200) Subject: Continued rewriting: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=461abcbb1cd15c983ca0a54a75925e682050d37f;p=jcore-swing.git Continued rewriting: - added jcontacts-lib - updated jars - fixed imports Signed-off-by:Roland Häder --- diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar new file mode 100644 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 848bebf..197b973 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/nbproject/project.properties b/nbproject/project.properties index 2038fcb..6aee722 100644 --- 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 096ed62..a69c75e 100644 --- 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 d478224..e89186f 100644 --- 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;