Scarab commit: svn commit: r11026 - trunk/src/java/org/tigris/scarab: om tools util/word

Author: dabbous
Date: 2010-11-22 14:36:51-0800
New Revision: 11026

Modified:
   trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
   trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
   trunk/src/java/org/tigris/scarab/util/word/QueryResult.java

Log:
fix for SCB3056

Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&pathrev=11026&r1=11025&r2=11026
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2010-11-22 14:36:51-0800
@@ -745,6 +745,12 @@
 
     /**
      * Returns default issue list attributes for this module.
+     * This list is generated as follows:
+     * The first default text attribute is searched
+     * Then all UserAttributes are added
+     * If the number of colomns is < 3 then add as many
+     * attributes from the list until the number of 
+     * attributes is 3
      */
     public List getDefaultRModuleUserAttributes(IssueType issueType)
         throws TorqueException
@@ -757,23 +763,27 @@
             result = new LinkedList();
             Attribute[] attributes = new Attribute[3];
             int count = 0;
-            attributes[count++] = issueType.getDefaultTextAttribute(this);
-            if (attributes[0] == null) 
-            {
-                count = 0;
-            }            
+            //attributes[count++] = issueType.getDefaultTextAttribute(this);
+            //if (attributes[0] == null) 
+            //{
+            //    count = 0;
+            //}            
             List rma1s = getRModuleAttributes(issueType, true, NON_USER);
             Iterator i = rma1s.iterator();
+
+            // Find first default text attribute ...
             while (i.hasNext())
             {
-                Attribute a = ((RModuleAttribute)i.next()).getAttribute();
-                if (!a.isTextAttribute() || attributes[0] == null) 
+                RModuleAttribute rmat = (RModuleAttribute)i.next();
+                Attribute a = rmat.getAttribute();
+                if (a.isTextAttribute() && rmat.getIsDefaultText()) 
                 {
                     attributes[count++] = a;
                     break;
                 }
             }
 
+            // Add all UserAttributes
             List rma2s = getRModuleAttributes(issueType, true, USER);
             i = rma2s.iterator();
             while (i.hasNext() && count < 3)            

Modified: trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=11026&r1=11025&r2=11026
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	(original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	2010-11-22 14:36:51-0800
@@ -761,8 +761,9 @@
      * First attempts to get the RModuleUserAttributes from the user.
      * If it is empty, then it will try to get the defaults from the module.
      * If anything fails, it will return an empty list.
+     * @throws TorqueException 
      */
-    public List<RModuleAttribute> getRModuleUserAttributes()
+    public List<RModuleAttribute> getRModuleUserAttributes() throws TorqueException
     {
         ScarabUser user = (ScarabUser)data.getUser();
         Module module   = user.getCurrentModule();
@@ -830,10 +831,12 @@
      * Common driver function to get the current list of RModule Attributes.
      * @param user
      * @return
+     * @throws TorqueException 
      */
-    private List<RModuleAttribute> getRModuleUserAttributes(ScarabUser user, Module module)
+    private List<RModuleAttribute> getRModuleUserAttributes(ScarabUser user, Module module) throws TorqueException
     {
-        IssueType theIssueType = this.getIssueType();
+        Integer defaultIssueTypeId = (Integer)MITListPeer.ALL_MODULES_ISSUETYPES.intValue();
+        IssueType theIssueType = this.getIssueType(defaultIssueTypeId);
 
         if(issueListColumns == null || issueListColumns.size() == 0)
         {
@@ -1174,10 +1177,16 @@
         return issueType;
     }
 
+    public IssueType getIssueType() throws TorqueException
+    {
+        return getIssueType((Integer)null);
+    }
+    
     /**
      * Get an issue type object.
+     * @throws TorqueException 
      */
-    public IssueType getIssueType()
+    public IssueType getIssueType(Integer defaultIssueTypeId) throws TorqueException
     {
         if (issueType == null)
         {
@@ -1186,7 +1195,7 @@
             if (key == null)
             {
                 // get new issue type
-                issueType = new IssueType();
+                issueType = new IssueType(defaultIssueTypeId);
             }
             else
             {
@@ -1197,7 +1206,7 @@
                 }
                 catch (Exception e)
                 {
-                    issueType = new IssueType();
+                    issueType = new IssueType(defaultIssueTypeId);
                 }
             }
         }

Modified: trunk/src/java/org/tigris/scarab/util/word/QueryResult.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/word/QueryResult.java?view=diff&pathrev=11026&r1=11025&r2=11026
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/word/QueryResult.java	(original)
+++ trunk/src/java/org/tigris/scarab/util/word/QueryResult.java	2010-11-22 14:36:51-0800
@@ -237,6 +237,14 @@
             {
                 List multiVal = (List)i.next();
                 String csv = StringUtils.join(multiVal.iterator(), ", ");
+                if(csv.indexOf('\n') > -1)
+                {
+                    csv = csv.replace('\n', '.');
+                }
+                if(csv.indexOf('\r') > -1)
+                {
+                    csv = csv.replace('\r', '.');
+                }
                 result.add(csv);
             }
         }

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