Scarab commit: svn commit: r10616 - trunk/src/java/org/tigris/scarab: actions attribute

Author: hair
Date: 2008-08-23 09:59:25-0700
New Revision: 10616

Modified:
   trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java
   trunk/src/java/org/tigris/scarab/attribute/IntegerAttribute.java

Log:
Issue SCB350:  (Non-integer values allowed in integer field) 
  fixed:
>  - ModifyIssue.submitattributesCheckRequiredAttributes fails as a blank int intake field is null not a zero length string
>  - moving the attributes value from VALUE to NUMERIC_VALUE breaks old issue values. some migration script or mirror between db fields is required.

Modified: trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java?view=diff&rev=10616&p1=trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java&p2=trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java&r1=10615&r2=10616
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java	2008-08-23 09:59:25-0700
@@ -200,6 +200,10 @@
                     }
                     
                 }
+                else if(aval instanceof IntegerAttribute)
+                {
+                    field = group.get("NumericValue");
+                }
                 else
                 {
                     field = group.get("Value");
@@ -281,7 +285,7 @@
                     if( next instanceof Field )
                     {
                         final Field field = (Field)next;
-                        if(field.getValue().toString().length() == 0)
+                        if(null == field.getValue() || field.getValue().toString().length() == 0)
                         {
                             field.setRequired(true);
                             field.setMessage("ConditionallyRequiredAttribute");
@@ -380,6 +384,8 @@
                     oldValue = null != aval.getNumericValue() 
                             ? aval.getNumericValue().toString()
                             : "";
+                    // mirror the numeric_value into the value field
+                    aval2.setValue(newValue);
                 }
                 else 
                 {

Modified: trunk/src/java/org/tigris/scarab/attribute/IntegerAttribute.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/attribute/IntegerAttribute.java?view=diff&rev=10616&p1=trunk/src/java/org/tigris/scarab/attribute/IntegerAttribute.java&p2=trunk/src/java/org/tigris/scarab/attribute/IntegerAttribute.java&r1=10615&r2=10616
==============================================================================
--- trunk/src/java/org/tigris/scarab/attribute/IntegerAttribute.java	(original)
+++ trunk/src/java/org/tigris/scarab/attribute/IntegerAttribute.java	2008-08-23 09:59:25-0700
@@ -1,5 +1,7 @@
 package org.tigris.scarab.attribute;
 
+import org.tigris.scarab.util.Log;
+
 /* ================================================================
  * Copyright (c) 2000-2002 CollabNet.  All rights reserved.
  * 
@@ -54,4 +56,24 @@
  */
 public class IntegerAttribute extends StringAttribute
 {
+
+    public Integer getNumericValue() {
+
+        // provides backward compatibility from 0.21 to 0.22  .see SCB350.
+        // this could also be done with a migration script.
+        if(null == super.getNumericValue() && null != getValue())
+        {
+            try
+            {
+                return Integer.valueOf(getValue());
+            }
+            catch(NumberFormatException nfe)
+            {
+                Log.get().warn("non integer string in VALUE field for IntegerAttribute");
+            }
+        }
+
+        return super.getNumericValue();
+    }
+
 }