Cleanup:

- removed jcore.jar (maybe not serializable)
- added serial numbers
- removed getTranslatedGender()

diff --git a/lib/jcore.jar b/lib/jcore.jar
deleted file mode 100644 (file)
index c50cd35..0000000
Binary files a/lib/jcore.jar and /dev/null differ

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 2de7e48dbeb65299194f1b9fcf902681684b9adc..357ac893760ba47dbb1e10bf9febea3c51dab0d3 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,101 +1,98 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=jcontacts-core
-application.vendor=Roland Haeder
-auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/jcontacts-core.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.jcore.jar=lib/jcore.jar
-file.reference.jcountry-core.jar=lib/jcountry-core.jar
-file.reference.jphone-core.jar=lib/jphone-core.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.jcore.jar}:\
-    ${file.reference.jcountry-core.jar}:\
-    ${file.reference.jphone-core.jar}:\
-    ${libs.jpa20-persistence.classpath}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
-javac.deprecation=true
-javac.external.vm=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=true
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=true
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=true
-javadoc.windowtitle=Contacts Library
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
-manifest.custom.codebase=
-# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
-manifest.custom.permissions=
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.license=gpl30
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-source.reference.jcore.jar=../jcore/src/
-source.reference.jcountry-core.jar=../jcountry-core/src/
-source.reference.jphone-core.jar=../jphone-core/src/
-src.dir=src
-test.src.dir=test
+annotation.processing.enabled=true\r
+annotation.processing.enabled.in.editor=true\r
+annotation.processing.processors.list=\r
+annotation.processing.run.all.processors=true\r
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output\r
+application.title=jcontacts-core\r
+application.vendor=Roland Haeder\r
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml\r
+build.classes.dir=${build.dir}/classes\r
+build.classes.excludes=**/*.java,**/*.form\r
+# This directory is removed when the project is cleaned:\r
+build.dir=build\r
+build.generated.dir=${build.dir}/generated\r
+build.generated.sources.dir=${build.dir}/generated-sources\r
+# Only compile against the classpath explicitly listed here:\r
+build.sysclasspath=ignore\r
+build.test.classes.dir=${build.dir}/test/classes\r
+build.test.results.dir=${build.dir}/test/results\r
+# Uncomment to specify the preferred debugger connection transport:\r
+#debug.transport=dt_socket\r
+debug.classpath=\\r
+    ${run.classpath}\r
+debug.test.classpath=\\r
+    ${run.test.classpath}\r
+# Files in build.classes.dir which should be excluded from distribution jar\r
+dist.archive.excludes=\r
+# This directory is removed when the project is cleaned:\r
+dist.dir=dist\r
+dist.jar=${dist.dir}/jcontacts-core.jar\r
+dist.javadoc.dir=${dist.dir}/javadoc\r
+endorsed.classpath=\r
+excludes=\r
+file.reference.jcountry-core.jar=lib/jcountry-core.jar\r
+file.reference.jphone-core.jar=lib/jphone-core.jar\r
+includes=**\r
+jar.archive.disabled=${jnlp.enabled}\r
+jar.compress=false\r
+jar.index=${jnlp.enabled}\r
+javac.classpath=\\r
+    ${file.reference.jcountry-core.jar}:\\r
+    ${file.reference.jphone-core.jar}:\\r
+    ${libs.jpa20-persistence.classpath}\r
+# Space-separated list of extra javac options\r
+javac.compilerargs=-Xlint:unchecked -Xlint:deprecation\r
+javac.deprecation=true\r
+javac.external.vm=false\r
+javac.processorpath=\\r
+    ${javac.classpath}\r
+javac.source=1.7\r
+javac.target=1.7\r
+javac.test.classpath=\\r
+    ${javac.classpath}:\\r
+    ${build.classes.dir}\r
+javac.test.processorpath=\\r
+    ${javac.test.classpath}\r
+javadoc.additionalparam=\r
+javadoc.author=true\r
+javadoc.encoding=${source.encoding}\r
+javadoc.noindex=false\r
+javadoc.nonavbar=false\r
+javadoc.notree=false\r
+javadoc.private=true\r
+javadoc.splitindex=true\r
+javadoc.use=true\r
+javadoc.version=true\r
+javadoc.windowtitle=Contacts Library\r
+jnlp.codebase.type=no.codebase\r
+jnlp.descriptor=application\r
+jnlp.enabled=false\r
+jnlp.mixed.code=default\r
+jnlp.offline-allowed=false\r
+jnlp.signed=false\r
+jnlp.signing=\r
+jnlp.signing.alias=\r
+jnlp.signing.keystore=\r
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed\r
+manifest.custom.codebase=\r
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)\r
+manifest.custom.permissions=\r
+meta.inf.dir=${src.dir}/META-INF\r
+mkdist.disabled=true\r
+platform.active=default_platform\r
+project.license=gpl30\r
+run.classpath=\\r
+    ${javac.classpath}:\\r
+    ${build.classes.dir}\r
+# Space-separated list of JVM arguments used when running the project.\r
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.\r
+# To set system properties for unit tests define test-sys-prop.name=value:\r
+run.jvmargs=\r
+run.test.classpath=\\r
+    ${javac.test.classpath}:\\r
+    ${build.test.classes.dir}\r
+source.encoding=UTF-8\r
+source.reference.jcountry-core.jar=../jcountry-core/src/\r
+source.reference.jphone-core.jar=../jphone-core/src/\r
+src.dir=src\r
+test.src.dir=test\r

diff --git a/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java b/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java
index f5b2bb6b8e95f9ccadd85a0e9caef36159346a20..ab2fd5952b362a4f5f8b38b63691a44147281f47 100644 (file)
--- a/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java
+++ b/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java
@@ -16,45 +16,22 @@
  */
 package org.mxchange.jcontacts.contact.gender;
 
+import java.io.Serializable;
 import java.text.MessageFormat;
 import java.util.LinkedList;
 import java.util.List;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcore.BaseFrameworkSystem;
 
 /**
  * Gender utils class
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
-public class GenderUtils extends BaseFrameworkSystem {
+public class GenderUtils implements Serializable {
 
        /**
-        * Translates contact's gender to human-readable
-        * <p>
-        * @param contact Contact instance
-        * <p>
-        * @return Translates value (from bundle)
+        * Serial number
         */
-       public static String getTranslatedGender (final Contact contact) {
-               // Init instance
-               GenderUtils utils = new GenderUtils();
-
-               // contact must be set
-               if (null == contact) {
-                       // Abort here
-                       throw new NullPointerException("contact is null");
-               } else if (contact.getContactGender() == null) {
-                       // Gender is not set
-                       throw new NullPointerException(MessageFormat.format("contact {0} has no gender set.", contact));
-               }
-
-               // Get key from it
-               String key = contact.getContactGender().getMessageKey();
-
-               // Translate and return it
-               return utils.getMessageStringFromKey(key);
-       }
+       private static final long serialVersionUID = 185_683_479_107L;
 
        /**
         * All selectable genders (not UNKNOWN)

diff --git a/src/org/mxchange/jcontacts/contact/utils/ContactUtils.java b/src/org/mxchange/jcontacts/contact/utils/ContactUtils.java
index 4b5baf3284393ab7662c90aa58cfd86011758eb0..82c290839d79ce0ca4cc6bb24ae3709b5784a7e6 100644 (file)
--- a/src/org/mxchange/jcontacts/contact/utils/ContactUtils.java
+++ b/src/org/mxchange/jcontacts/contact/utils/ContactUtils.java
@@ -16,9 +16,9 @@
  */
 package org.mxchange.jcontacts.contact.utils;
 
+import java.io.Serializable;
 import java.util.Objects;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcore.BaseFrameworkSystem;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber;
 import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
@@ -33,7 +33,12 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
-public class ContactUtils extends BaseFrameworkSystem {
+public class ContactUtils implements Serializable {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 26_785_734_719_670L;
 
        /**
         * Checks whether both contacts are same, but ignoring id number. If you