From 075a4bae91899f52d74c5b5d511e7004cac950bd Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 4 Sep 2015 16:41:02 +0200
Subject: [PATCH] =?utf8?q?More=20cleanup=20from=20TDGP=20usage=20and=20tow?=
 =?utf8?q?ards=20EJB=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mxchang?=
 =?utf8?q?e.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/jcore.jar                                 | Bin 35968 -> 35968 bytes
 lib/jswingcore.jar                            | Bin 8365 -> 8365 bytes
 nbproject/project.properties                  |  10 ++++----
 .../application/AddressbookApplication.java   |   2 +-
 .../client/BaseAddressbookClient.java         |   4 +---
 .../client/console/ConsoleClient.java         |   7 ++----
 .../client/gui/AddressbookFrame.java          |   8 +++----
 .../addressbook/client/gui/SwingClient.java   |   4 +---
 .../contact/AddressbookContactManager.java    |  22 ++++++------------
 .../contact/ManageableAddressbookContact.java |  12 +++-------
 10 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 61bf6e66ad6bd0bf8dd1426ca007c203375c1a60..cadeea937e9b017b64ce4cf9dcab84bc48af5714 100644
GIT binary patch
delta 506
zcmZpe$<#2Di6_9DnT3mifrEj;y=5YgCWl*#iu((p)Fl&bGg(b_lZ=ffu2yCON?lL@
zk)Jey<YZY!eGuixXbqye8O=ac1(WLJf)*|=gmIJqFxr7+Y?!Pd3d}*&MkZ$v^^M5^
zNNu)Y=FtYxZhCFZAo`r)Bt{UOWc&n7dzfxv0rCG?hA@HX5E}_;5S<tPfE7ds#3pfr
z=q(vv*+KN`0*JneMFLEG?m)kk-qz!*XJlZgXPlg1BRRRDnq%{Yl38H0bIM}C^r`ae
zY#_ah>zu*-7xj}tc1^BrvV;f6<b6$GPyA{!07>aITY{+cW_u8|qS+fneQkCFQMN7a
zAgZm!4@6yS@q!4-OtxzUd3ADjYcPm9&>8@ugxVrNR8Ctsh&tL91EQ4M6F^jJdl-ni
z+a3g>3_HLoyE{TayoVi8Aj-Bg9z@OSEC5jgT{$4Ct_!U4Mi<yj!|rUblI}bZ#n)2=
E03-OakN^Mx

delta 506
zcmZpe$<#2Di6_9DnT3mifrEjexq2dxCP!1Xiu+-a^tlslGg-}blMD<eu2yDhs-Ad3
z0YrY%WNNOSEX$}5<V^Nsv<6Y#jAkIg3MSRb1ua}$2;(OIVYCCu*f3c^6qtjkjZDrU
z>Kl^-Q1fOBW*%)2?WWhp45H5&PGSVnNybmWw1?>y77+iRWe5{c+vX4(326{NFZ=;3
zhz^KN;s%Lt$@t0+qE{CH^#SRLMFLEG%|O4D-qz!*XJlZgXPlg1BRRRDnq%{Yl38H0
zbIM}CYEPA4X9MY3T;~ktzo?%KvTJf}lO;SjChu#q0@^qESCavV(rLB?sYq|O2k}-k
zdxNO2&2At;+ZJ~a)z;z%qOP@gK?G$c+qG(gnAxqtAnHJC07#QiTLg&8X$uEYN84gR
zlyZ9lh-z&Q15tO|gFqS#JHRTtJ3>H$4?Cj3=61$|sCk_QAWEPs2Sn9%fmPn<3J38F
PyR*Scy7NF3Ur!MLn^wLU

diff --git a/lib/jswingcore.jar b/lib/jswingcore.jar
index fd4296898ebe5cd0cfa4c5ea62cd16c70cd78719..960b58d575f620f5e04d8cc8273a13661e085b38 100644
GIT binary patch
delta 216
zcmZ4MxYm&;z?+$ci-CcIfx)X~B9A7AXN!va3!&5{6KykDO?8uujV7*EX7X&ActHU~
ze$oVzlVurAKvXcJHHezPXb++;GFpKsUM2?+<<H~+q&ClF+QS5*!&$F#f@nSdMqVbb
zmdP7sEa5gy{v-p|sV8dy(wQJ@38H4px`3#Mvfdy{PtG4i)ysK-sMB%*AWBv~0z{R|
PCxED%@{u6QM4=J@_B%vw

delta 216
zcmZ4MxYm&;z?+$ci-CcIfx#(gB9A7AV~~pbVUhH?6KykD&2^Iu3@5HuW&%oGPymsi
zG=bz~Sw<5O70hT2q9!ofgQ$y)Rv?O($pJ+9GkE~1%`=(yFoEcB)~lQ#T93bx7bLw=
z#u9GR<WDkSoqDncAgKgdOAs|%)&)d8l=TKtdUF0Cs$R|uM4grk08z5?5g@8uJ^@7C
Ll#c{aCJL1Rj=(-n

diff --git a/nbproject/project.properties b/nbproject/project.properties
index cd3475f..f004ceb 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -32,21 +32,21 @@ 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.jcore.jar=lib/jcore.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
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${file.reference.log4j-api-2.3.jar}:\
-    ${file.reference.log4j-core-2.3.jar}:\
     ${file.reference.jcore.jar}:\
+    ${file.reference.jswingcore.jar}:\
     ${file.reference.commons-codec-1.10.jar}:\
     ${file.reference.commons-lang3-3.4.jar}:\
-    ${file.reference.jswingcore.jar}
+    ${file.reference.log4j-api-2.3.jar}:\
+    ${file.reference.log4j-core-2.3.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
 javac.deprecation=true
@@ -102,7 +102,5 @@ run.test.classpath=\
 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
 test.src.dir=test
diff --git a/src/org/mxchange/addressbook/application/AddressbookApplication.java b/src/org/mxchange/addressbook/application/AddressbookApplication.java
index 9a17d06..21af430 100644
--- a/src/org/mxchange/addressbook/application/AddressbookApplication.java
+++ b/src/org/mxchange/addressbook/application/AddressbookApplication.java
@@ -150,7 +150,7 @@ public class AddressbookApplication extends BaseAddressbookSystem implements App
 		this.initProperties();
 
 		// Is the bundle initialized?
-		if (!this.isBundledInitialized()) {
+		if (!isBundledInitialized()) {
 			// Temporary initialize default bundle
 			// TODO The enum Gender uses this
 			this.initBundle();
diff --git a/src/org/mxchange/addressbook/client/BaseAddressbookClient.java b/src/org/mxchange/addressbook/client/BaseAddressbookClient.java
index f14cd81..3c5a8f6 100644
--- a/src/org/mxchange/addressbook/client/BaseAddressbookClient.java
+++ b/src/org/mxchange/addressbook/client/BaseAddressbookClient.java
@@ -24,7 +24,6 @@ import org.mxchange.addressbook.manager.contact.AddressbookContactManager;
 import org.mxchange.addressbook.menu.Menu;
 import org.mxchange.jcore.client.BaseClient;
 import org.mxchange.jcore.client.Client;
-import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException;
 import org.mxchange.jcore.manager.database.ManageableDatabase;
 
 /**
@@ -106,10 +105,9 @@ public abstract class BaseAddressbookClient extends BaseClient {
 
 	/**
 	 * Initializes contact manager
-	 * @throws org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException If the database backend is not supported
 	 * @throws java.sql.SQLException If any SQL error occurs
 	 */
-	protected void initContactManager () throws UnsupportedDatabaseBackendException, SQLException {
+	protected void initContactManager () throws SQLException {
 		// Trace message
 		this.getLogger().trace("CALLED!"); //NOI18N
 		
diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java
index dd7eee8..6b08d12 100644
--- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java
+++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java
@@ -36,10 +36,7 @@ import org.mxchange.addressbook.menu.item.console.ConsoleMenuItem;
 import org.mxchange.jcore.application.Application;
 import org.mxchange.jcore.contact.Contact;
 import org.mxchange.jcore.contact.gender.Gender;
-import org.mxchange.jcore.exceptions.BadTokenException;
-import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
-import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException;
 
 /**
  * A client for the console
@@ -396,7 +393,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 					// TODO throw own exception
 					throw new UnhandledUserChoiceException(MessageFormat.format("Choice '{0}' not handled yet.", choice)); //NOI18N
 			}
-		} catch (final IOException | BadTokenException | CorruptedDatabaseFileException | SQLException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
+		} catch (final IOException | SQLException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
 			// Something bad happened
 			this.abortProgramWithException(ex);
 		}
@@ -575,7 +572,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		// Init contact manager here
 		try {
 			this.initContactManager();
-		} catch (final UnsupportedDatabaseBackendException | SQLException ex) {
+		} catch (final SQLException ex) {
 			// End here
 			this.abortProgramWithException(ex);
 		}
diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
index 8df0da3..7c85fc4 100644
--- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
+++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
@@ -54,8 +54,6 @@ import org.mxchange.addressbook.manager.contact.ManageableAddressbookContact;
 import org.mxchange.jcore.client.Client;
 import org.mxchange.jcore.contact.Contact;
 import org.mxchange.jcore.contact.gender.Gender;
-import org.mxchange.jcore.exceptions.BadTokenException;
-import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException;
 import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException;
 import org.mxchange.jswingcore.client.gui.ClientFrame;
 import org.mxchange.jswingcore.model.swing.contact.ContactTableModel;
@@ -212,7 +210,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra
 	 * @param client Client instance
 	 */
 	@Override
-	public void setupFrame (final Client client) throws IOException, BadTokenException {
+	public void setupFrame (final Client client) throws IOException {
 		// Debug line
 		this.getLogger().trace(MessageFormat.format("client={0}: CALLED!", client)); //NOI18N
 
@@ -681,7 +679,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra
 					// Already added, log away
 					// TODO maybe output message here?
 					self.logException(ex);
-				} catch (final IOException | BadTokenException ex) {
+				} catch (final IOException ex) {
 					// Somethind bad happened here
 					// TODO Output error message here?
 				}
@@ -705,7 +703,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra
 			public void actionPerformed (final ActionEvent e) {
 				try {
 					((ManageableAddressbookContact) self.getClient().getManager()).doChangeOwnData();
-				} catch (final IOException | BadTokenException | CorruptedDatabaseFileException | SQLException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
+				} catch (final IOException | SQLException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
 					self.logException(ex);
 				}
 			}
diff --git a/src/org/mxchange/addressbook/client/gui/SwingClient.java b/src/org/mxchange/addressbook/client/gui/SwingClient.java
index 09765d1..b66b07c 100644
--- a/src/org/mxchange/addressbook/client/gui/SwingClient.java
+++ b/src/org/mxchange/addressbook/client/gui/SwingClient.java
@@ -25,10 +25,8 @@ import org.mxchange.addressbook.menu.item.SelectableMenuItem;
 import org.mxchange.jcore.application.Application;
 import org.mxchange.jcore.contact.Contact;
 import org.mxchange.jcore.contact.gender.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;
 
 /**
@@ -190,7 +188,7 @@ public class SwingClient extends BaseAddressbookClient implements AddressbookCli
 
 			// Now start the frame
 			this.frame.setupFrame(this);
-		} catch (final FrameAlreadyInitializedException | UnsupportedDatabaseBackendException | IOException | BadTokenException | SQLException ex) {
+		} catch (final FrameAlreadyInitializedException | IOException | SQLException ex) {
 			// Abort program
 			this.abortProgramWithException(ex);
 		}
diff --git a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java
index 23ca2f2..18c8bd4 100644
--- a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java
+++ b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java
@@ -29,12 +29,7 @@ import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException;
 import org.mxchange.jcore.client.Client;
 import org.mxchange.jcore.contact.Contact;
 import org.mxchange.jcore.contact.gender.Gender;
-import org.mxchange.jcore.database.frontend.DatabaseFrontend;
-import org.mxchange.jcore.database.storage.Storable;
-import org.mxchange.jcore.exceptions.BadTokenException;
-import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
-import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException;
 import org.mxchange.jcore.manager.BaseManager;
 
 /**
@@ -60,10 +55,9 @@ public class AddressbookContactManager extends BaseManager implements Manageable
 	 * a client instance.
 	 *
 	 * @param client Client instance to use
-	 * @throws org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException If the configured database backend is not supported
 	 * @throws java.sql.SQLException If an SQL error occurs
 	 */
-	public AddressbookContactManager (final Client client) throws UnsupportedDatabaseBackendException, SQLException {
+	public AddressbookContactManager (final Client client) throws SQLException {
 		// Trace message
 		this.getLogger().trace(MessageFormat.format("client={1} - CALLED!", client)); //NOI18N
 
@@ -240,7 +234,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable
 	 * Allows the user to change his/her own data
 	 */
 	@Override
-	public void doChangeOwnData () throws IOException , BadTokenException, CorruptedDatabaseFileException, SQLException, NoSuchMethodException, IllegalAccessException, InvocationTargetException{
+	public void doChangeOwnData () throws IOException, SQLException, NoSuchMethodException, IllegalAccessException, InvocationTargetException{
 		// Trace message
 		this.getLogger().trace("CALLED!"); //NOI18N
 
@@ -291,7 +285,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable
 	 * Asks user for own data
 	 */
 	@Override
-	public void doEnterOwnData () throws ContactAlreadyAddedException, IOException , BadTokenException {
+	public void doEnterOwnData () throws ContactAlreadyAddedException, IOException {
 		// Trace message
 		this.getLogger().trace("CALLED!"); //NOI18N
 
@@ -641,7 +635,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable
 	 * @return Whether own contact is already added
 	 */
 	@Override
-	public boolean isOwnContactAdded () throws IOException, BadTokenException {
+	public boolean isOwnContactAdded () throws IOException {
 		// Trace message
 		this.getLogger().trace("CALLED!"); //NOI18N
 
@@ -651,7 +645,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable
 		try {
 			// Deligate this call to frontend
 			isAdded = ((AddressbookContactFrontend) this.getFrontend()).isOwnContactFound();
-		} catch (final SQLException | IOException | BadTokenException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
+		} catch (final SQLException | IOException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
 			// Something bad happened
 			this.abortProgramWithException(ex);
 		}
@@ -694,7 +688,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable
 
 			// Add contact to internal list
 			this.addContact(contact);
-		} catch (final ContactAlreadyAddedException | BadTokenException | SQLException | IOException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
+		} catch (final ContactAlreadyAddedException | SQLException | IOException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
 			// Abort here
 			this.abortProgramWithException(ex);
 		}
@@ -770,13 +764,11 @@ public class AddressbookContactManager extends BaseManager implements Manageable
 	 * @return Contact instance or null
 	 * @throws java.sql.SQLException If an SQL error occurs
 	 * @throws java.io.IOException If an IO error occurs
-	 * @throws org.mxchange.jcore.exceptions.BadTokenException Continued throw
-	 * @throws org.mxchange.jcore.exceptions.CorruptedDatabaseFileException If the database file is damaged
 	 * @throws java.lang.NoSuchMethodException If a method cannot be found
 	 * @throws java.lang.IllegalAccessException If a method is not accessible
 	 * @throws java.lang.reflect.InvocationTargetException Any other problems?
 	 */
-	private Contact getOwnContact () throws IOException, BadTokenException, CorruptedDatabaseFileException, SQLException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+	private Contact getOwnContact () throws IOException, SQLException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 		// Trace message
 		this.getLogger().trace("CALLED!"); //NOI18N
 
diff --git a/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java b/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java
index 9e12e75..dccb8af 100644
--- a/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java
+++ b/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java
@@ -22,8 +22,6 @@ import java.sql.SQLException;
 import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException;
 import org.mxchange.jcore.contact.Contact;
 import org.mxchange.jcore.contact.gender.Gender;
-import org.mxchange.jcore.exceptions.BadTokenException;
-import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException;
 import org.mxchange.jcore.manager.database.ManageableDatabase;
 
 /**
@@ -180,13 +178,11 @@ public interface ManageableAddressbookContact extends ManageableDatabase {
 	 * Let the user change own data
 	 * @throws java.sql.SQLException If an SQL error occurs
 	 * @throws java.io.IOException If an IO error occurs
-	 * @throws org.mxchange.jcore.exceptions.BadTokenException Continued throw
-	 * @throws org.mxchange.jcore.exceptions.CorruptedDatabaseFileException If the database file is damaged
 	 * @throws java.lang.NoSuchMethodException If a method cannot be found
 	 * @throws java.lang.IllegalAccessException If a method is not accessible
 	 * @throws java.lang.reflect.InvocationTargetException Any other problems?
 	 */
-	public void doChangeOwnData () throws IOException , BadTokenException, CorruptedDatabaseFileException, SQLException, NoSuchMethodException, IllegalAccessException, InvocationTargetException;
+	public void doChangeOwnData () throws IOException , SQLException, NoSuchMethodException, IllegalAccessException, InvocationTargetException;
 
 	/**
 	 * Let the user delete other address
@@ -197,9 +193,8 @@ public interface ManageableAddressbookContact extends ManageableDatabase {
 	 * Asks user for own data
 	 * @throws org.mxchange.addressbook.exceptions.ContactAlreadyAddedException If own contact is already added
 	 * @throws java.io.IOException If an IO error was found
-	 * @throws org.mxchange.jcore.exceptions.BadTokenException If a bad token was found
 	 */
-	public void doEnterOwnData () throws ContactAlreadyAddedException, IOException , BadTokenException;
+	public void doEnterOwnData () throws ContactAlreadyAddedException, IOException;
 
 	/**
 	 * Searches address book for a contact
@@ -212,7 +207,6 @@ public interface ManageableAddressbookContact extends ManageableDatabase {
 	 *
 	 * @return Whether own contact is already added
 	 * @throws java.io.IOException If an IO error occurs
-	 * @throws org.mxchange.jcore.exceptions.BadTokenException If a bad token was found
 	 */
-	public boolean isOwnContactAdded () throws IOException, BadTokenException;
+	public boolean isOwnContactAdded () throws IOException;
 }
-- 
2.39.5