From ead1600afefce80a7e0960b2e7112f913a068c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Lehni?= <juerg@scratchdisk.com>
Date: Tue, 26 Apr 2011 17:49:54 +0100
Subject: [PATCH] Clean-up CurveLocation code and switch from returning -1 to
 null for #getIndex().

---
 src/path/CurveLocation.js | 34 +++++++++++++++++++---------------
 src/path/Path.js          |  4 ++--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/path/CurveLocation.js b/src/path/CurveLocation.js
index ec5db3e2..35ea43f4 100644
--- a/src/path/CurveLocation.js
+++ b/src/path/CurveLocation.js
@@ -53,12 +53,19 @@ CurveLocation = Base.extend({
 		return this._curve;
 	},
 
+	/**
+	 * The path on which the location is defined.
+	 */
+	getPath: function() {
+		return this._curve && this._curve.getPath();
+	},
+
 	/**
 	 * The index of the curve within the {@link Path#getCurves()} list, if the
 	 * curve is part of a {@link Path} item.
 	 */
 	getIndex: function() {
-		return this._curve ? this._curve.getIndex() : -1;
+		return this._curve && this._curve.getIndex();
 	},
 
 	/**
@@ -66,10 +73,8 @@ CurveLocation = Base.extend({
 	 * by this object.
 	 */
 	getLength: function() {
-		var path = this._curve.getPath();
-		if (path)
-			return path.getLength(this);
-		return path ? path.getLength(this) : null;
+		var path = this._curve && this._curve.getPath();
+		return path && path.getLength(this);
 	},
 
 	/**
@@ -77,7 +82,7 @@ CurveLocation = Base.extend({
 	 * by this object.
 	 */
 	getCurveLength: function() {
-		if (this.curve != null) {
+		if (this.curve) {
 			var parameter = this.getParameter();
 			return parameter != null
 				? curve.getLength(0, parameter)
@@ -91,9 +96,9 @@ CurveLocation = Base.extend({
 	 * the curve).
 	 */
 	getParameter: function() {
-		if (this._parameter == -1 && this._point != null)
+		if (this._parameter != null && this._point)
 			this._parameter = this._curve.getParameter(point);
-		return this._parameter != -1 ? this._parameter : null;
+		return this._parameter;
 	},
 
 	/**
@@ -110,20 +115,19 @@ CurveLocation = Base.extend({
 	 * The item this curve belongs to, if any.
 	 */
 	getItem: function() {
-		return this._curve != null ? this._curve.getPath() : null;
+		return this._curve && this._curve.getPath();
 	},
 
 	toString: function() {
-		var string = '';
+		var parts = [];
 		if (this._point)
-			string += ', point: ' + this.getPoint();
+			parts.push('point: ' + this.getPoint());
 		var index = this.getIndex();
 		if (index >= 0)
-			string += ', index: ' + index;
+			parts.push('index: ' + index);
 		var parameter = this.getParameter();
 		if (parameter != -1)
-			string += ', parameter: ' + parameter;
-		string[0] = '{';
-		return string + ' }';
+			parts.push('parameter: ' + parameter);
+		return '{ ' + parts.join(', ') + ' }'
 	}
 });
diff --git a/src/path/Path.js b/src/path/Path.js
index b0529170..96ec62f5 100644
--- a/src/path/Path.js
+++ b/src/path/Path.js
@@ -164,7 +164,7 @@ var Path = this.Path = PathItem.extend({
 	},
 	
 	join: function(path) {
-		if (path != null) {
+		if (path) {
 			var segments = path.segments,
 				last1 = this.getLastSegment(),
 				last2 = path.getLastSegment();
@@ -235,7 +235,7 @@ var Path = this.Path = PathItem.extend({
 			index = location
 				? location.getIndex()
 				: curves.length;
-		if (index != -1) {
+		if (index != null) {
 			var length = 0;
 			for (var i = 0; i < index; i++)
 				length += curves[i].getLength();