Undoing mistakes from auto-merge.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 179 insertions, 179 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 56cf7c98..2cde8a75 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -1,8 +1,8 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
 
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
@@ -14,19 +14,19 @@ var GeomObj = function GLGeomObj() {
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
-        this.GEOM_TYPE_RECTANGLE                =  1;
-        this.GEOM_TYPE_CIRCLE                   =  2;
-        this.GEOM_TYPE_LINE             =  3;
-        this.GEOM_TYPE_PATH                         =  4;
-        this.GEOM_TYPE_CUBIC_BEZIER     =  5;
-    this.GEOM_TYPE_BRUSH_STROKE     =  6;
-        this.GEOM_TYPE_UNDEFINED                = -1;
+    this.GEOM_TYPE_RECTANGLE = 1;
+    this.GEOM_TYPE_CIRCLE = 2;
+    this.GEOM_TYPE_LINE = 3;
+    this.GEOM_TYPE_PATH = 4;
+    this.GEOM_TYPE_CUBIC_BEZIER = 5;
+    this.GEOM_TYPE_BRUSH_STROKE = 6;
+    this.GEOM_TYPE_UNDEFINED = -1;
 
     // Needed for calculating dashed/dotted strokes
     this.DASH_LENGTH = 0.15;
     this.DOT_LENGTH = 0.05;
     this.GAP_LENGTH = 0.05;
-        
+
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -40,74 +40,74 @@ var GeomObj = function GLGeomObj() {
     this.m_world = null;
 
     // stroke and fill colors
-    this._strokeColor   = [0,0,0,0];
-    this._fillColor             = [0,0,0,0];
+    this._strokeColor = [0, 0, 0, 0];
+    this._fillColor = [0, 0, 0, 0];
 
-        // stroke and fill materials
-        this._fillMaterial = null;
-        this._strokeMaterial = null;
+    // stroke and fill materials
+    this._fillMaterial = null;
+    this._strokeMaterial = null;
 
-        // array of primitives - used in RDGE
-        this._primArray = [];
-        this._materialNodeArray = [];
-        this._materialArray = [];
-        this._materialTypeArray = [];
+    // array of primitives - used in RDGE
+    this._primArray = [];
+    this._materialNodeArray = [];
+    this._materialArray = [];
+    this._materialTypeArray = [];
 
-        // the transform node used by RDGE
-        this._trNode = null;
+    // the transform node used by RDGE
+    this._trNode = null;
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
-    this.setWorld = function( world ) {
+    this.setWorld = function (world) {
         this.m_world = world;
     };
 
-    this.getWorld = function() {
+    this.getWorld = function () {
         return this.m_world;
     };
 
-        this.getMatrix = function() {
+    this.getMatrix = function () {
         return this._matrix.slice(0);
     };
 
-        this.setMatrix = function(m) {
+    this.setMatrix = function (m) {
         this._matrix = m.slice(0);
     };
 
-    this.setNext = function( next ) {
+    this.setNext = function (next) {
         this._next = next;
     };
 
-    this.getNext = function() {
+    this.getNext = function () {
         return this._next;
     };
 
-    this.setPrev = function( prev ) {
+    this.setPrev = function (prev) {
         this._prev = prev;
     };
 
-    this.getPrev = function() {
+    this.getPrev = function () {
         return this._prev;
     };
 
-    this.setChild = function( child ) {
+    this.setChild = function (child) {
         this._child = child;
     };
 
-    this.getChild = function() {
+    this.getChild = function () {
         return this._child;
     };
 
-    this.setParent = function( parent ) {
+    this.setParent = function (parent) {
         this._parent = parent;
     };
 
-    this.getParent = function() {
+    this.getParent = function () {
         return this._parent;
     };
 
-        this.geomType = function() {
+    this.geomType = function () {
         return this.GEOM_TYPE_UNDEFINED;
     };
 
@@ -115,7 +115,7 @@ var GeomObj = function GLGeomObj() {
         return this._primArray;
     };
 
-        this.getMaterialNodeArray = function() {
+    this.getMaterialNodeArray = function () {
         return this._materialNodeArray;
     };
 
@@ -123,29 +123,29 @@ var GeomObj = function GLGeomObj() {
         return this._materialArray;
     };
 
-        this.getTransformNode = function() {
+    this.getTransformNode = function () {
         return this._trNode;
     };
 
-        this.setTransformNode = function(t) {
+    this.setTransformNode = function (t) {
         this._trNode = t;
     };
 
-    this.setFillColor = function(c) {
+    this.setFillColor = function (c) {
         this.setMaterialColor(c, "fill");
     };
 
-    this.setStrokeColor = function(c) {
+    this.setStrokeColor = function (c) {
         this.setMaterialColor(c, "stroke");
     };
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-        this.setMaterialColor = function(c, type) {
+    this.setMaterialColor = function (c, type) {
         var i = 0,
             nMats = 0;
-        if(c) {
-            if(c.gradientMode) {
+        if (c) {
+            if (c.gradientMode) {
                 // Gradient support
                 if (this._materialArray && this._materialTypeArray) {
                     nMats = this._materialArray.length;
@@ -156,21 +156,21 @@ var GeomObj = function GLGeomObj() {
 
                 var len = colors.length;
                 // TODO - Current shaders only support 4 color stops
-                if(len > 4) {
+                if (len > 4) {
                     len = 4;
                 }
 
-                for(var n=0; n<len; n++) {
-                    var position = colors[n].position/100;
+                for (var n = 0; n < len; n++) {
+                    var position = colors[n].position / 100;
                     var cs = colors[n].value;
-                    var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+                    var stop = [cs.r / 255, cs.g / 255, cs.b / 255, cs.a];
                     stops.push(stop);
 
                     if (nMats === this._materialTypeArray.length) {
-                        for (i=0;  i<nMats;  i++) {
+                        for (i = 0; i < nMats; i++) {
                             if (this._materialTypeArray[i] == type) {