]> git.mxchange.org Git - addressbook-lib.git/commitdiff
Refacture:
authorRoland Häder <roland@mxchange.org>
Tue, 19 Apr 2016 14:29:28 +0000 (16:29 +0200)
committerRoland Häder <roland@mxchange.org>
Tue, 19 Apr 2016 14:29:28 +0000 (16:29 +0200)
- moved model (entities) files to jaddressbook-care
- added new dependency jaddressbook-core.jar

21 files changed:
lib/jaddressbook-core.jar [new file with mode: 0644]
nbproject/project.properties
src/org/mxchange/addressbook/events/addressbook/AddressbookLoadedEvent.java [deleted file]
src/org/mxchange/addressbook/events/addressbook/LoadedAddressbookEvent.java [deleted file]
src/org/mxchange/addressbook/events/sharing/AddressbookSharingEvent.java [deleted file]
src/org/mxchange/addressbook/events/sharing/EndedAddressbookSharingEvent.java [deleted file]
src/org/mxchange/addressbook/events/sharing/StartedAddressbookSharingEvent.java [deleted file]
src/org/mxchange/addressbook/events/sharing/type/SharingType.java [deleted file]
src/org/mxchange/addressbook/exceptions/AddressbookNameAlreadyUsedException.java [deleted file]
src/org/mxchange/addressbook/exceptions/AddressbookNotFoundException.java [deleted file]
src/org/mxchange/addressbook/exceptions/UserAlreadySharingAddressbookException.java [deleted file]
src/org/mxchange/addressbook/model/addressbook/Addressbook.java [deleted file]
src/org/mxchange/addressbook/model/addressbook/AddressbookSessionBeanRemote.java
src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java [deleted file]
src/org/mxchange/addressbook/model/addressbook/entry/AddressbookEntry.java [deleted file]
src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java [deleted file]
src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java [deleted file]
src/org/mxchange/addressbook/model/addressbook/shared/ShareableAddressbook.java [deleted file]
src/org/mxchange/addressbook/model/addressbook/status/AddressbokStatus.java [deleted file]
src/org/mxchange/addressbook/model/shared/SharedAddressbooksSessionBeanRemote.java
src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java

diff --git a/lib/jaddressbook-core.jar b/lib/jaddressbook-core.jar
new file mode 100644 (file)
index 0000000..658c2f7
Binary files /dev/null and b/lib/jaddressbook-core.jar differ
index db1defaba11380a41dd3acc27088a5f38ccc9ae5..b9bf42d9cfe7c3c213168d3df5eda56f0bd90ec6 100644 (file)
-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=addressbook-lib
-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}/addressbook-lib.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
-file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
-file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
-file.reference.jcore-swing.jar=lib/jcore-swing.jar
-file.reference.jcore.jar=lib/jcore.jar
-file.reference.jcoreee.jar=lib/jcoreee.jar
-file.reference.jcountry-core.jar=lib/jcountry-core.jar
-file.reference.jphone-core.jar=lib/jphone-core.jar
-file.reference.juser-core.jar=lib\\juser-core.jar
-file.reference.juser-lib.jar=lib/juser-lib.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.jcore.jar}:\
-    ${file.reference.jcoreee.jar}:\
-    ${file.reference.jcore-swing.jar}:\
-    ${file.reference.jcore-logger-lib.jar}:\
-    ${file.reference.jcountry-core.jar}:\
-    ${file.reference.jphone-core.jar}:\
-    ${file.reference.jcontacts-core.jar}:\
-    ${file.reference.jcontacts-business-core.jar}:\
-    ${file.reference.juser-core.jar}:\
-    ${file.reference.juser-lib.jar}:\
-    ${libs.javaee-api-7.0.classpath}:\
-    ${libs.jpa20-persistence.classpath}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
-javac.deprecation=true
-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=Addressbook 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=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.license=gpl30
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
-source.reference.jcontacts-core.jar=../jcontacts-core/src/
-source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
-source.reference.jcore-swing.jar=../jcore-swing/src
-source.reference.jcore.jar=../jcore/src
-source.reference.jcoreee.jar=../jcoreee/src/
-source.reference.jcountry-core.jar=../jcountry-core/src/
-source.reference.jphone-core.jar=../jphone-core/src/
-source.reference.juser-core.jar=../juser-core/src/
-source.reference.juser-lib.jar=../juser-lib/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=addressbook-lib\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}/addressbook-lib.jar\r
+dist.javadoc.dir=${dist.dir}/javadoc\r
+endorsed.classpath=\r
+excludes=\r
+file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar\r
+file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar\r
+file.reference.jcontacts-core.jar=lib/jcontacts-core.jar\r
+file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar\r
+file.reference.jcore-swing.jar=lib/jcore-swing.jar\r
+file.reference.jcore.jar=lib/jcore.jar\r
+file.reference.jcoreee.jar=lib/jcoreee.jar\r
+file.reference.jcountry-core.jar=lib/jcountry-core.jar\r
+file.reference.jphone-core.jar=lib/jphone-core.jar\r
+file.reference.juser-core.jar=lib\\juser-core.jar\r
+file.reference.juser-lib.jar=lib/juser-lib.jar\r
+includes=**\r
+jar.archive.disabled=${jnlp.enabled}\r
+jar.compress=false\r
+jar.index=${jnlp.enabled}\r
+javac.classpath=\\r
+    ${file.reference.jcore.jar}:\\r
+    ${file.reference.jcoreee.jar}:\\r
+    ${file.reference.jcore-swing.jar}:\\r
+    ${file.reference.jcore-logger-lib.jar}:\\r
+    ${file.reference.jcountry-core.jar}:\\r
+    ${file.reference.jphone-core.jar}:\\r
+    ${file.reference.jcontacts-core.jar}:\\r
+    ${file.reference.jcontacts-business-core.jar}:\\r
+    ${file.reference.juser-core.jar}:\\r
+    ${file.reference.juser-lib.jar}:\\r
+    ${file.reference.jaddressbook-core.jar}:\\r
+    ${libs.javaee-api-7.0.classpath}:\\r
+    ${libs.jpa20-persistence.classpath}\r
+# Space-separated list of extra javac options\r
+javac.compilerargs=-Xlint:deprecation -Xlint:unchecked\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=Addressbook 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
+manifest.file=manifest.mf\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
+run.test.classpath=\\r
+    ${javac.test.classpath}:\\r
+    ${build.test.classes.dir}\r
+source.encoding=UTF-8\r
+source.reference.jaddressbook-core.jar=../jaddressbook-core/src/\r
+source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/\r
+source.reference.jcontacts-core.jar=../jcontacts-core/src/\r
+source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/\r
+source.reference.jcore-swing.jar=../jcore-swing/src\r
+source.reference.jcore.jar=../jcore/src\r
+source.reference.jcoreee.jar=../jcoreee/src/\r
+source.reference.jcountry-core.jar=../jcountry-core/src/\r
+source.reference.jphone-core.jar=../jphone-core/src/\r
+source.reference.juser-core.jar=../juser-core/src/\r
+source.reference.juser-lib.jar=../juser-lib/src/\r
+src.dir=src\r
+test.src.dir=test\r
diff --git a/src/org/mxchange/addressbook/events/addressbook/AddressbookLoadedEvent.java b/src/org/mxchange/addressbook/events/addressbook/AddressbookLoadedEvent.java
deleted file mode 100644 (file)
index 655760d..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.events.addressbook;
-
-import java.io.Serializable;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-
-/**
- * An interface for an event if an address book has been loaded
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface AddressbookLoadedEvent extends Serializable {
-
-       /**
-        * Getter for address book instance
-        * <p>
-        * @return Address book instance
-        */
-       Addressbook getAddressbook ();
-}
diff --git a/src/org/mxchange/addressbook/events/addressbook/LoadedAddressbookEvent.java b/src/org/mxchange/addressbook/events/addressbook/LoadedAddressbookEvent.java
deleted file mode 100644 (file)
index 8ee3729..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.events.addressbook;
-
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-
-/**
- * An event fired when an address book has been loaded
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class LoadedAddressbookEvent implements AddressbookLoadedEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 1L;
-
-       /**
-        * Adress book instance causing this event
-        */
-       private final Addressbook addressbook;
-
-       /**
-        * Constructor with address book instance
-        * <p>
-        * @param addressbook Address book instance
-        */
-       public LoadedAddressbookEvent (final Addressbook addressbook) {
-               this.addressbook = addressbook;
-       }
-
-       @Override
-       public Addressbook getAddressbook () {
-               return this.addressbook;
-       }
-}
diff --git a/src/org/mxchange/addressbook/events/sharing/AddressbookSharingEvent.java b/src/org/mxchange/addressbook/events/sharing/AddressbookSharingEvent.java
deleted file mode 100644 (file)
index c539e98..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.events.sharing;
-
-import java.io.Serializable;
-import org.mxchange.addressbook.events.sharing.type.SharingType;
-import org.mxchange.addressbook.model.addressbook.shared.ShareableAddressbook;
-
-/**
- * An interface for address book sharing events
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface AddressbookSharingEvent extends Serializable {
-
-       /**
-        * Getter for address book share instance
-        * <p>
-        * @return Address book share instance
-        */
-       ShareableAddressbook getShareableAddressbook ();
-
-       /**
-        * Getter for sharing type enum
-        * <p>
-        * @return Sharing type enum
-        */
-       SharingType getSharingType ();
-}
diff --git a/src/org/mxchange/addressbook/events/sharing/EndedAddressbookSharingEvent.java b/src/org/mxchange/addressbook/events/sharing/EndedAddressbookSharingEvent.java
deleted file mode 100644 (file)
index 1116d81..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.events.sharing;
-
-import org.mxchange.addressbook.events.sharing.type.SharingType;
-import org.mxchange.addressbook.model.addressbook.shared.ShareableAddressbook;
-
-/**
- * An event fired when a user ends sharing address books
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class EndedAddressbookSharingEvent implements AddressbookSharingEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 152_896_748_186_018_497L;
-
-       /**
-        * Shared address book entry
-        */
-       private final ShareableAddressbook shareableAddressbook;
-
-       /**
-        * Constructor with address book share entry
-        * <p>
-        * @param share Address book share entry
-        */
-       public EndedAddressbookSharingEvent (final ShareableAddressbook share) {
-               this.shareableAddressbook = share;
-       }
-
-       @Override
-       public ShareableAddressbook getShareableAddressbook () {
-               return this.shareableAddressbook;
-       }
-
-       @Override
-       public SharingType getSharingType () {
-               // Started sharing
-               return SharingType.ENDED;
-       }
-}
diff --git a/src/org/mxchange/addressbook/events/sharing/StartedAddressbookSharingEvent.java b/src/org/mxchange/addressbook/events/sharing/StartedAddressbookSharingEvent.java
deleted file mode 100644 (file)
index 36e0d4f..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.events.sharing;
-
-import org.mxchange.addressbook.events.sharing.type.SharingType;
-import org.mxchange.addressbook.model.addressbook.shared.ShareableAddressbook;
-
-/**
- * An event fired when a user starts sharing address books
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class StartedAddressbookSharingEvent implements AddressbookSharingEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 152_896_748_186_018_497L;
-
-       /**
-        * Shared address book entry
-        */
-       private final ShareableAddressbook shareableAddressbook;
-
-       /**
-        * Constructor with address book share entry
-        * <p>
-        * @param share Address book share entry
-        */
-       public StartedAddressbookSharingEvent (final ShareableAddressbook share) {
-               this.shareableAddressbook = share;
-       }
-
-       @Override
-       public ShareableAddressbook getShareableAddressbook () {
-               return this.shareableAddressbook;
-       }
-
-       @Override
-       public SharingType getSharingType () {
-               // Started sharing
-               return SharingType.STARTED;
-       }
-}
diff --git a/src/org/mxchange/addressbook/events/sharing/type/SharingType.java b/src/org/mxchange/addressbook/events/sharing/type/SharingType.java
deleted file mode 100644 (file)
index c924ae4..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.events.sharing.type;
-
-/**
- * An enumeration for sharing types
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public enum SharingType {
-
-       /**
-        * Sharing has been started
-        */
-       STARTED,
-
-       /**
-        * Sharing has been ended
-        */
-       ENDED;
-
-}
diff --git a/src/org/mxchange/addressbook/exceptions/AddressbookNameAlreadyUsedException.java b/src/org/mxchange/addressbook/exceptions/AddressbookNameAlreadyUsedException.java
deleted file mode 100644 (file)
index da12890..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-
-/**
- * An exception thrown when the user has already used the name.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class AddressbookNameAlreadyUsedException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 58_169_748_928_767_381L;
-
-       /**
-        * Constructor with address book instance
-        * <p>
-        * @param addressbook Address book instance
-        */
-       public AddressbookNameAlreadyUsedException (final Addressbook addressbook) {
-               super(MessageFormat.format("User {0} has already used the name {1}.", addressbook.getAddressbookUser(), addressbook.getAddressbookName())); //NOI18N
-       }
-
-}
diff --git a/src/org/mxchange/addressbook/exceptions/AddressbookNotFoundException.java b/src/org/mxchange/addressbook/exceptions/AddressbookNotFoundException.java
deleted file mode 100644 (file)
index e17dc15..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.exceptions;
-
-import java.text.MessageFormat;
-
-/**
- * An exception thrown when the address book's id number is not valid, so no
- * address book can be found.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class AddressbookNotFoundException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 14_986_976_417_658_920L;
-
-       /**
-        * Creates an exception with given id number that could not be found.
-        * <p>
-        * @param addressbookId Address book id number
-        */
-       public AddressbookNotFoundException (final Long addressbookId) {
-               super(MessageFormat.format("Address book with id number {0} does not exist.", addressbookId));
-       }
-
-}
diff --git a/src/org/mxchange/addressbook/exceptions/UserAlreadySharingAddressbookException.java b/src/org/mxchange/addressbook/exceptions/UserAlreadySharingAddressbookException.java
deleted file mode 100644 (file)
index a6e0d48..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown whent the address book is already shared with given user
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserAlreadySharingAddressbookException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 58_528_177_571_976_034L;
-
-       /**
-        * Constructor with address book being already shared with sharee
-        * <p>
-        * @param addressbook Address book instance
-        * @param sharee User instance the address book is being shared with
-        */
-       public UserAlreadySharingAddressbookException (final Addressbook addressbook, final User sharee) {
-               super(MessageFormat.format("Address book id {0} owned by user {1} is already shared with user {2}", addressbook.getAddressbookId(), addressbook.getAddressbookUser().getUserId(), sharee.getUserId()));
-       }
-}
diff --git a/src/org/mxchange/addressbook/model/addressbook/Addressbook.java b/src/org/mxchange/addressbook/model/addressbook/Addressbook.java
deleted file mode 100644 (file)
index d4d4640..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.addressbook;
-
-import java.io.Serializable;
-import java.util.Calendar;
-import org.mxchange.addressbook.model.addressbook.status.AddressbokStatus;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A POJI for addressbooks
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface Addressbook extends Serializable {
-
-       /**
-        * Getter for id number
-        * <p>
-        * @return Id number
-        */
-       Long getAddressbookId ();
-
-       /**
-        * Setter for id number
-        * <p>
-        * @param addressbookId Id number
-        */
-       void setAddressbookId (final Long addressbookId);
-
-       /**
-        * Getter for addressbook creation timestamp
-        * <p>
-        * @return Addressbook creation timestamp
-        */
-       Calendar getAddressbookCreated ();
-
-       /**
-        * Setter for addressbook creation timestamp
-        * <p>
-        * @param addressbookCreated Addressbook creation timestamp
-        */
-       void setAddressbookCreated (final Calendar addressbookCreated);
-
-       /**
-        * Getter for addressbook's name
-        * <p>
-        * @return Addressbook's name
-        */
-       String getAddressbookName ();
-
-       /**
-        * Setter for addressbook's name
-        * <p>
-        * @param addressbookName Addressbook's name
-        */
-       void setAddressbookName (final String addressbookName);
-
-       /**
-        * Getter for addressbook status
-        * <p>
-        * @return Addressbook status
-        */
-       AddressbokStatus getAddressbookStatus ();
-
-       /**
-        * Setter for addressbook status
-        * <p>
-        * @param addressbookStatus Addressbook status
-        */
-       void setAddressbookStatus (final AddressbokStatus addressbookStatus);
-
-       /**
-        * Getter for addressbook's user (owner)
-        * <p>
-        * @return Addressbook's user (owner)
-        */
-       User getAddressbookUser ();
-
-       /**
-        * Setter for addressbook's user (owner)
-        * <p>
-        * @param addressbookUser Addressbook's user (owner)
-        */
-       void setAddressbookUser (final User addressbookUser);
-
-       /**
-        * Getter for last locked timestamp
-        * <p>
-        * @return Last locked timestamp
-        */
-       Calendar getAddressbookLastLocked ();
-
-       /**
-        * Setter for last locked timestamp
-        * <p>
-        * @param addressbookLastLocked Last locked timestamp
-        */
-       void setAddressbookLastLocked (final Calendar addressbookLastLocked);
-
-       /**
-        * Getter for last locked reason
-        * <p>
-        * @return Last locked reason
-        */
-       String getAddressbookLastLockedReason ();
-
-       /**
-        * Getter for last locked reason
-        * <p>
-        * @param addressbookLastLockedReason Last locked reason
-        */
-       void setAddressbookLastLockedReason (final String addressbookLastLockedReason);
-
-       @Override
-       boolean equals (final Object object);
-
-       @Override
-       int hashCode ();
-}
index 1d2756399af66554d5a8f8c5b12813abbd9006b6..bfc99a4137ad7ba4c7f41f30cc36c9de9040350c 100644 (file)
@@ -19,9 +19,10 @@ package org.mxchange.addressbook.model.addressbook;
 import java.io.Serializable;
 import java.util.List;
 import javax.ejb.Remote;
-import org.mxchange.addressbook.exceptions.AddressbookNameAlreadyUsedException;
-import org.mxchange.addressbook.exceptions.AddressbookNotFoundException;
-import org.mxchange.addressbook.model.addressbook.entry.AddressbookEntry;
+import org.mxchange.jaddressbookcore.exceptions.AddressbookNameAlreadyUsedException;
+import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException;
+import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
+import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry;
 import org.mxchange.jusercore.model.user.User;
 
 /**
@@ -60,7 +61,7 @@ public interface AddressbookSessionBeanRemote extends Serializable {
         * <p>
         * @return Address book instance
         * <p>
-        * @throws org.mxchange.addressbook.exceptions.AddressbookNotFoundException
+        * @throws org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException
         * If the address book cannot be found by given id number
         * @throws NullPointerException If addressbookId is null
         * @throws IllegalArgumentException If the id number is below 1
@@ -95,7 +96,7 @@ public interface AddressbookSessionBeanRemote extends Serializable {
         * @return Updated address book instance
         * <p>
         * @throws
-        * org.mxchange.addressbook.exceptions.AddressbookNameAlreadyUsedException
+        * org.mxchange.jaddressbookcore.exceptions.AddressbookNameAlreadyUsedException
         * If the address book's name has already been used by the user.
         */
        Addressbook createAddressbook (final Addressbook addressbook) throws AddressbookNameAlreadyUsedException;
diff --git a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
deleted file mode 100644 (file)
index ce02a36..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.addressbook;
-
-import java.util.Calendar;
-import java.util.Objects;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import org.mxchange.addressbook.model.addressbook.status.AddressbokStatus;
-import org.mxchange.jusercore.model.user.LoginUser;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A POJO for user addressbooks
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Entity (name = "addressbooks")
-@Table (name = "addressbooks")
-@NamedQueries (
-               {
-                       @NamedQuery (name = "AllUsersAddressbooks", query = "SELECT a FROM addressbooks AS a WHERE a.addressbookUser = :param ORDER BY a.addressbookId ASC"),
-                       @NamedQuery (name = "SearchUserAddressbookName", query = "SELECT a FROM addressbooks AS a WHERE a.addressbookUser = :user AND LOWER(a.addressbookName) LIKE LOWER(:name)"),
-                       @NamedQuery (name = "SearchAddressbookById", query = "SELECT a FROM addressbooks AS a WHERE a.addressbookId = :id")
-               }
-)
-public class UserAddressbook implements Addressbook {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 176_573_148_678_169L;
-
-       /**
-        * When this address book has been created
-        */
-       @Basic (optional = false)
-       @Temporal (value = TemporalType.TIMESTAMP)
-       @Column (name = "addressbook_created", nullable = false, updatable = false)
-       private Calendar addressbookCreated;
-
-       /**
-        * Id number
-        */
-       @Id
-       @GeneratedValue (strategy = GenerationType.IDENTITY)
-       @Column (name = "addressbook_id", 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
-        */
-       @Basic (optional = false)
-       @Column (name = "addressbook_name", length = 50, nullable = false)
-       private String addressbookName;
-
-       /**
-        * Adress book status
-        */
-       @Basic (optional = false)
-       @Enumerated (EnumType.STRING)
-       @Column (name = "addressbook_status", nullable = false, length = 10)
-       private AddressbokStatus addressbookStatus;
-
-       /**
-        * Connection to "users" table
-        */
-       @JoinColumn (name = "addressbook_user_id", nullable = false)
-       @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false)
-       private User addressbookUser;
-
-       /**
-        * Public constructor with address book name
-        * <p>
-        * @param addressbookName Address book name
-        * @param addressbookUser User instance
-        */
-       public UserAddressbook (final String addressbookName, final User addressbookUser) {
-               // Call default constructor
-               this();
-
-               // Set name, user instance
-               this.addressbookName = addressbookName;
-               this.addressbookUser = addressbookUser;
-       }
-
-       /**
-        * Default constructor
-        */
-       public UserAddressbook () {
-               // Set status to UNLOCKED
-               this.addressbookStatus = AddressbokStatus.UNLOCKED;
-       }
-
-       @Override
-       public boolean equals (final Object object) {
-               if (this == object) {
-                       return true;
-               } else if (null == object) {
-                       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;
-       }
-
-       @Override
-       public void setAddressbookCreated (final Calendar addressbookCreated) {
-               this.addressbookCreated = addressbookCreated;
-       }
-
-       @Override
-       public Long getAddressbookId () {
-               return this.addressbookId;
-       }
-
-       @Override
-       public void setAddressbookId (final Long addressbookId) {
-               this.addressbookId = addressbookId;
-       }
-
-       @Override
-       public Calendar getAddressbookLastLocked () {
-               return this.addressbookLastLocked;
-       }
-
-       @Override
-       public void setAddressbookLastLocked (final Calendar addressbookLastLocked) {
-               this.addressbookLastLocked = addressbookLastLocked;
-       }
-
-       @Override
-       public String getAddressbookLastLockedReason () {
-               return this.addressbookLastLockedReason;
-       }
-
-       @Override
-       public void setAddressbookLastLockedReason (final String addressbookLastLockedReason) {
-               this.addressbookLastLockedReason = addressbookLastLockedReason;
-       }
-
-       @Override
-       public String getAddressbookName () {
-               return this.addressbookName;
-       }
-
-       @Override
-       public void setAddressbookName (final String addressbookName) {
-               this.addressbookName = addressbookName;
-       }
-
-       @Override
-       public AddressbokStatus getAddressbookStatus () {
-               return this.addressbookStatus;
-       }
-
-       @Override
-       public void setAddressbookStatus (final AddressbokStatus addressbookStatus) {
-               this.addressbookStatus = addressbookStatus;
-       }
-
-       @Override
-       public User getAddressbookUser () {
-               return this.addressbookUser;
-       }
-
-       @Override
-       public void setAddressbookUser (final User addressbookUser) {
-               this.addressbookUser = addressbookUser;
-       }
-
-}
diff --git a/src/org/mxchange/addressbook/model/addressbook/entry/AddressbookEntry.java b/src/org/mxchange/addressbook/model/addressbook/entry/AddressbookEntry.java
deleted file mode 100644 (file)
index 1b0898b..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.addressbook.entry;
-
-import java.io.Serializable;
-import java.util.Calendar;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontactsbusiness.BusinessContact;
-
-/**
- * A POJI for addressbook entries
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface AddressbookEntry extends Serializable {
-
-       /**
-        * Getter for id number
-        * <p>
-        * @return Id number
-        */
-       Long getAddressbookEntryId ();
-
-       /**
-        * Setter for id number
-        * <p>
-        * @param addressbookEntryId Id number
-        */
-       void setAddressbookEntryId (final Long addressbookEntryId);
-
-       /**
-        * Getter for business contact
-        * <p>
-        * @return Business contact
-        */
-       BusinessContact getAddressbookEntryBusinessContact ();
-
-       /**
-        * Setter for business contact
-        * <p>
-        * @param addressbookEntryBusinessContact Business contact
-        */
-       void setAddressbookEntryBusinessContact (final BusinessContact addressbookEntryBusinessContact);
-
-       /**
-        * Getter for entry created timestamp
-        * <p>
-        * @return Entry created timestamp
-        */
-       Calendar getAddressbookEntryCreated ();
-
-       /**
-        * Setter for entry created timestamp
-        * <p>
-        * @param addressbookEntryCreated Entry created timestamp
-        */
-       void setAddressbookEntryCreated (final Calendar addressbookEntryCreated);
-
-       /**
-        * Getter for private contact
-        * <p>
-        * @return Private contact
-        */
-       Contact getAddressbookEntryPrivateContact ();
-
-       /**
-        * Setter for private contact
-        * <p>
-        * @param addressbookEntryPrivateContact Private contact
-        */
-       void setAddressbookEntryPrivateContact (final Contact addressbookEntryPrivateContact);
-
-       /**
-        * Getter for address book
-        * <p>
-        * @return Address book
-        */
-       Addressbook getAddressbookId ();
-
-       /**
-        * Setter for address book
-        * <p>
-        * @param addressbookId Address book
-        */
-       void setAddressbookId (final Addressbook addressbookId);
-
-       @Override
-       boolean equals (final Object object);
-
-       @Override
-       int hashCode ();
-}
diff --git a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
deleted file mode 100644 (file)
index 8af65ce..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.addressbook.entry;
-
-import java.util.Calendar;
-import java.util.Objects;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.addressbook.model.addressbook.UserAddressbook;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.contact.UserContact;
-import org.mxchange.jcontactsbusiness.BusinessContact;
-import org.mxchange.jcontactsbusiness.CompanyContact;
-
-/**
- * A POJO for address book entries
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Entity (name = "addressbook_entries")
-@Table (name = "addressbook_entries")
-@NamedQueries (
-               @NamedQuery (
-                               name = "SearchUsersAddressbookEntries",
-                               query = "SELECT e FROM addressbook_entries AS e INNER JOIN addressbooks AS a ON e.addressbookId = a WHERE e.addressbookId = :addressbook AND a.addressbookUser = :owner ORDER BY e.addressbookEntryId ASC")
-)
-public class UserAddressbookEntry implements AddressbookEntry {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 178_581_768_581_960L;
-
-       /**
-        * Connection to table "business_contacts" (commercial contacts)
-        */
-       @JoinColumn (name = "entry_business_contact_id", updatable = false)
-       @OneToOne (targetEntity = CompanyContact.class, cascade = CascadeType.REFRESH)
-       private BusinessContact addressbookEntryBusinessContact;
-
-       /**
-        * When this address book entry has been created
-        */
-       @Basic (optional = false)
-       @Temporal (TemporalType.TIMESTAMP)
-       @Column (name = "entry_created", nullable = false, updatable = false)
-       private Calendar addressbookEntryCreated;
-
-       /**
-        * Id number
-        */
-       @Id
-       @GeneratedValue (strategy = GenerationType.IDENTITY)
-       @Column (name = "entry_id", nullable = false, updatable = false)
-       private Long addressbookEntryId;
-
-       /**
-        * Connection to table "contacts" (private contacts)
-        */
-       @JoinColumn (name = "entry_private_contact_id", updatable = false)
-       @OneToOne (targetEntity = UserContact.class, cascade = CascadeType.REFRESH)
-       private Contact addressbookEntryPrivateContact;
-
-       /**
-        * Connection to table "addressbooks"
-        */
-       @JoinColumn (name = "entry_addressbook_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = UserAddressbook.class, cascade = CascadeType.REFRESH, optional = false)
-       private Addressbook addressbookId;
-
-       @Override
-       public boolean equals (final Object object) {
-               if (null == object) {
-                       return false;
-               } else if (this.getClass() != object.getClass()) {
-                       return false;
-               }
-
-               final AddressbookEntry other = (AddressbookEntry) object;
-
-               if (!Objects.equals(this.getAddressbookEntryBusinessContact(), other.getAddressbookEntryBusinessContact())) {
-                       return false;
-               } else if (!Objects.equals(this.getAddressbookEntryPrivateContact(), other.getAddressbookEntryPrivateContact())) {
-                       return false;
-               } else if (!Objects.equals(this.getAddressbookId(), other.getAddressbookId())) {
-                       return false;
-               }
-
-               return true;
-       }
-
-       @Override
-       public int hashCode () {
-               int hash = 3;
-               hash = 19 * hash + Objects.hashCode(this.getAddressbookEntryBusinessContact());
-               hash = 19 * hash + Objects.hashCode(this.getAddressbookEntryPrivateContact());
-               hash = 19 * hash + Objects.hashCode(this.getAddressbookId());
-               return hash;
-       }
-
-       @Override
-       public BusinessContact getAddressbookEntryBusinessContact () {
-               return this.addressbookEntryBusinessContact;
-       }
-
-       @Override
-       public void setAddressbookEntryBusinessContact (final BusinessContact addressbookEntryBusinessContact) {
-               this.addressbookEntryBusinessContact = addressbookEntryBusinessContact;
-       }
-
-       @Override
-       public Calendar getAddressbookEntryCreated () {
-               return this.addressbookEntryCreated;
-       }
-
-       @Override
-       public void setAddressbookEntryCreated (final Calendar addressbookEntryCreated) {
-               this.addressbookEntryCreated = addressbookEntryCreated;
-       }
-
-       @Override
-       public Long getAddressbookEntryId () {
-               return this.addressbookEntryId;
-       }
-
-       @Override
-       public void setAddressbookEntryId (final Long addressbookEntryId) {
-               this.addressbookEntryId = addressbookEntryId;
-       }
-
-       @Override
-       public Contact getAddressbookEntryPrivateContact () {
-               return this.addressbookEntryPrivateContact;
-       }
-
-       @Override
-       public void setAddressbookEntryPrivateContact (final Contact addressbookEntryPrivateContact) {
-               this.addressbookEntryPrivateContact = addressbookEntryPrivateContact;
-       }
-
-       @Override
-       public Addressbook getAddressbookId () {
-               return this.addressbookId;
-       }
-
-       @Override
-       public void setAddressbookId (final Addressbook addressbookId) {
-               this.addressbookId = addressbookId;
-       }
-
-}
diff --git a/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java b/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
deleted file mode 100644 (file)
index 13dc9e4..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.addressbook.shared;
-
-import java.text.MessageFormat;
-import java.util.Calendar;
-import java.util.Objects;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.addressbook.model.addressbook.UserAddressbook;
-import org.mxchange.jusercore.model.user.LoginUser;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A POJO for sharing address books with other users
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Entity (name = "addressbook_shares")
-@Table (name = "addressbook_shares")
-@NamedQueries (
-               {
-                       @NamedQuery (
-                                       name = "SearchUserSharedAddressbooks",
-                                       query = "SELECT s FROM addressbook_shares AS s WHERE s.shareUserOwner = :user ORDER BY s.shareId ASC"
-                       ),
-                       @NamedQuery (
-                                       name = "SearchShareeAddressbookShare",
-                                       query = "SELECT s FROM addressbook_shares AS s WHERE s.shareAddressbook = :addressbook AND s.shareUserSharee = :sharee"
-                       )
-               }
-)
-public class AddressbookShare implements ShareableAddressbook {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 167_889_678_177_691_690L;
-
-       /**
-        * Address book this share is for
-        */
-       @JoinColumn (name = "share_addressbook_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = UserAddressbook.class, cascade = CascadeType.REFRESH, optional = false)
-       private Addressbook shareAddressbook;
-
-       /**
-        * When this share has been created
-        */
-       @Basic (optional = false)
-       @Temporal (TemporalType.TIMESTAMP)
-       @Column (name = "share_created", nullable = false, updatable = false)
-       private Calendar shareCreated;
-
-       /**
-        * Id number
-        */
-       @Id
-       @GeneratedValue (strategy = GenerationType.IDENTITY)
-       @Column (name = "share_id", nullable = false, updatable = false)
-       private Long shareId;
-
-       /**
-        * User who is owning the share
-        */
-       @JoinColumn (name = "share_owner_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false)
-       private User shareUserOwner;
-
-       /**
-        * User the address book is shared with
-        */
-       @JoinColumn (name = "share_sharee_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false)
-       private User shareUserSharee;
-
-       /**
-        * Default constructor
-        */
-       public AddressbookShare () {
-       }
-
-       /**
-        * Constructor with address book and sharee instance. Both parameters must
-        * not be null, their id numbers must be set and the adress book's user
-        * instance must be set and have a valid id set.
-        * <p>
-        * @param addressbook Address book instance
-        * @param sharee User sharee instance
-        */
-       public AddressbookShare (final Addressbook addressbook, final User sharee) {
-               // Call default constructor
-               this();
-
-               // Check all conditions
-               if (null == sharee) {
-                       // Throw NPE
-                       throw new NullPointerException("sharee is null"); //NOI18N
-               } else if (sharee.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("sharee.userId is null"); //NOI18N
-               } else if (sharee.getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalStateException(MessageFormat.format("sharee.userId={0} is invalid", sharee.getUserId())); //NOI18N
-               } else if (null == addressbook) {
-                       // Throw NPE again
-                       throw new NullPointerException("addressbook is null"); //NOI18N
-               } else if (addressbook.getAddressbookId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("addressbook.addressbookId is null"); //NOI18N
-               } else if (addressbook.getAddressbookId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("addressbook.addressbookId={0} is invalid.", addressbook.getAddressbookId())); //NOI18N
-               } else if (Objects.equals(addressbook.getAddressbookUser(), sharee)) {
-                       // Sharing with yourself!
-                       throw new IllegalStateException("User tries to share with himself."); //NOI18N
-               }
-
-               // Set all instances
-               this.shareAddressbook = addressbook;
-               this.shareUserOwner = addressbook.getAddressbookUser();
-               this.shareUserSharee = sharee;
-       }
-
-       @Override
-       public boolean equals (final Object object) {
-               if (null == object) {
-                       return false;
-               } else if (this.getClass() != object.getClass()) {
-                       return false;
-               }
-
-               final ShareableAddressbook other = (ShareableAddressbook) object;
-
-               if (!Objects.equals(this.getShareAddressbook(), other.getShareAddressbook())) {
-                       return false;
-               } else if (!Objects.equals(this.getShareUserOwner(), other.getShareUserOwner())) {
-                       return false;
-               } else if (!Objects.equals(this.getShareUserOwner(), other.getShareUserOwner())) {
-                       return false;
-               }
-
-               return Objects.equals(this.getShareUserSharee(), other.getShareUserSharee());
-       }
-
-       @Override
-       public int hashCode () {
-               int hash = 7;
-               hash = 19 * hash + Objects.hashCode(this.getShareAddressbook());
-               hash = 19 * hash + Objects.hashCode(this.getShareUserOwner());
-               hash = 19 * hash + Objects.hashCode(this.getShareUserSharee());
-               return hash;
-       }
-
-       @Override
-       public Addressbook getShareAddressbook () {
-               return this.shareAddressbook;
-       }
-
-       @Override
-       public void setShareAddressbook (final Addressbook shareAddressbook) {
-               this.shareAddressbook = shareAddressbook;
-       }
-
-       @Override
-       public Calendar getShareCreated () {
-               return this.shareCreated;
-       }
-
-       @Override
-       public void setShareCreated (final Calendar shareCreated) {
-               this.shareCreated = shareCreated;
-       }
-
-       @Override
-       public Long getShareId () {
-               return this.shareId;
-       }
-
-       @Override
-       public void setShareId (final Long shareId) {
-               this.shareId = shareId;
-       }
-
-       @Override
-       public User getShareUserOwner () {
-               return this.shareUserOwner;
-       }
-
-       @Override
-       public void setShareUserOwner (final User shareUserOwner) {
-               this.shareUserOwner = shareUserOwner;
-       }
-
-       @Override
-       public User getShareUserSharee () {
-               return this.shareUserSharee;
-       }
-
-       @Override
-       public void setShareUserSharee (final User shareUserSharee) {
-               this.shareUserSharee = shareUserSharee;
-       }
-
-}
diff --git a/src/org/mxchange/addressbook/model/addressbook/shared/ShareableAddressbook.java b/src/org/mxchange/addressbook/model/addressbook/shared/ShareableAddressbook.java
deleted file mode 100644 (file)
index 847d88d..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.addressbook.shared;
-
-import java.io.Serializable;
-import java.util.Calendar;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A POJI for shared address books
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface ShareableAddressbook extends Serializable {
-
-       /**
-        * Getter for shared address book instance
-        * <p>
-        * @return Shared address book instance
-        */
-       Addressbook getShareAddressbook ();
-
-       /**
-        * Setter for shared address book instance
-        * <p>
-        * @param shareAddressbook Shared address book instance
-        */
-       void setShareAddressbook (final Addressbook shareAddressbook);
-
-       /**
-        * Getter for id number
-        * <p>
-        * @return Id number
-        */
-       Long getShareId ();
-
-       /**
-        * Setter for id number
-        * <p>
-        * @param shareId Id number
-        */
-       void setShareId (final Long shareId);
-
-       /**
-        * Getter for address book owner instance
-        * <p>
-        * @return Address book owner instance
-        */
-       User getShareUserOwner ();
-
-       /**
-        * Setter for address book owner instance
-        * <p>
-        * @param shareUserOwner Address book owner instance
-        */
-       void setShareUserOwner (final User shareUserOwner);
-
-       /**
-        * Getter for address book sharee instance
-        * <p>
-        * @return Address book sharee instance
-        */
-       User getShareUserSharee ();
-
-       /**
-        * Setter for address book sharee instance
-        * <p>
-        * @param shareUserSharer Address book sharee instance
-        */
-       void setShareUserSharee (final User shareUserSharer);
-
-       /**
-        * Getter for share creation timestamp
-        * <p>
-        * @return Share creation timestamp
-        */
-       Calendar getShareCreated ();
-
-       /**
-        * Setter for share creation timestamp
-        * <p>
-        * @param shareCreated Share creation timestamp
-        */
-       void setShareCreated (final Calendar shareCreated);
-
-       @Override
-       boolean equals (final Object object);
-
-       @Override
-       int hashCode ();
-}
diff --git a/src/org/mxchange/addressbook/model/addressbook/status/AddressbokStatus.java b/src/org/mxchange/addressbook/model/addressbook/status/AddressbokStatus.java
deleted file mode 100644 (file)
index b53491f..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.addressbook.status;
-
-import java.io.Serializable;
-
-/**
- * An enumeration for the addressbook status
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public enum AddressbokStatus implements Serializable {
-
-       /**
-        * When the addressbook is unlocked
-        */
-       UNLOCKED("ADDRESSBOOK_STATUS_UNLOCKED"), //NOI18N
-
-       /**
-        * When the addressbook is locked by administrator
-        */
-       LOCKED("ADDRESSBOOK_STATUS_LOCKED"); //NOI18N
-
-       /**
-        * Message key
-        */
-       private final String messageKey;
-
-       /**
-        * Constructor
-        * <p>
-        * @param messageKey Message key for this enum
-        */
-       private AddressbokStatus (final String messageKey) {
-               this.messageKey = messageKey;
-       }
-
-       /**
-        * Getter for message key
-        * <p>
-        * @return Message key
-        */
-       public String getMessageKey () {
-               return this.messageKey;
-       }
-}
index af1a3607f2930a37be89de4fd320cde26a3cf404..c0e0bc088ca883408c43b10d90d703b8e03dc963 100644 (file)
@@ -19,9 +19,9 @@ package org.mxchange.addressbook.model.shared;
 import java.io.Serializable;
 import java.util.List;
 import javax.ejb.Remote;
-import org.mxchange.addressbook.exceptions.UserAlreadySharingAddressbookException;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.addressbook.model.addressbook.shared.ShareableAddressbook;
+import org.mxchange.jaddressbookcore.exceptions.UserAlreadySharingAddressbookException;
+import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
+import org.mxchange.jaddressbookcore.model.addressbook.shared.ShareableAddressbook;
 import org.mxchange.jusercore.model.user.User;
 
 /**
index d97d8ac62d74c91f26a97ef0fa52db95379794ba..8cc496adaff01db5a8f078de463ea7cd0f20ef0e 100644 (file)
@@ -25,9 +25,9 @@ import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.addressbook.exceptions.AddressbookNotFoundException;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
 import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote;
+import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException;
+import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
 import org.mxchange.jcoreee.validator.number.BaseLongValidator;
 import org.mxchange.jcoreeelogger.beans.local.logger.Log;
 import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;