From fae029b1874cd341f0a5e5c7886a9dc9db5bbbe9 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 25 Jun 2013 12:07:55 +0200
Subject: [PATCH] Put BasicStatus in its own file.

---
 .../linphone/core/PresenceBasicStatus.java    | 47 +++++++++++++++++++
 .../org/linphone/core/PresenceModel.java      | 31 +-----------
 2 files changed, 48 insertions(+), 30 deletions(-)
 create mode 100644 java/common/org/linphone/core/PresenceBasicStatus.java

diff --git a/java/common/org/linphone/core/PresenceBasicStatus.java b/java/common/org/linphone/core/PresenceBasicStatus.java
new file mode 100644
index 000000000..cfdbadb5c
--- /dev/null
+++ b/java/common/org/linphone/core/PresenceBasicStatus.java
@@ -0,0 +1,47 @@
+/*
+PresenceBasicStatus.java
+Copyright (C) 2010-2013  Belledonne Communications, Grenoble, France
+
+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 2
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+package org.linphone.core;
+
+/** Basic status as defined in section 4.1.4 of RFC 3863 */
+public enum PresenceBasicStatus {
+	/** This value means that the associated contact element, if any, is ready to accept communication. */
+	Open(0),
+	/** This value means that the associated contact element, if any, is unable to accept communication. */
+	Closed(1),
+	Invalid(2);
+
+	protected final int mValue;
+
+	private PresenceBasicStatus(int value) {
+		mValue = value;
+	}
+
+	public int toInt() {
+		return mValue;
+	}
+
+	static protected PresenceBasicStatus fromInt(int value) {
+		switch (value) {
+		case 0: return Open;
+		case 1: return Closed;
+		default: return Invalid;
+		}
+	}
+}
diff --git a/java/common/org/linphone/core/PresenceModel.java b/java/common/org/linphone/core/PresenceModel.java
index 08cb2ad4b..5a6a9bf93 100644
--- a/java/common/org/linphone/core/PresenceModel.java
+++ b/java/common/org/linphone/core/PresenceModel.java
@@ -21,40 +21,11 @@ package org.linphone.core;
 
 public interface PresenceModel {
 
-	/** Basic status as defined in section 4.1.4 of RFC 3863 */
-	public enum BasicStatus {
-		/** This value means that the associated contact element, if any, is ready to accept communication. */
-		Open(0),
-		/** This value means that the associated contact element, if any, is unable to accept communication. */
-		Closed(1),
-		Invalid(2);
-
-		protected final int mValue;
-
-		private BasicStatus(int value) {
-			mValue = value;
-		}
-
-		public int toInt() {
-			return mValue;
-		}
-
-		static protected BasicStatus fromInt(int value) {
-			switch (value) {
-			case 0: return Open;
-			case 1: return Closed;
-			default: return Invalid;
-			}
-		}
-	}
-
-
-
 	/**
 	 * @brief Gets the basic status of a presence model.
 	 * @return The #BasicStatus of the #PresenceModel object.
 	 */
-	BasicStatus getBasicStatus();
+	PresenceBasicStatus getBasicStatus();
 
 	/**
 	 * @brief Gets the timestamp of a presence model.