From b03a5d05e802da507e41f86d63e7eb594a0d909d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 10 Aug 2016 17:53:00 +0200 Subject: [PATCH] Fixed depdency loop (opps): - jphone-core cannot depend on jcontacts-core as it depends on the other already --- lib/jcontacts-core.jar | Bin 32294 -> 0 bytes nbproject/project.properties | 3 - .../AdminCellphoneNumberUnlinkedEvent.java | 66 ------------------ .../AdminUnlinkedCellphoneNumberEvent.java | 44 ------------ 4 files changed, 113 deletions(-) delete mode 100644 lib/jcontacts-core.jar delete mode 100644 src/org/mxchange/jphone/events/cellphone/unlinked/AdminCellphoneNumberUnlinkedEvent.java delete mode 100644 src/org/mxchange/jphone/events/cellphone/unlinked/AdminUnlinkedCellphoneNumberEvent.java diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar deleted file mode 100644 index bbb86d3bc64f0068e59f8a9a6ceed3c7a18275fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32294 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 diff --git a/nbproject/project.properties b/nbproject/project.properties index 6cfc755..b340cb2 100644 --- 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 endorsed.classpath= excludes= -file.reference.jcontacts-core.jar=lib/jcontacts-core.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcountry-core.jar=lib/jcountry-core.jar includes=** @@ -40,7 +39,6 @@ jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.jcoreee.jar}:\ ${file.reference.jcountry-core.jar}:\ - ${file.reference.jcontacts-core.jar}:\ ${libs.jpa20-persistence.classpath}:\ ${libs.javaee-api-7.0.classpath} # Space-separated list of extra javac options @@ -95,7 +93,6 @@ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 -source.reference.jcontacts-core.jar=../jcontacts-core/src/ source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcountry-core.jar=../jcountry-core/src/ src.dir=src 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 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 . - */ -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 - *

- * @author Roland Haeder - */ -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 - *

- * @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 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 . - */ -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 - *

- * @author Roland Haeder - */ -public interface AdminUnlinkedCellphoneNumberEvent extends Serializable { - - /** - * Getter for updated cell phone numbers - *

- * @return Updated cell phone numbers - */ - DialableCellphoneNumber getUnlinkedCellphoneNumber (); - - /** - * Getter for contact instance - *

- * @return Contact instance - */ - Contact getContact (); - -} -- 2.39.5