From b9a55f76d2fbd970f0b9460f07213703a2dcc5d2 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 23 Apr 2016 12:37:54 +0200 Subject: [PATCH] Continued rewriting: - added missing dependency jaddressbook-core - this project doesn't have sharing addressbooks, so methods are not implemented --- lib/jaddressbook-core.jar | Bin 0 -> 34086 bytes nbproject/build-impl.xml | 10 +++--- nbproject/genfiles.properties | 6 ++-- .../JobsAddressbookSessionBean.java | 33 ++++++++++++------ 4 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 lib/jaddressbook-core.jar diff --git a/lib/jaddressbook-core.jar b/lib/jaddressbook-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..ddd1e07fb502a3bdbf20a0e79c14e4980ed2732e GIT binary patch literal 34086 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 J;!`;2{{SukW+VUr literal 0 HcmV?d00001 diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 42539e6..889194b 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -879,11 +879,11 @@ exists or setup the property manually. For example like this: - - - - - + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index f58b6c4..f784d58 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=1e826b2b +build.xml.data.CRC32=09f25a4d build.xml.script.CRC32=9c0f08a9 build.xml.stylesheet.CRC32=5910fda3@1.55.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1e826b2b -nbproject/build-impl.xml.script.CRC32=4ae2c537 +nbproject/build-impl.xml.data.CRC32=09f25a4d +nbproject/build-impl.xml.script.CRC32=1d0ab521 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1 diff --git a/src/java/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBean.java b/src/java/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBean.java index f71bdd1..22c4a13 100644 --- a/src/java/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBean.java +++ b/src/java/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBean.java @@ -22,10 +22,13 @@ import java.util.List; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; +import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote; +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.UserAddressbook; +import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry; import org.mxchange.jcoreee.database.BaseDatabaseBean; -import org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException; -import org.mxchange.jjobs.exceptions.AddressbookNotFoundException; -import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry; import org.mxchange.jusercore.model.user.User; /** @@ -34,7 +37,7 @@ import org.mxchange.jusercore.model.user.User; * @author Roland Haeder */ @Stateless (name = "addressbook", mappedName = "ejb/stateless-jjobs-adr", description = "A stateless bean for handling JJobs addressbooks") -public class JobsAddressbookSessionBean extends BaseDatabaseBean implements JobsAddressbookSessionBeanRemote { +public class JobsAddressbookSessionBean extends BaseDatabaseBean implements AddressbookSessionBeanRemote { /** * Serial number @@ -50,22 +53,22 @@ public class JobsAddressbookSessionBean extends BaseDatabaseBean implements Jobs // Validate parameter if (null == addressbook) { // Throw NPE - throw new NullPointerException("addressbook is null"); + throw new NullPointerException("addressbook is null"); //NOI18N } else if (addressbook.getAddressbookId() == null) { // Throw NPE again - throw new NullPointerException("addressbook.addressbookId is null"); + 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())); + throw new IllegalArgumentException(MessageFormat.format("addressbook.addressbookId={0} is invalid.", addressbook.getAddressbookId())); //NOI18N } else if (addressbook.getAddressbookUser() == null) { // Throw again NPE - throw new NullPointerException("addressbook.addressbookUser is null"); + throw new NullPointerException("addressbook.addressbookUser is null"); //NOI18N } else if (addressbook.getAddressbookUser().getUserId() == null) { // Throw again NPE - throw new NullPointerException("addressbook.addressbookUser.userId is null"); + throw new NullPointerException("addressbook.addressbookUser.userId is null"); //NOI18N } else if (addressbook.getAddressbookUser().getUserId() < 1) { // Invalid id number again - throw new IllegalArgumentException(MessageFormat.format("addressbook.addressbookUser.userId={0} is invalid", addressbook.getAddressbookUser().getUserId())); + throw new IllegalArgumentException(MessageFormat.format("addressbook.addressbookUser.userId={0} is invalid", addressbook.getAddressbookUser().getUserId())); //NOI18N } // Generate query @@ -79,6 +82,16 @@ public class JobsAddressbookSessionBean extends BaseDatabaseBean implements Jobs return query.getResultList(); } + @Override + public List allUsersNotSharing (final User user, final Addressbook addressbook) { + throw new UnsupportedOperationException("JJobs don't have addressbok sharing (maybe yet?)"); //NOI18N + } + + @Override + public Integer countAllUserSharedAddressbooks (final User user) { + throw new UnsupportedOperationException("JJobs don't have addressbok sharing (maybe yet?)"); //NOI18N + } + @Override public Addressbook createAddressbook (final Addressbook addressbook) throws AddressbookNameAlreadyUsedException { // Is it not null? -- 2.39.5