Scarab commit: svn commit: r10693 - branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java

Author: dabbous
Date: 2009-02-14 07:47:12-0800
New Revision: 10693

Modified:
   branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java

Log:
Backport from trunk fixes SCB2623

Modified: branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&pathrev=10693&r1=10692&r2=10693
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2009-02-14 07:47:12-0800
@@ -1222,32 +1222,34 @@
         return getRModuleOptions(attribute, issueType, true);
     }
 
+
+    /**
+    * backport from trunk (HD 2009-02-14) fixes SCB2623
+    * more details, see trunk
+    **/
     public List getRModuleOptions(Attribute attribute, IssueType issueType,
                                   boolean activeOnly)
         throws TorqueException
     {
-        List allRModuleOptions = null;
-        allRModuleOptions = getAllRModuleOptions(attribute, issueType);
+        List allRModuleOptions    = getAllRModuleOptions(attribute, issueType);
+        List resultRModuleOptions = null;
 
-        if (allRModuleOptions != null)
+        if (allRModuleOptions != null) 
         {
-            if (activeOnly)
+            resultRModuleOptions = new ArrayList(allRModuleOptions.size());
+            int orderIndex = 0;
+            for (int i = 0; i < allRModuleOptions.size(); i++) 
             {
-                List activeRModuleOptions =
-                    new ArrayList(allRModuleOptions.size());
-                for (int i=0; i<allRModuleOptions.size(); i++)
+                RModuleOption rmo = (RModuleOption) allRModuleOptions.get(i);
+                if (!activeOnly || rmo.getActive()) 
                 {
-                    RModuleOption rmo =
-                        (RModuleOption)allRModuleOptions.get(i);
-                    if (rmo.getActive())
-                    {
-                        activeRModuleOptions.add(rmo);
-                    }
+                    rmo.setOrder(++orderIndex); // take care that the option order is consecutive
+                    resultRModuleOptions.add(rmo);
                 }
-                allRModuleOptions =  activeRModuleOptions;
             }
         }
-        return allRModuleOptions;
+
+        return resultRModuleOptions;
     }

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=1158517