r7251 - in dumbhippo/trunk/server/src/com/dumbhippo: persistence server/impl

[commits mugshot org]

Author: marinaz
Date: 2008-01-23 12:43:28 -0600 (Wed, 23 Jan 2008)
New Revision: 7251

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/persistence/BlockType.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java
Log:
Don't provide an external account source for BLOG_ENTRY blocks, because saying
"X blogged Y on Blog" doesn't make sense, it should just be "X blogged Y" (while 
we do say "X dugg Y on Digg"). 

Modified: dumbhippo/trunk/server/src/com/dumbhippo/persistence/BlockType.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/persistence/BlockType.java	2008-01-23 18:16:17 UTC (rev 7250)
+++ dumbhippo/trunk/server/src/com/dumbhippo/persistence/BlockType.java	2008-01-23 18:43:28 UTC (rev 7251)
@@ -310,11 +310,6 @@
 		public boolean isDirectlyChattable() {
 			return true;
 		}
-		
-		@Override
-		public ExternalAccountType getExternalAccountSource() {
-			return ExternalAccountType.BLOG;
-		}
 	},
 	DELICIOUS_PUBLIC_BOOKMARK { // 15
 		@Override

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java	2008-01-23 18:16:17 UTC (rev 7250)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java	2008-01-23 18:43:28 UTC (rev 7251)
@@ -361,7 +361,7 @@
                         } else {
                         	where = " on " + blockView.getBlockType().getExternalAccountSource().getSiteName();                        	
                         }
-                    } else if (!blockView.getBlockType().equals(BlockType.MUSIC_PERSON)) {
+                    } else if (!blockView.getBlockType().equals(BlockType.MUSIC_PERSON) && !blockView.getBlockType().equals(BlockType.BLOG_ENTRY)) {
                         // There are multiple options for how we know about someone's music (Rhapsody, Last.fm, 
                     	// iTunes, Yahoo Music Player, Rhythmbox). It'd be nice to be able to identify this here,
                     	// but for now, let's just not say anything. All other actions, like sharing a link,