From: Roland Haeder Date: Tue, 29 Sep 2015 12:35:20 +0000 (+0200) Subject: Removed dependency to log4j and commons X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=60e5b90bd2611a71a0700ac0070065674c1817b3;p=jcore.git Removed dependency to log4j and commons Signed-off-by:Roland Häder --- diff --git a/lib/commons-codec-1.10.jar b/lib/commons-codec-1.10.jar deleted file mode 100644 index 1d7417c..0000000 Binary files a/lib/commons-codec-1.10.jar and /dev/null differ diff --git a/lib/commons-codec-LICENSE.txt b/lib/commons-codec-LICENSE.txt deleted file mode 100644 index 75b5248..0000000 --- a/lib/commons-codec-LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/lib/commons-lang3-3.4.jar b/lib/commons-lang3-3.4.jar deleted file mode 100644 index 8ec91d4..0000000 Binary files a/lib/commons-lang3-3.4.jar and /dev/null differ diff --git a/lib/log4j-LICENSE.txt b/lib/log4j-LICENSE.txt deleted file mode 100644 index 6279e52..0000000 --- a/lib/log4j-LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 1999-2005 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/lib/log4j-api-2.3.jar b/lib/log4j-api-2.3.jar deleted file mode 100644 index 2a61bbe..0000000 Binary files a/lib/log4j-api-2.3.jar and /dev/null differ diff --git a/lib/log4j-core-2.3.jar b/lib/log4j-core-2.3.jar deleted file mode 100644 index 5438b0b..0000000 Binary files a/lib/log4j-core-2.3.jar and /dev/null differ diff --git a/nbproject/project.properties b/nbproject/project.properties index 6b34e18..dd5df51 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -30,15 +30,11 @@ dist.jar=${dist.dir}/jcore.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -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 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}:\ ${libs.jpa20-persistence.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation @@ -59,8 +55,6 @@ javadoc.noindex=false javadoc.nonavbar=false javadoc.notree=false javadoc.private=true -javadoc.reference.log4j-api-2.3.jar=../JARs/log4j-api-2.3-javadoc.jar -javadoc.reference.log4j-core-2.3.jar=../JARs/log4j-core-2.3-javadoc.jar javadoc.splitindex=true javadoc.use=true javadoc.version=true @@ -93,7 +87,5 @@ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 -source.reference.log4j-api-2.3.jar=../JARs/log4j-api-2.3-sources.jar -source.reference.log4j-core-2.3.jar=../JARs/log4j-core-2.3-sources.jar src.dir=src test.src.dir=test diff --git a/src/org/mxchange/jcore/BaseFrameworkSystem.java b/src/org/mxchange/jcore/BaseFrameworkSystem.java index 960f356..5597436 100644 --- a/src/org/mxchange/jcore/BaseFrameworkSystem.java +++ b/src/org/mxchange/jcore/BaseFrameworkSystem.java @@ -16,12 +16,8 @@ */ package org.mxchange.jcore; -import java.text.MessageFormat; -import java.util.Arrays; import java.util.ResourceBundle; import java.util.StringTokenizer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.mxchange.jcore.application.Application; import org.mxchange.jcore.client.Client; import org.mxchange.jcore.manager.Manageable; @@ -44,11 +40,6 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { */ private static FrameworkInterface selfInstance; - /** - * Class' logger - */ - private final Logger LOG; - /** * Application instance */ @@ -73,9 +64,6 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { * Initialize object */ { - // Init logger - this.LOG = LogManager.getLogger(this); - // Need to set it here selfInstance = this; } @@ -106,12 +94,6 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { return this.client; } - @Override - public void logException (final Throwable exception) { - // Log this exception - this.getLogger().catching(exception); - } - /** * Converts null to empty string or leaves original object untouched. *

@@ -120,18 +102,12 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { * class */ protected Object convertNullToEmpty (final Object object) { - // Trace message - this.getLogger().trace(MessageFormat.format("object={0}", object)); //NOI18N - // Is it null? if (null == object) { // Return empty string return ""; //NOI18N } - // Trace message - this.getLogger().trace(MessageFormat.format("object={0} - EXIT!", object)); //NOI18N - // Return it return object; } @@ -145,9 +121,6 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { * Move to own utility class */ protected String[] getArrayFromString (final String str, final String delimiter) { - // Trace message - this.getLogger().trace(MessageFormat.format("str={0},delimiter={1} - CALLED!", str, delimiter)); //NOI18N - // Get tokenizer StringTokenizer tokenizer = new StringTokenizer(str, delimiter); @@ -160,16 +133,10 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { // Get current token and add it tokens[index] = tokenizer.nextToken(); - // Debug message - this.getLogger().debug(MessageFormat.format("Token at index{0}: {1}", index, tokens[1])); //NOI18N - // Increment index index++; } - // Trace message - this.getLogger().trace(MessageFormat.format("tokens({0})={1} - EXIT!", tokens.length, Arrays.toString(tokens))); //NOI18N - // Return it return tokens; } @@ -230,19 +197,6 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { return this.getBundle().getString(key); } - /** - * Aborts program with given exception - *

- * @param throwable Any type of Throwable - */ - protected void abortProgramWithException (final Throwable throwable) { - // Log exception ... - this.logException(throwable); - - // .. and exit - System.exit(1); - } - /** * Getter for bundle instance *

@@ -261,22 +215,10 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { BaseFrameworkSystem.bundle = bundle; } - /** - * Getter for logger instance - *

- * @return Logger instance - */ - protected Logger getLogger () { - return this.LOG; - } - /** * Initializes i18n bundles */ protected void initBundle () { - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - // Is the bundle set? if (BaseFrameworkSystem.isBundledInitialized()) { // Is already set @@ -285,9 +227,6 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface { // Set instance setBundle(ResourceBundle.getBundle(FrameworkInterface.I18N_BUNDLE_FILE)); // NOI18N - - // Trace message - this.getLogger().trace("EXIT!"); //NOI18N } /** diff --git a/src/org/mxchange/jcore/FrameworkInterface.java b/src/org/mxchange/jcore/FrameworkInterface.java index fc3d260..1c02de6 100644 --- a/src/org/mxchange/jcore/FrameworkInterface.java +++ b/src/org/mxchange/jcore/FrameworkInterface.java @@ -60,11 +60,4 @@ public interface FrameworkInterface { * @return Human-readable message */ public String getMessageStringFromKey (final String key); - - /** - * Logs given exception - *

- * @param exception Exception to log - */ - public void logException (final Throwable exception); } diff --git a/src/org/mxchange/jcore/client/BaseClient.java b/src/org/mxchange/jcore/client/BaseClient.java index ae432cd..b8567c3 100644 --- a/src/org/mxchange/jcore/client/BaseClient.java +++ b/src/org/mxchange/jcore/client/BaseClient.java @@ -40,17 +40,11 @@ public abstract class BaseClient extends BaseFrameworkSystem implements Client { @Override public void doShutdown () throws SQLException, IOException { - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - // Disable client this.disableIsRunning(); // Shuts down contact manager this.getManager().doShutdown(); - - // Trace message - this.getLogger().trace("EXIT!"); //NOI18N } @Override diff --git a/src/org/mxchange/jcore/manager/application/ApplicationManager.java b/src/org/mxchange/jcore/manager/application/ApplicationManager.java index 33a8f25..84ff96d 100644 --- a/src/org/mxchange/jcore/manager/application/ApplicationManager.java +++ b/src/org/mxchange/jcore/manager/application/ApplicationManager.java @@ -66,34 +66,22 @@ public class ApplicationManager extends BaseManager implements ManageableApplica throw new NullPointerException("application is null"); //NOI18N } - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - // Set application instance this.setApplication(application); } @Override public void doShutdown () { - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - // Shutdown this manager, for now nothing // TODO Maybe add something here? } @Override public void start () { - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - // Bootstrap application this.getApplication().doBootstrap(); // Run the main loop this.getApplication().doMainLoop(); - - // Trace message - this.getLogger().trace("EXIT!"); //NOI18N } } diff --git a/src/org/mxchange/jcore/model/contact/gender/GenderUtils.java b/src/org/mxchange/jcore/model/contact/gender/GenderUtils.java index 1c1b7d7..b4d1ec7 100644 --- a/src/org/mxchange/jcore/model/contact/gender/GenderUtils.java +++ b/src/org/mxchange/jcore/model/contact/gender/GenderUtils.java @@ -39,9 +39,6 @@ public class GenderUtils extends BaseFrameworkSystem { // Init instance GenderUtils utils = new GenderUtils(); - // Trace message - utils.getLogger().trace(MessageFormat.format("getTranslatedGender: contact={0} - CALLED!", contact)); - // contact must be set if (null == contact) { // Abort here @@ -54,9 +51,6 @@ public class GenderUtils extends BaseFrameworkSystem { // Get key from it String key = contact.getGender().getMessageKey(); - // Debug message - utils.getLogger().debug(MessageFormat.format("getTranslatedGender: key={0}", key)); - // Translate and return it return utils.getMessageStringFromKey(key); } @@ -73,17 +67,11 @@ public class GenderUtils extends BaseFrameworkSystem { * @return Selectable genders (not UNKNOWN) */ public static List selectableGenders () { - // Trace message - new GenderUtils().getLogger().trace("CALLED!"); //NOI18N - // Init list List list = new LinkedList<>(); // Walk through all genders for (final Gender gender : Gender.values()) { - // Debug log - new GenderUtils().getLogger().debug(MessageFormat.format("gender={0}", gender)); //NOI18N - // Is it not UNKNOWN if (!gender.equals(Gender.UNKNOWN)) { // Add it @@ -94,9 +82,6 @@ public class GenderUtils extends BaseFrameworkSystem { } } - // Trace message - new GenderUtils().getLogger().trace(MessageFormat.format("list={0} - EXIT!", list)); //NOI18N - // Return it return list; }