Author: pyaschenko Date: 2010-05-11 10:17:31 -0400 (Tue, 11 May 2010) New Revision: 16989 Modified: root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js Log: similarityGroupingId was changed to requestGroupId Modified: root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-05-11 14:11:15 UTC (rev 16988) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-05-11 14:17:31 UTC (rev 16989) @@ -91,8 +91,8 @@ this.event = event; - //similarityGroupingId is mutable, thus we need special field for it - this.similarityGroupingId = this.queueOptions.similarityGroupingId; + //requestGroupId is mutable, thus we need special field for it + this.requestGroupId = this.queueOptions.requestGroupId; this.eventsCount = 1; }; @@ -102,16 +102,16 @@ return this.queueOptions.ignoreDupResponses; }, - getSimilarityGroupingId: function() { - return this.similarityGroupingId; + getRequestGroupId: function() { + return this.requestGroupId; }, - setSimilarityGroupingId: function(id) { - this.similarityGroupingId = id; + setRequestGroupId: function(id) { + this.requestGroupId = id; }, - resetSimilarityGroupingId: function() { - this.similarityGroupingId = undefined; + resetRequestGroupId: function() { + this.requestGroupId = undefined; }, setReadyToSubmit: function(isReady) { @@ -321,12 +321,12 @@ * */ push: function (source, event, options) { var entry = new QueueEntry(this, source, event, options); - var similarityGroupingId = entry.getSimilarityGroupingId(); + var requestGroupId = entry.getRequestGroupId(); var lastEntry = getLastEntry(); if (lastEntry) { - if (lastEntry.getSimilarityGroupingId() == similarityGroupingId) { + if (lastEntry.getRequestGroupId() == requestGroupId) { log.debug("Similar request currently in queue"); log.debug("Combine similar requests and reset timer"); @@ -339,11 +339,11 @@ log.debug("Last queue entry is not the last anymore. Stopping requestDelay timer and marking entry as ready for submission") lastEntry.stopTimer(); - lastEntry.resetSimilarityGroupingId(); + lastEntry.resetRequestGroupId(); lastEntry.setReadyToSubmit(true); items.push(entry); - log.debug("New request added to queue. Queue similarityGroupingId changed to " + similarityGroupingId); + log.debug("New request added to queue. Queue requestGroupId changed to " + requestGroupId); submitFirst(); } } else {