Fixed depdency loop (opps):

- jphone-core cannot depend on jcontacts-core as it depends on the other already

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
deleted file mode 100644 (file)
index bbb86d3..0000000
Binary files a/lib/jcontacts-core.jar and /dev/null differ

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 6cfc755c990eb99ebc5b2f89b9eaa640941f6582..b340cb243c1f0931f69834803852273e587a375b 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,7 +30,6 @@ dist.jar=${dist.dir}/jphone-core.jar
 dist.javadoc.dir=${dist.dir}/javadoc\r
 endorsed.classpath=\r
 excludes=\r
-file.reference.jcontacts-core.jar=lib/jcontacts-core.jar\r
 file.reference.jcoreee.jar=lib/jcoreee.jar\r
 file.reference.jcountry-core.jar=lib/jcountry-core.jar\r
 includes=**\r
@@ -40,7 +39,6 @@ jar.index=${jnlp.enabled}
 javac.classpath=\\r
     ${file.reference.jcoreee.jar}:\\r
     ${file.reference.jcountry-core.jar}:\\r
-    ${file.reference.jcontacts-core.jar}:\\r
     ${libs.jpa20-persistence.classpath}:\\r
     ${libs.javaee-api-7.0.classpath}\r
 # Space-separated list of extra javac options\r
@@ -95,7 +93,6 @@ run.test.classpath=\
     ${javac.test.classpath}:\\r
     ${build.test.classes.dir}\r
 source.encoding=UTF-8\r
-source.reference.jcontacts-core.jar=../jcontacts-core/src/\r
 source.reference.jcoreee.jar=../jcoreee/src/\r
 source.reference.jcountry-core.jar=../jcountry-core/src/\r
 src.dir=src\r

diff --git a/src/org/mxchange/jphone/events/cellphone/unlinked/AdminCellphoneNumberUnlinkedEvent.java b/src/org/mxchange/jphone/events/cellphone/unlinked/AdminCellphoneNumberUnlinkedEvent.java
deleted file mode 100644 (file)
index 4dcf33b..0000000
--- a/src/org/mxchange/jphone/events/cellphone/unlinked/AdminCellphoneNumberUnlinkedEvent.java
+++ /dev/null
@@ -1,66 +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.jphone.events.cellphone.unlinked;
-
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
-
-/**
- * An event when a cell phone number has been updated
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class AdminCellphoneNumberUnlinkedEvent implements AdminUnlinkedCellphoneNumberEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 18_521_758_718_691_064L;
-
-       /**
-        * Contact instance
-        */
-       private final Contact contact;
-
-       /**
-        * Unlinked mobile provider instance
-        */
-       private final DialableCellphoneNumber unlinkedCellphoneNumber;
-
-       /**
-        * Constructor with unlinked cell phone number
-        * <p>
-        * @param contact Contact with linked cell phone instance
-        * @param unlinkedCellphoneNumber Unlinked cell phone number
-        */
-       public AdminCellphoneNumberUnlinkedEvent (final Contact contact, final DialableCellphoneNumber unlinkedCellphoneNumber) {
-               // Set it here
-               this.contact = contact;
-               this.unlinkedCellphoneNumber = unlinkedCellphoneNumber;
-       }
-
-       @Override
-       public Contact getContact () {
-               return this.contact;
-       }
-
-       @Override
-       public DialableCellphoneNumber getUnlinkedCellphoneNumber () {
-               return this.unlinkedCellphoneNumber;
-       }
-
-}

diff --git a/src/org/mxchange/jphone/events/cellphone/unlinked/AdminUnlinkedCellphoneNumberEvent.java b/src/org/mxchange/jphone/events/cellphone/unlinked/AdminUnlinkedCellphoneNumberEvent.java
deleted file mode 100644 (file)
index d76b28d..0000000
--- a/src/org/mxchange/jphone/events/cellphone/unlinked/AdminUnlinkedCellphoneNumberEvent.java
+++ /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.jphone.events.cellphone.unlinked;
-
-import java.io.Serializable;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
-
-/**
- * An interface for an event when a cell phone number has been updated
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface AdminUnlinkedCellphoneNumberEvent extends Serializable {
-
-       /**
-        * Getter for updated cell phone numbers
-        * <p>
-        * @return Updated cell phone numbers
-        */
-       DialableCellphoneNumber getUnlinkedCellphoneNumber ();
-
-       /**
-        * Getter for contact instance
-        * <p>
-        * @return Contact instance
-        */
-       Contact getContact ();
-
-}