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

Author: jhoech
Date: 2010-01-22 01:50:59-0800
New Revision: 10874

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

Log:
FIX - Issue SCB3005 Rollback of some changes. Type "blocking" is again shown as general string, because it was still not correct for old values. Instead of the fix the type blocking is shown as "< blocking >" to make clear, that history value cannot be read as a sentence.

Modified: branches/release/0.22/src/java/org/tigris/scarab/om/Activity.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/om/Activity.java?view=diff&pathrev=10874&r1=10873&r2=10874
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/om/Activity.java	(original)
+++ branches/release/0.22/src/java/org/tigris/scarab/om/Activity.java	2010-01-22 01:50:59-0800
@@ -227,18 +227,9 @@
         if(   getType().equals(ActivityType.DEPENDENCY_DELETED)
            || getType().equals(ActivityType.DEPENDENCY_CHANGED))
          {
-        	if(issue != null 
-        			&& issue.getIssueId().intValue() != getDepend().getIssueRelatedByObservedId().getIssueId().intValue()
-        			&& getOldValue().equals("blocking")){
-            	value = getDepend().getIssueRelatedByObserverId().getUniqueId()
-                + " " + l10n.get("DependsOn") //deprecated, but method is used many times in scarab.
-                + " " + getDepend().getIssueRelatedByObservedId().getUniqueId(); 
-            }
-            else{
-            	value = getDepend().getIssueRelatedByObservedId().getUniqueId()
-            	+ " " + (getOldValue().equals("blocking") ? l10n.get("PrerequisiteFor") : l10n.get(DependTypeManager.getManager().getL10nKey(getOldValue())))
-                + " " + getDepend().getIssueRelatedByObserverId().getUniqueId();  
-            }            
+        	 value = getDepend().getIssueRelatedByObserverId().getUniqueId()
+             + " < " + l10n.get(DependTypeManager.getManager().getL10nKey(getOldValue())) + " > "
+              + " " + getDepend().getIssueRelatedByObservedId().getUniqueId();       
          } else if( getType().equals(ActivityType.ATTACHMENT_REMOVED))
          {
              value = getAttachment().getFileName();

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