1 files changed, 20 insertions, 30 deletions

diff --git a/frontend/gamma/js/Clipperz/Async.js b/frontend/gamma/js/Clipperz/Async.js
index f7a9517..d525453 100644
--- a/frontend/gamma/js/Clipperz/Async.js
+++ b/frontend/gamma/js/Clipperz/Async.js
@@ -1,150 +1,141 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition 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.
+* Clipperz 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 Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //Clipperz.Async = MochiKit.Async;
 
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.Async) == 'undefined') { Clipperz.Async = {}; }
 
 Clipperz.Async.VERSION = "0.1";
 Clipperz.Async.NAME = "Clipperz.Async";
 
 Clipperz.Async.Deferred = function(aName, args) {
         args = args || {};
 
         Clipperz.Async.Deferred.superclass.constructor.call(this, args.canceller);
 
         this._args = args;
         this._name = aName || "Anonymous deferred";
         this._count = 0;
         this._shouldTrace = ((CLIPPERZ_DEFERRED_TRACING_ENABLED === true) || (args.trace === true));
         this._vars = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.Async.Deferred, MochiKit.Async.Deferred, {
 
         'name': function () {
                 return this._name;
         },
 
         'args': function () {
                 return this._args;
         },
 
         //-----------------------------------------------------------------------------
 
         'callback': function (aValue) {
                 if (this._shouldTrace) {
-                        //Clipperz.log("CALLBACK " + this._name, aValue);
-                        console.log("CALLBACK " + this._name, aValue);
+                        Clipperz.log("CALLBACK " + this._name, aValue);
                 }
 
                 if (this.chained == false) {
                         var message;
                         
                         message = "ERROR [" + this._name + "]";
                         this.addErrback(function(aResult) {
                                 if (! (aResult instanceof MochiKit.Async.CancelledError)) {
                                         Clipperz.log(message, aResult);
                                 }
                                 return aResult;
                         });
 
                         if (this._shouldTrace) {
                                 var resultMessage;
 
                                 resultMessage = "RESULT   " + this._name + " <==";
         //                      this.addCallback(function(aResult) {
                                 Clipperz.Async.Deferred.superclass.addCallback.call(this, function(aResult) {
-                                        //Clipperz.log(resultMessage, aResult);
-                                        console.log(resultMessage, aResult);
-
+                                        Clipperz.log(resultMessage, aResult);
                                         return aResult;
                                 });
                         }
                 }
 
                 if (CLIPPERZ_DEFERRED_CALL_LOGGING_ENABLED === true) {
                         Clipperz.log("callback " + this._name, this);
                 }
 
                 return Clipperz.Async.Deferred.superclass.callback.apply(this, arguments);
         },
 
         //-----------------------------------------------------------------------------
 
         'addCallback': function () {
                 var message;
                 
                 if (this._shouldTrace) {
                         this._count ++;
                         message = "[" + this._count + "] " + this._name + " ";
         //              this.addBoth(function(aResult) {Clipperz.log(message + "-->", aResult); return aResult;});
                         this.addCallbacks(
-                                //function(aResult) {Clipperz.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
-                                function(aResult) {console.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
-                                //function(aResult) {Clipperz.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
-                                function(aResult) {console.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
+                                function(aResult) {Clipperz.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
+                                function(aResult) {Clipperz.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
                         );
                 }
 
                 Clipperz.Async.Deferred.superclass.addCallback.apply(this, arguments);
 
                 if (this._shouldTrace) {
         //              this.addBoth(function(aResult) {Clipperz.log(message + "<--", aResult); return aResult;});
                         this.addCallbacks(
-                                //function(aResult) {Clipperz.log("-OK- " + message + "<--", aResult); return aResult;},
-                                function(aResult) {console.log("-OK- " + message + "<--", aResult); return aResult;},
-                                //function(aResult) {Clipperz.log("FAIL " + message + "<--", aResult); return aResult;}
-                                function(aResult) {console.log("FAIL " + message + "<--", aResult); return aResult;}
+                                function(aResult) {Clipperz.log("-OK- " + message + "<--", aResult); return aResult;},
+                                function(aResult) {Clipperz.log("FAIL " + message + "<--", aResult); return aResult;}
                         );
                 }
         },
 
         //=============================================================================
 
         'addCallbackPass': function() {
                 var passFunction;
 
                 passFunction = MochiKit.Base.partial.apply(null, arguments);
 
                 this.addCallback(function() {
                         var result;
 
                         result = arguments[arguments.length -1];
                         passFunction();
 
                         return result;
                 });
         },
 
         //-----------------------------------------------------------------------------
 
         'addErrbackPass': function() {
@@ -191,74 +182,73 @@ Clipperz.Base.extend(Clipperz.Async.Deferred, MochiKit.Async.Deferred, {
                                 deferredResult = Clipperz.Async.callbacks(this._name + " <else>", anElseBlock, null, aValue);
                         }
                         
                         return deferredResult;
                 }))
         },
 
         //-----------------------------------------------------------------------------
 
         'addMethod': function () {
                 this.addCallback(MochiKit.Base.method.apply(this, arguments));
         },
 
         //-----------------------------------------------------------------------------
 
         'addMethodcaller': function () {
                 this.addCallback(MochiKit.Base.methodcaller.apply(this, arguments));
         },
 
         //=============================================================================
 
         'addLog': function (aLog) {
                 if (CLIPPERZ_DEFERRED_LOGGING_ENABLED) {
                         this.addBothPass(function(res) {Clipperz.log(aLog + " ", res);});
-        //              this.addBothPass(function(res) {console.log(aLog + " ", res);});
                 }
         },
 
         //=============================================================================
         
         'acquireLock': function (aLock) {
         //      this.addCallback(function (aResult) {
         //              return Clipperz.Async.callbacks("Clipperz.Async.acquireLock", [
         //                      MochiKit.Base.method(aLock, 'acquire'),
         //                      MochiKit.Base.partial(MochiKit.Async.succeed, aResult)
         //              ], {trace:false});
         //      });
 
                 this.addCallback(MochiKit.Base.method(aLock, 'acquire'));
         },
 
         'releaseLock': function (aLock) {
         //      this.addCallback(function (aResult) {
         //              return Clipperz.Async.callbacks("Clipperz.Async.release <ok>", [
         //                      MochiKit.Base.method(aLock, 'release'),
         //                      MochiKit.Base.partial(MochiKit.Async.succeed, aResult)
         //              ], {trace:false});
         //      });
         //      this.addErrback(function (aResult) {
-///console.log("releaseLock.addErrback:", aResult);
+///Clipperz.log("releaseLock.addErrback:", aResult);
         //              return Clipperz.Async.callbacks("Clipperz.Async.release <fail>", [
         //                      MochiKit.Base.method(aLock, 'release'),
         //                      MochiKit.Base.partial(MochiKit.Async.fail, aResult)
         //              ], {trace:false});
         //      });
                 
         //      this.addBothPass(MochiKit.Base.method(aLock, 'release'));
                 this.addCallbackPass(MochiKit.Base.method(aLock, 'release'));
                 this.addErrback(function (anError) {
                         aLock.release();
 
                         return anError;
                 });
         },
 
         //=============================================================================
 
         'collectResults': function (someRequests) {
                 this.addCallback(Clipperz.Async.collectResults(this._name + " <collect results>", someRequests, this._args));
         },
 
         'addCallbackList': function (aRequestList) {
                 this.addCallback(Clipperz.Async.callbacks, this._name + " <callback list>", aRequestList, this._args);
         },
@@ -356,49 +346,49 @@ MochiKit.Base.update(Clipperz.Async.DeferredSynchronizer.prototype, {
 
         'numberOfMethodsDone':function() {
                 return this._numberOfMethodsDone;
         },
 
         'incrementNumberOfMethodsDone': function() {
                 this._numberOfMethodsDone ++;
         },
 
         //-----------------------------------------------------------------------------
         
         'run': function(args, aValue) {
                 var deferredResults;
                 var i, c;
                 
                 deferredResults = [];
                 args = args || {};
 
                 c = this.methods().length;
                 for (i=0; i<c; i++) {
                         var deferredResult;
                                 varmethodCalls;
                         var ii, cc;
 
-//console.log("TYPEOF", typeof(this.methods()[i]));
+//Clipperz.log("TYPEOF", typeof(this.methods()[i]));
                         if (typeof(this.methods()[i]) == 'function') {
                                 methodCalls = [ this.methods()[i] ];
                         } else {
                                 methodCalls = this.methods()[i];
                         }
                         
                         cc = methodCalls.length;
                         deferredResult = new Clipperz.Async.Deferred("Clipperz.Async.DeferredSynchronizer.run => " + this.name() + "[" + i + "]", args);
                         for (ii=0; ii<cc; ii++) {
                                 deferredResult.addCallback(methodCalls[ii]);
                         }
                         deferredResult.addBoth(MochiKit.Base.method(this, 'handleMethodCallDone', i));
 
                         deferredResults.push(deferredResult);
                 }
                 
                 for (i=0; i<c; i++) {
                         deferredResults[i].callback(aValue);
                 }
                 
                 return this.result();
         },
         
         //-----------------------------------------------------------------------------
@@ -616,49 +606,49 @@ MochiKit.Base.update(Clipperz.Async, {
                                 }, aDeferredComparator, anObject, aSortedResult[i], i);
                         }
                         deferredResult.addMethod(aSortedResult, 'push', anObject);
                         deferredResult.addErrback(function (anError) {
                                 aSortedResult.splice(anError.message, 0, anObject);
                         })
                         deferredResult.addBoth(MochiKit.Async.succeed, aSortedResult);
                         deferredResult.callback();
                 }
                 
                 return deferredResult;
         },
         
         //-------------------------------------------------------------------------
 
         'deferredSort': function (aDeferredComparator, someObjects) {
                 var deferredResult;
                 var i, c;
                                 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.Async.deferredSort", {trace:false});
                 c = someObjects.length;
                 for (i=0; i<c; i++) {
                         deferredResult.addCallback(Clipperz.Async.insertIntoSortedArray, someObjects[i], aDeferredComparator);
                         if ((i % 50) == 0) {
-        //console.log("######### sort wait ##########");
+        //Clipperz.log("######### sort wait ##########");
                                 deferredResult.addCallback(MochiKit.Async.wait, 0.5);
                         }
                         }       
                 deferredResult.callback([]);
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'deferredFilter': function (aFunction, someObjects) {
                         vardeferredResult;
                         vari, c;
 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.Async.deferredFilter", {trace:false});
                 c = someObjects.length;
                 for (i=0; i<c; i++) {
                         deferredResult.addCallback(function (aFunction, anObject, anIndex, aResult) {
                                 var innerDeferredResult;
                                 
                                 innerDeferredResult = new Clipperz.Async.Deferred("Clipperz.Async.deferredFilter <inner - " + anIndex + ">", {trace:false});
                                 innerDeferredResult.addCallback(aFunction, anObject);
                                 innerDeferredResult.addCallback(function (aFilterResult) {
                                         if (aFilterResult) {
@@ -667,45 +657,45 @@ MochiKit.Base.update(Clipperz.Async, {
                                 });
                                 innerDeferredResult.addBoth(MochiKit.Async.succeed, aResult);
                                 innerDeferredResult.callback();
 
                                 return innerDeferredResult;
                         }, aFunction, someObjects[i], i);
                 }
                 deferredResult.callback([]);
                 
                 return deferredResult;
         },
         
         'forEach': function (aFunction) {
                 return MochiKit.Base.partial(function (aFunction, anIterable) {
                         MochiKit.Iter.forEach(anIterable, aFunction);
                 }, aFunction);
         },
 
         //=========================================================================
 
         'or': function (someValues) {
                 return Clipperz.Async.callbacks("Clipperz.Async.or", [
                         MochiKit.Base.values,
                         MochiKit.Base.flattenArguments,
-//function (aValue) { console.log("Record.hasAnyCleanTextData - flatten", aValue); return aValue; },
+//function (aValue) { Clipperz.log("Record.hasAnyCleanTextData - flatten", aValue); return aValue; },
                         function(someInnerValues) {
                                 return MochiKit.Iter.some(someInnerValues, MochiKit.Base.operator.identity);
                         }
                 ], {trace:false}, someValues);
         },
 
         //=========================================================================
 
         'clearResult': function () {},
         
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
 
 
 //#############################################################################
 
 CLIPPERZ_DEFERRED_LOGGING_ENABLED = true;
 CLIPPERZ_DEFERRED_TRACING_ENABLED = false;
 CLIPPERZ_DEFERRED_CALL_LOGGING_ENABLED = false;