You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/10/17 16:55:08 UTC
svn commit: r464961 - in
/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main:
java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
javascript/META-INF/adf/jsLibs/CoreFormat.js
Author: matzew
Date: Tue Oct 17 09:55:07 2006
New Revision: 464961
URL: http://svn.apache.org/viewvc?view=rev&rev=464961
Log:
making DecimalFormat js to NumberConverter js, also implemented getAsObject and getAsString with "prototye style" (see ADFFACES-240)
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java?view=diff&rev=464961&r1=464960&r2=464961
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java Tue Oct 17 09:55:07 2006
@@ -215,7 +215,7 @@
StringBuffer outBuffer = new StringBuffer(250);
if (isConverter)
- outBuffer.append("new DecimalFormat(");
+ outBuffer.append("new NumberConverter(");
else
outBuffer.append("new DecimalValidator(");
@@ -267,7 +267,7 @@
{
StringBuffer outBuffer = new StringBuffer(250);
- outBuffer.append("new DecimalFormat(");
+ outBuffer.append("new NumberConverter(");
outBuffer.append("{D:'");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js?view=diff&rev=464961&r1=464960&r2=464961
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js Tue Oct 17 09:55:07 2006
@@ -13,14 +13,50 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-function _decimalGetAsString(
- number
+
+function NumberConverter(
+ messages,
+ maxPrecision,
+ maxScale,
+ maxValue,
+ minValue)
+{
+ this._messages = messages;
+ this._maxPrecision = maxPrecision;
+ this._maxScale = maxScale;
+ this._maxValue = maxValue;
+ this._minValue = minValue;
+
+ // for debugging
+ this._class = "NumberConverter";
+}
+
+NumberConverter.prototype = new TrConverter();
+
+
+NumberConverter.prototype.getAsString = function(
+ number,
+ label
)
{
return "" + number;
}
-function _decimalParse(
+NumberConverter.prototype.getAsObject = function(
+ numberString,
+ label
+ )
+{
+ return this._decimalParse(numberString,
+ this._messages,
+ this._maxPrecision,
+ this._maxScale,
+ this._maxValue,
+ this._minValue,
+ label);
+}
+
+NumberConverter.prototype._decimalParse = function(
numberString,
messages,
maxPrecision,
@@ -33,8 +69,8 @@
var facesMessage = null;
if (!numberString)
{
- facesMessage = _createFacesMessage( messages[(DecimalFormat.D+ '_S')],
- messages[DecimalFormat.D],
+ facesMessage = _createFacesMessage( messages[(NumberConverter.D+ '_S')],
+ messages[NumberConverter.D],
label,
numberString);
throw new TrConverterException(facesMessage);
@@ -50,8 +86,8 @@
if ((numberString.indexOf(grouping) == 0) ||
(numberString.lastIndexOf(grouping) == (numberString.length - 1)))
{
- facesMessage = _createFacesMessage( messages[(DecimalFormat.D+ '_S')],
- messages[DecimalFormat.D],
+ facesMessage = _createFacesMessage( messages[(NumberConverter.D+ '_S')],
+ messages[NumberConverter.D],
label,
numberString);
throw new TrConverterException(facesMessage);
@@ -103,22 +139,22 @@
if ((maxValue != (void 0)) &&
(result > maxValue))
{
- messageKey = DecimalFormat.LV;
+ messageKey = NumberConverter.LV;
}
else if ((minValue != (void 0)) &&
(result < minValue))
{
- messageKey = DecimalFormat.MV;
+ messageKey = NumberConverter.MV;
}
else if ((maxPrecision != (void 0)) &&
(integerDigits > maxPrecision))
{
- messageKey = DecimalFormat.LID;
+ messageKey = NumberConverter.LID;
}
else if ((maxScale != (void 0)) &&
(fractionDigits > maxScale))
{
- messageKey = DecimalFormat.LFD;
+ messageKey = NumberConverter.LFD;
}
if (messageKey != (void 0))
@@ -143,58 +179,24 @@
}
}
- facesMessage = _createFacesMessage( messages[(DecimalFormat.D+ '_S')],
- messages[DecimalFormat.D],
+ facesMessage = _createFacesMessage( messages[(NumberConverter.D+ '_S')],
+ messages[NumberConverter.D],
label,
numberString);
throw new TrConverterException(facesMessage);
}
-function _decimalGetAsObject(
- numberString,
- label
- )
-{
- return _decimalParse(numberString,
- this._messages,
- this._maxPrecision,
- this._maxScale,
- this._maxValue,
- this._minValue,
- label);
-}
-
-function DecimalFormat(
- messages,
- maxPrecision,
- maxScale,
- maxValue,
- minValue)
-{
- this._messages = messages;
- this._maxPrecision = maxPrecision;
- this._maxScale = maxScale;
- this._maxValue = maxValue;
- this._minValue = minValue;
-
- // for debugging
- this._class = "DecimalFormat";
-}
-
-DecimalFormat.prototype = new TrConverter();
-DecimalFormat.prototype.getAsString = _decimalGetAsString;
-DecimalFormat.prototype.getAsObject = _decimalGetAsObject;
// Less fraction digits
-DecimalFormat.LFD = 'LFD';
+NumberConverter.LFD = 'LFD';
// Less integer digits
-DecimalFormat.LID = 'LID';
+NumberConverter.LID = 'LID';
// Less value
-DecimalFormat.LV = 'LV';
+NumberConverter.LV = 'LV';
// More value
-DecimalFormat.MV = 'MV';
+NumberConverter.MV = 'MV';
// default
-DecimalFormat.D = 'D';
+NumberConverter.D = 'D';
function _decimalValidate(