Scarab commit: svn commit: r10221 - branches/release/b21/src/java/org/tigris/scarab: actions/admin om

Author: dabbous
Date: 2006-07-24 01:28:24-0700
New Revision: 10221

Modified:
   branches/release/b21/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java
   branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java
   branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatus.java

Log:
refactored for better readbility.
replaced String activityType by already existing class ActivityType, no functional modification.

Modified: branches/release/b21/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java?view=diff&rev=10221&p1=branches/release/b21/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java&p2=branches/release/b21/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java&r1=10220&r2=10221
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java	2006-07-24 01:28:24-0700
@@ -153,20 +153,20 @@
         }
 
         String groupId = data.getParameters().getString("groupId");
-        AttributeGroup ag = AttributeGroupManager
+        AttributeGroup attributeGroup = AttributeGroupManager
                             .getInstance(new NumberKey(groupId), false);
         
         LocalizationKey l10nKey = DEFAULT_MSG;
 
         // Check if issue type is locked
-        if (!ag.isGlobal() && issueType.getLocked())
+        if (!attributeGroup.isGlobal() && issueType.getLocked())
         {
             scarabR.setAlertMessage(L10NKeySet.LockedIssueType);
             return false;
         }
 
         // Check for duplicate sequence numbers
-        if (areThereDupeSequences(ag.getRAttributeAttributeGroups(), intake,
+        if (areThereDupeSequences(attributeGroup.getRAttributeAttributeGroups(), intake,
                 "RAttributeAttributeGroup", "Order", 0))
         {
             scarabR.setAlertMessage(
@@ -175,7 +175,7 @@
             return false;
         }
 
-        List rmas = ag.getRModuleAttributes();
+        List rmas = attributeGroup.getRModuleAttributes();
         ArrayList lockedAttrs = new ArrayList();
 
         if (intake.isAllValid())
@@ -273,7 +273,7 @@
                             rma.save();
                             // Set properties for attribute-attribute group mapping
                             RAttributeAttributeGroup raag = 
-                                ag.getRAttributeAttributeGroup(attr);
+                                attributeGroup.getRAttributeAttributeGroup(attr);
                             Group raagGroup = intake.get("RAttributeAttributeGroup", 
                                          raag.getQueryKey(), false);
                             raagGroup.setProperties(raag);

Modified: branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java?view=diff&rev=10221&p1=branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java&r1=10220&r2=10221
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java	2006-07-24 01:28:24-0700
@@ -85,8 +85,8 @@
             Issue issue = IssueManager.getInstance(issueId);
             Integer moduleId = issue.getModuleId();
             Integer userId = notif.getReceiverId();
-            String activityType = notif.getActivityType();
-            filter = getNotificationFilter(moduleId, userId, activityType);
+            ActivityType activityType = notif.getActivityType();
+            filter = getNotificationFilter(moduleId, userId, activityType.getCode());
         }
         catch(TorqueException te)
         {

Modified: branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatus.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatus.java?view=diff&rev=10221&p1=branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatus.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatus.java&r1=10220&r2=10221
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatus.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/NotificationStatus.java	2006-07-24 01:28:24-0700
@@ -52,6 +52,7 @@
 import org.apache.torque.TorqueException;
 import org.apache.torque.om.Persistent;
 import org.apache.torque.util.Criteria;
+import org.tigris.scarab.notification.ActivityType;
 import org.tigris.scarab.tools.ScarabLocalizationTool;
 import org.tigris.scarab.tools.localization.L10NKeySet;
 import org.tigris.scarab.util.ScarabException;
@@ -75,7 +76,7 @@
     
     static private final Integer ARCHIVER_ID   = new Integer(-1);
        
-    private String activityType;
+    private ActivityType activityType;
     private Long issueId;
     
     public NotificationStatus() throws TorqueException
@@ -121,7 +122,7 @@
     	return this.issueId;
     }
     
-    public String getActivityType()
+    public ActivityType getActivityType()
     {
     	return this.activityType;
     }
@@ -137,7 +138,8 @@
             this.issueId = this.getActivity().getIssue().getIssueId();
             this.setCreationDate(this.getActivity().getActivitySet().getCreatedDate());
             this.setCreatorId(this.getActivity().getActivitySet().getCreator().getUserId());
-            this.activityType = this.getActivity().getActivityType();
+            String activityTypeString = this.getActivity().getActivityType();
+            this.activityType = ActivityType.getActivityType(activityTypeString);
         }
         catch (TorqueException te)
         {
@@ -248,7 +250,7 @@
             rdo = user1.compareTo(user2);
             if (0 == rdo)
             {
-                rdo = not1.getActivityType().compareTo(not2.getActivityType());
+                rdo = not1.getActivityType().getCode().compareTo(not2.getActivityType().getCode());
                 if (0 == rdo)
                 {
                     rdo = not1.getCreationDate().compareTo(not2.getCreationDate());