Scarab commit: svn commit: r11254 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions/admin tools

Author: mcoss
Date: 2012-05-04 08:25:57-0700
New Revision: 11254

Modified:
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java

Log:
CHG - .RunData.getParameters().getInteger() -> .RunData.getParameters().getIntObject()

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java?view=diff&pathrev=11254&r1=11253&r2=11254
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java	2012-05-04 08:25:57-0700
@@ -93,7 +93,7 @@
         switch (nObjectType)
         {
             case ScarabConstants.TRANSITION_OBJECT:
-            	Integer tranId = data.getParameters().getInteger("transition_id");
+            	Integer tranId = data.getParameters().getIntObject("transition_id");
             	crit.add(ConditionPeer.TRANSITION_ID, tranId);
             	TransitionManager.getMethodResult().remove(TransitionManager.getInstance(tranId), TransitionManager.GET_CONDITIONS);
                 break;
@@ -130,24 +130,24 @@
     private void updateObject(RunData data, Context context, Integer aConditions[]) throws Exception
     {
         ScarabRequestTool scarabR = getScarabRequestTool(context);
-        Integer operator = data.getParameters().getInteger("combineWith");
+        Integer operator = data.getParameters().getIntObject("combineWith");
         switch (data.getParameters().getInt("obj_type"))
         {
             case ScarabConstants.TRANSITION_OBJECT:
-                Transition transition = scarabR.getTransition(data.getParameters().getInteger("transition_id"));
+                Transition transition = scarabR.getTransition(data.getParameters().getIntObject("transition_id"));
             	transition.setConditionsArray(aConditions, operator);
             	transition.save();
             	TransitionManager.getMethodResult().remove(transition, TransitionManager.GET_CONDITIONS);
                 AttributeManager.clear();        
                 break;
             case ScarabConstants.GLOBAL_ATTRIBUTE_OBJECT:
-                Attribute attribute = scarabR.getAttribute(data.getParameters().getInteger("attId"));
+                Attribute attribute = scarabR.getAttribute(data.getParameters().getIntObject("attId"));
             	attribute.setConditionsArray(aConditions, operator);
             	attribute.save();
                 AttributeManager.clear();        
                 break;
             case ScarabConstants.MODULE_ATTRIBUTE_OBJECT:
-            	RModuleAttribute rma = RModuleAttributePeer.retrieveByPK(data.getParameters().getInteger("moduleId"), data.getParameters().getInteger("attId"), data.getParameters().getInteger("issueTypeId"));
+            	RModuleAttribute rma = RModuleAttributePeer.retrieveByPK(data.getParameters().getIntObject("moduleId"), data.getParameters().getIntObject("attId"), data.getParameters().getIntObject("issueTypeId"));
                 rma.setConditionsArray(aConditions, operator);
                 RModuleAttributeManager.clear();
                 ConditionManager.clear();
@@ -155,7 +155,7 @@
                 AttributeManager.clear();        
         		break;
         	case ScarabConstants.BLOCKED_MODULE_ISSUE_TYPE_OBJECT:
-        	    RModuleIssueType rmit = RModuleIssueTypePeer.retrieveByPK(scarabR.getCurrentModule().getModuleId(), data.getParameters().getInteger("issuetypeid"));
+        	    RModuleIssueType rmit = RModuleIssueTypePeer.retrieveByPK(scarabR.getCurrentModule().getModuleId(), data.getParameters().getIntObject("issuetypeid"));
         		rmit.setConditionsArray(aConditions, operator);
         	    rmit.save();
         	    RModuleIssueTypeManager.clear();

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java?view=diff&pathrev=11254&r1=11253&r2=11254
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java	2012-05-04 08:25:57-0700
@@ -610,9 +610,9 @@
                 !data.getParameters().getString("trans_new_FromId").equals("choose") &&
                 !data.getParameters().getString("trans_new_ToId").equals("choose"))
         {
-            Integer roleId = data.getParameters().getInteger("trans_new_RoleId");
-            Integer fromId = data.getParameters().getInteger("trans_new_FromId");
-            Integer toId = data.getParameters().getInteger("trans_new_ToId");
+            Integer roleId = data.getParameters().getIntObject("trans_new_RoleId");
+            Integer fromId = data.getParameters().getIntObject("trans_new_FromId");
+            Integer toId = data.getParameters().getIntObject("trans_new_ToId");
 
             if (roleId.intValue() == -1)
                 roleId = null;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=11254&r1=11253&r2=11254
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	2012-05-04 08:25:57-0700
@@ -1363,7 +1363,7 @@
         IssueType curit = user.getCurrentIssueType();
         if (curit == null)
         {
-            Integer curitID = data.getParameters().getInteger(ScarabConstants.CURRENT_ISSUE_TYPE);
+            Integer curitID = data.getParameters().getIntObject(ScarabConstants.CURRENT_ISSUE_TYPE);
             if(curitID.intValue()!=0)
             {
                 curit = IssueTypeManager.getInstance(curitID);

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