From 1e17ba68aead440d98580eba67ab8ebdfbbfb1c6 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 2 Sep 2015 14:49:37 +0200 Subject: [PATCH] =?utf8?q?jswingcore=20has=20been=20created=20based=20on?= =?utf8?q?=20jcore's=20last=20Swing-related=20classes=20and=20interfaces?= =?utf8?q?=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore.jar | Bin 120623 -> 113149 bytes lib/jswingcore.jar | Bin 0 -> 8365 bytes nbproject/project.properties | 5 ++++- .../client/gui/AddressbookFrame.java | 4 ++-- .../addressbook/client/gui/SwingClient.java | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 lib/jswingcore.jar diff --git a/lib/jcore.jar b/lib/jcore.jar index 7ccb9088fdd6e8e00feebc0caaa17e385f796630..5ed709dcff75cac80035e78ccc19b4c4522edefb 100644 GIT binary patch delta 2706 zcmZWq2~3nn6#n18%kIj#>~blvfC`ESN2;}`ghdQiskk)QnhILHDq0bxrZI|Ot2KC{ zKjlF^K%|#ez+$sW6$BJP5ElfZ25YgQH8pC8tu|^coj1GS{s?*dX5RO`V`kpWUs<7k z`IpMsl%P;L3W7!uUSu6~4i%qg9h`sYIATY7e|gY5=B@icthh zy)`3bfh2!5H%g_VjyPw<*`%I}aaNDFNO6wBU8+<#()65S4k@KFfmD(*o>Z|in$%5Y zEGb`y7*ga|)#NVEc+6osVFM71#!H})gUo}hddF95l@_YrCWjIgU&V7V7?&OfkKuks z#;Nwv6eg3dN*SXh-TmPqAf3LfkLv|1&T_j$da_7%w~Vc0N$)$fSWWtV@qbQSe|?M3 z8&CTxX#QK(XwFwvSJM_$pR1XzB@NfMbNi0=5?7iB|Jvk0`ca={BGcvzT8MS0fjAmA zkEcQQJdh}~S@$k1AYb$HWC*3bH}78sPpLZd7i%HInFdckg;A8>tlI)hIC*0>Oy-v3 zxe&z%w?7BIHgm&H&~i@KE^y<}@4KOwTblO4JV)0TS)=D{>Irkr0YS(CDNQvJE02NR zoKOS@Xm`xFiy?&%rXPkf6;&qEYzLL6TMwD-8C1|mow zsbO}eZ`1%a0roe7A5N*|jfpF3f!YP1)iUFiTJVwjH>+Ju39`s}b>JuVgXDhAfZHwr zZ3Vhq0za65Np%pwdeu>0%AE@g{CE)5=+ZJ)gb#}ueVI{yBnn*#q!jQEO}(UE#Rxpy zXqP4u`|IG1K-w?C?r-AISSvh?%~D8d$`H(H12tyWTfMi{v%=3?f%7_W!ZsVwL%;|n z^9T#IU#dJokSswGni?P?V0ab5GEzQ~0;RfVno05n%Oj7GIdxJY2C1$~jXoFc*6o3J zFS7k$Hx}2}?5Ei|!FyJ_ah=oflj6r%a1p%uRmK7PXszUBkc=uPJlY6!ZEz_&MA1dX zvU_4g7mUPHm#pb2j`%(Yqy=u8;c4jb#C)qC-F=*EcU)rkkRO^(fb}f-;e}QO7bPYO z0?DMI9T0@_?cQo$L!bnD$)r)?oy*ob9#Epn#T*Q1g0Vb|d)(jm;@O=ciI9cqT8i~e z5G0j2JK=#Q&~f_24SszEj7l;^Mqiyq^jVyh^zFX#45c8DOpvh>m$SzAIcRVi1KSu(A1#-ld7>lJ4IU=6pkYb2#^aKhv(R-e^`-P}Kf<>spKqz$VjY-%CL zv|s68>zu^L`}GIZf!W!t>DbrmQCpei`aWY5+h?LRdRNzsF7w?`@UA-tlah69=Ztv$qbpJ>SsLD z3UjHze_L6B@3gQ$vG|CkBwPAbX0u#n=Np0nQ$de)S8b>EoixYL%3ba8aUyg73m#Q0DK_E$#g>ZDi_BKc%&#-IEbH0J*tb_(oVQw&M zXsUzYQU)uU;{lI1fB`cbK#5iJK!=Mh)&+ot;i-vsxD+;^$AuQFdpf}tCJu*Sg#|)_ z==~^P=@(zZ8jVE0U$>UoxS9T-#foHBPqQsmOgoF!@e#-Uv1$W&Vtza5c)7D#yE50} z9+rS)mMqDGt%GzYsrHEh1FwUQKa^WF_ZID7y+<-z<}wcNcCee8y)F>{?6f8DKC)}i zS;izW%GfTS4JE+7>k!5lz4zIPmLFIxB=#SM^6ddTUeWWYt-|xb9q)Gnefu%5lkGqR zMs~s!jNZ$(c@TKX0EKQh_oerce>T^4G2@Z~z##f=8jDz<>~3)86%=@-2dW_H6!LiP|6dd!Mo^bvNf_qwg!^Mas^5?gBa YmIis55*$>tGjZ(y4{t$$GL~BSA7v9+3;+NC delta 7721 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 diff --git a/lib/jswingcore.jar b/lib/jswingcore.jar new file mode 100644 index 0000000000000000000000000000000000000000..6f46f8643a3cdba071eee470e45823e1e8a24653 GIT binary patch literal 8365 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 B_QL=G literal 0 HcmV?d00001 diff --git a/nbproject/project.properties b/nbproject/project.properties index 27d9c6b..d625d64 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -32,6 +32,7 @@ endorsed.classpath= excludes= file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar file.reference.commons-lang3-3.4.jar=lib/commons-lang3-3.4.jar +file.reference.jswingcore.jar=lib\\jswingcore.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 file.reference.jcore.jar=./lib/jcore.jar @@ -44,7 +45,8 @@ javac.classpath=\ ${file.reference.log4j-core-2.3.jar}:\ ${file.reference.jcore.jar}:\ ${file.reference.commons-codec-1.10.jar}:\ - ${file.reference.commons-lang3-3.4.jar} + ${file.reference.commons-lang3-3.4.jar}:\ + ${file.reference.jswingcore.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint:deprecation -Xlint:unchecked javac.deprecation=true @@ -99,6 +101,7 @@ run.test.classpath=\ ${build.test.classes.dir} source.encoding=UTF-8 source.reference.jcore.jar=../jcore/src/ +source.reference.jswingcore.jar=../jswingcore/src/ source.reference.log4j-api-2.3.jar=/home/quix0r/MyProjects/JARs/log4j-api-2.3-sources.jar source.reference.log4j-core-2.3.jar=/home/quix0r/MyProjects/JARs/log4j-core-2.3-sources.jar src.dir=src diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java index c1f9874..5cb115c 100644 --- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -52,13 +52,13 @@ import org.mxchange.addressbook.application.AddressbookApplication; import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException; import org.mxchange.addressbook.manager.contact.ManageableAddressbookContact; import org.mxchange.jcore.client.Client; -import org.mxchange.jcore.client.gui.ClientFrame; import org.mxchange.jcore.contact.Contact; import org.mxchange.jcore.contact.Gender; import org.mxchange.jcore.exceptions.BadTokenException; import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException; import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException; -import org.mxchange.jcore.model.swing.contact.ContactTableModel; +import org.mxchange.jswingcore.client.gui.ClientFrame; +import org.mxchange.jswingcore.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 afab2fc..b7f8d04 100644 --- a/src/org/mxchange/addressbook/client/gui/SwingClient.java +++ b/src/org/mxchange/addressbook/client/gui/SwingClient.java @@ -23,13 +23,13 @@ import org.mxchange.addressbook.client.BaseAddressbookClient; import org.mxchange.addressbook.menu.Menu; import org.mxchange.addressbook.menu.item.SelectableMenuItem; import org.mxchange.jcore.application.Application; -import org.mxchange.jcore.client.gui.ClientFrame; import org.mxchange.jcore.contact.Contact; import org.mxchange.jcore.contact.Gender; import org.mxchange.jcore.exceptions.BadTokenException; import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException; import org.mxchange.jcore.exceptions.UnhandledUserChoiceException; import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException; +import org.mxchange.jswingcore.client.gui.ClientFrame; /** * -- 2.39.5