resorted members + added this.

[jfinancials-lib.git] / src / org / mxchange / addressbook / model / addressbook / UserAddressbook.java

diff --git a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
index ff3dbfd6c392312b13f46c41aca807bbf1f2a981..80d72641bc8475a1f1dc5a26846a45559caa4806 100644 (file)
--- a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
+++ b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
@@ -76,6 +76,20 @@ public class UserAddressbook implements Addressbook, Comparable<Addressbook> {
        @Column (name = "addressbook_id", length = 20, nullable = false, updatable = false)
        private Long addressbookId;
 
+       /**
+        * Last locked timestamp
+        */
+       @Temporal (TemporalType.TIMESTAMP)
+       @Column (name = "addressbook_last_locked")
+       private Calendar addressbookLastLocked;
+
+       /**
+        * Last locked timestamp
+        */
+       @Lob
+       @Column (name = "addressbook_last_locked_reason")
+       private String addressbookLastLockedReason;
+
        /**
         * Name for this address book
         */
@@ -98,20 +112,6 @@ public class UserAddressbook implements Addressbook, Comparable<Addressbook> {
        @OneToOne (targetEntity = LoginUser.class, optional = false, cascade = CascadeType.MERGE)
        private User addressbookUser;
 
-       /**
-        * Last locked timestamp
-        */
-       @Temporal (TemporalType.TIMESTAMP)
-       @Column (name = "addressbook_last_locked")
-       private Calendar addressbookLastLocked;
-
-       /**
-        * Last locked timestamp
-        */
-       @Lob
-       @Column (name = "addressbook_last_locked_reason")
-       private String addressbookLastLockedReason;
-
        /**
         * Public constructor with address book name
         * <p>
@@ -137,6 +137,38 @@ public class UserAddressbook implements Addressbook, Comparable<Addressbook> {
                this.addressbookStatus = AddressbokStatus.UNLOCKED;
        }
 
+       @Override
+       public int compareTo (final Addressbook addressbook) {
+               throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+       }
+
+       @Override
+       public boolean equals (final Object object) {
+               if (object == null) {
+                       return false;
+               } else if (this.getClass() != object.getClass()) {
+                       return false;
+               }
+
+               final Addressbook other = (Addressbook) object;
+
+               if (!Objects.equals(this.getAddressbookName(), other.getAddressbookName())) {
+                       return false;
+               } else if (!Objects.equals(this.getAddressbookUser(), other.getAddressbookUser())) {
+                       return false;
+               }
+
+               return true;
+       }
+
+       @Override
+       public int hashCode () {
+               int hash = 7;
+               hash = 59 * hash + Objects.hashCode(this.getAddressbookName());
+               hash = 59 * hash + Objects.hashCode(this.getAddressbookUser());
+               return hash;
+       }
+
        @Override
        public Calendar getAddressbookCreated () {
                return this.addressbookCreated;
@@ -207,35 +239,4 @@ public class UserAddressbook implements Addressbook, Comparable<Addressbook> {
                this.addressbookUser = addressbookUser;
        }
 
-       @Override
-       public int compareTo (final Addressbook addressbook) {
-               throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-       }
-
-       @Override
-       public boolean equals (final Object object) {
-               if (object == null) {
-                       return false;
-               } else if (getClass() != object.getClass()) {
-                       return false;
-               }
-
-               final Addressbook other = (Addressbook) object;
-
-               if (!Objects.equals(this.getAddressbookName(), other.getAddressbookName())) {
-                       return false;
-               } else if (!Objects.equals(this.getAddressbookUser(), other.getAddressbookUser())) {
-                       return false;
-               }
-
-               return true;
-       }
-
-       @Override
-       public int hashCode () {
-               int hash = 7;
-               hash = 59 * hash + Objects.hashCode(this.getAddressbookName());
-               hash = 59 * hash + Objects.hashCode(this.getAddressbookUser());
-               return hash;
-       }
 }