From: Roland Häder Date: Wed, 23 Nov 2022 22:28:46 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b2e13e643a65f54931fced211bf84efbb29c3c5b;p=jaddressbook-core.git 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 60c2f42..174d1fc 100644 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 8d00141..6e889e2 100644 --- 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 0ce02a0..c2d0ece 100644 --- 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 bdbdf96..0b13256 100644 --- 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, Serializable { *

* @return Addressbook created timestamp */ - Date getAddressbookCreated (); + Date getAddressbookEntryCreated (); /** * Setter for addressbook created timestamp *

* @param addressbookCreated Addressbook created timestamp */ - void setAddressbookCreated (final Date addressbookCreated); + void setAddressbookEntryCreated (final Date addressbookCreated); /** * Getter for addressbook updated timestamp *

* @return Addressbook updated timestamp */ - Date getAddressbookUpdated (); + Date getAddressbookEntryUpdated (); /** * Setter for addressbook updated timestamp *

* @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 66aba2c..a6edb94 100644 --- 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;