Merged in MAW016/holographlibrary-1/MAW016/edit-to-avoid-conflict-138…

…4720614469 (pull request Androguide#2) Edit to avoid conflict
menghang · Nov 17, 2013 · f8ca5c5 · f8ca5c5
2 parents 9b5ee75 + a348a58
commit f8ca5c5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/HoloGraphLibrary/src/com/echo/holographlibrary/Bar.java b/HoloGraphLibrary/src/com/echo/holographlibrary/Bar.java
@@ -55,10 +55,10 @@ public void setValue(float value) {
 
 	public String getValueString()
 	{
-		if (mValueString == null) {
-			return String.valueOf(mValue);
-		} else {
+		if (mValueString != null) {
 			return mValueString;
+		} else {
+			return String.valueOf(mValue);
 		}
 	}