Continued:

- renamed "created/updated" to "entryCreated/Updated"
- updated project for Apache NetBeans IDE 15

diff --git a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
index 60c2f42f50815dca99a986845f6b4b036318d782..174d1fcfa7325a5f9f1927055b019f286d066c0c 100644 (file)
Binary files a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar and b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 8d00141fd7458a9da3e4bf3eb846cbb5cebf83d2..6e889e29c0b9fb53ac0f33f37d9aa10b4133a6c7 100644 (file)
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,7 +1,7 @@
 libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task
-libs.CopyLibs.prop-version=2.0
+libs.CopyLibs.prop-version=3.0
 libs.jpa20-persistence.classpath=\
     ${base}/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar
 libs.jpa20-persistence.displayName=Persistence (JPA 2.1)

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 0ce02a0b098a7c63257b4d99784a3d4d9fbd9f30..c2d0ece0bb70fcaebdfb8b2d1a24016ef2e4c8a5 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -20,8 +20,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # Files in build.classes.dir which should be excluded from distribution jar
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
@@ -48,6 +52,8 @@ javac.classpath=\
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.deprecation=true
 javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.7
@@ -55,11 +61,14 @@ javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=true
 javadoc.encoding=${source.encoding}
+javadoc.html5=false
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
@@ -68,6 +77,8 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=true
 javadoc.windowtitle=Addressbook Model
+jlink.launcher=false
+jlink.launcher.name=jaddressbook-core
 jnlp.codebase.type=no.codebase
 jnlp.descriptor=application
 jnlp.enabled=false
@@ -96,9 +107,13 @@ run.classpath=\
 # 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.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/

diff --git a/src/org/mxchange/jaddressbook/model/addressbook/Addressbook.java b/src/org/mxchange/jaddressbook/model/addressbook/Addressbook.java
index bdbdf96174af015a2bcb5743c882bb611426acb9..0b132560f360d6f0bacaf563bd4a8139f2a807b8 100644 (file)
--- a/src/org/mxchange/jaddressbook/model/addressbook/Addressbook.java
+++ b/src/org/mxchange/jaddressbook/model/addressbook/Addressbook.java
@@ -47,28 +47,28 @@ public interface Addressbook extends Comparable<Addressbook>, Serializable {
         * <p>
         * @return Addressbook created timestamp
         */
-       Date getAddressbookCreated ();
+       Date getAddressbookEntryCreated ();
 
        /**
         * Setter for addressbook created timestamp
         * <p>
         * @param addressbookCreated Addressbook created timestamp
         */
-       void setAddressbookCreated (final Date addressbookCreated);
+       void setAddressbookEntryCreated (final Date addressbookCreated);
 
        /**
         * Getter for addressbook updated timestamp
         * <p>
         * @return Addressbook updated timestamp
         */
-       Date getAddressbookUpdated ();
+       Date getAddressbookEntryUpdated ();
 
        /**
         * Setter for addressbook updated timestamp
         * <p>
         * @param addressbookUpdated Addressbook updated timestamp
         */
-       void setAddressbookUpdated (final Date addressbookUpdated);
+       void setAddressbookEntryUpdated (final Date addressbookUpdated);
 
        /**
         * Getter for addressbook's name

diff --git a/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java
index 66aba2c892f7a096bde0f3a057cd514671861064..a6edb940757f95f7490f1245b353c6b2a2561650 100644 (file)
--- a/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java
+++ b/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java
@@ -70,8 +70,15 @@ public class UserAddressbook implements Addressbook {
         */
        @Basic (optional = false)
        @Temporal (value = TemporalType.TIMESTAMP)
-       @Column (name = "addressbook_created", updatable = false, nullable = false)
-       private Date addressbookCreated;
+       @Column (name = "addressbook_entry_created", updatable = false, nullable = false)
+       private Date addressbookEntryCreated;
+
+       /**
+        * When this address book has been created
+        */
+       @Temporal (value = TemporalType.TIMESTAMP)
+       @Column (name = "addressbook_entry_updated", insertable = false, nullable = false)
+       private Date addressbookEntryUpdated;
 
        /**
         * Id number
@@ -110,13 +117,6 @@ public class UserAddressbook implements Addressbook {
        @Column (name = "addressbook_status", nullable = false, length = 10)
        private AddressbokStatus addressbookStatus;
 
-       /**
-        * When this address book has been created
-        */
-       @Temporal (value = TemporalType.TIMESTAMP)
-       @Column (name = "addressbook_updated", insertable = false, nullable = false)
-       private Date addressbookUpdated;
-
        /**
         * Connection to "users" table
         */
@@ -202,14 +202,26 @@ public class UserAddressbook implements Addressbook {
 
        @Override
        @SuppressWarnings ("ReturnOfDateField")
-       public Date getAddressbookCreated () {
-               return this.addressbookCreated;
+       public Date getAddressbookEntryCreated () {
+               return this.addressbookEntryCreated;
+       }
+
+       @Override
+       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
+       public void setAddressbookEntryCreated (final Date addressbookEntryCreated) {
+               this.addressbookEntryCreated = addressbookEntryCreated;
+       }
+
+       @Override
+       @SuppressWarnings ("ReturnOfDateField")
+       public Date getAddressbookEntryUpdated () {
+               return this.addressbookEntryUpdated;
        }
 
        @Override
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setAddressbookCreated (final Date addressbookCreated) {
-               this.addressbookCreated = addressbookCreated;
+       public void setAddressbookEntryUpdated (final Date addressbookEntryUpdated) {
+               this.addressbookEntryUpdated = addressbookEntryUpdated;
        }
 
        @Override
@@ -264,18 +276,6 @@ public class UserAddressbook implements Addressbook {
                this.addressbookStatus = addressbookStatus;
        }
 
-       @Override
-       @SuppressWarnings ("ReturnOfDateField")
-       public Date getAddressbookUpdated () {
-               return this.addressbookUpdated;
-       }
-
-       @Override
-       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setAddressbookUpdated (final Date addressbookUpdated) {
-               this.addressbookUpdated = addressbookUpdated;
-       }
-
        @Override
        public User getAddressbookUser () {
                return this.addressbookUser;