Projects >> FriendsHost >>df40a7bdf738c4fb8d0db746e6bef45670ecd5e9

Chunk
Conflicting content 
				return true;
			}
		});
<<<<<<< HEAD
		
		uLstFeed.setOnItemClickListener(new OnItemClickListener() {
			
			@Override
			public void onItemClick(AdapterView parent, View view, int position, long id) {
				FeedEntry feed = (FeedEntry) arrAdapterFeedPreview.getItem(position);
				fFeedDisplayDetailUI(feed);
			}
		});
=======
//		uLstFeed.setOnItemClickListener(new OnItemClickListener() {
//			
//			@Override
//			public void onItemClick(AdapterView parent, View view, int position, long id) {
//				FeedEntry feed = (FeedEntry) arrAdapterFeedPreview.getItem(position);
//				fFeedDisplayDetailUI(feed);
//			}
//		});

>>>>>>> 9076f490acdfdd1d12a38613c22bfe20b409b367
	}
	
	//Feed Resend UI
Solution content 
				return true;
			}
		});
		
//		uLstFeed.setOnItemClickListener(new OnItemClickListener() {
//			
//			@Override
//			public void onItemClick(AdapterView parent, View view, int position, long id) {
//				FeedEntry feed = (FeedEntry) arrAdapterFeedPreview.getItem(position);
//				fFeedDisplayDetailUI(feed);
//			}
//		});

	}
	
	//Feed Resend UI
File
PubSub.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
			if(resultCode == Activity.RESULT_OK)
			{
				String sns = data.getStringExtra(Const.SNS);
<<<<<<< HEAD
				FeedEntry feed = data.getParcelableExtra(Const.FEED_ITEM);
//				if(sns.equals(Const.SNS_FACEBOOK))
//				{
//					zFacebook.fResend(feed);
//				} 
//				else if (sns.equals(Const.SNS_RENREN))
//				{
//					zRenrenUtil.fResend(feed);
//				}
//				else if (sns.equals(Const.SNS_TWITTER))
//				{
//					zTwitterUtil.fResend(feed);
//				} else if (sns.equals(Const.SNS_SINA)) {
//					zSinaUtil.fResend(feed);
//				}
				this.zSnsOrg.GetSnsInstance(sns).fResend(feed);
=======
				//FeedEntry feed = data.getParcelableExtra(Const.FEED_ITEM);
				String feed_id = data.getStringExtra(Const.FID);
				FeedEntry feed = zFeedOrg.fGetFeedByID(displayedSns, feed_id);
				
				if(sns.equals(Const.SNS_FACEBOOK))
				{
					zFacebook.fResend(feed);
				} 
				else if (sns.equals(Const.SNS_RENREN))
				{
					zRenrenUtil.fResend(feed);
				}
				else if (sns.equals(Const.SNS_TWITTER))
				{
					zTwitterUtil.fResend(feed);
				} else if (sns.equals(Const.SNS_SINA)) {
					zSinaUtil.fResend(feed);
				}
>>>>>>> 9076f490acdfdd1d12a38613c22bfe20b409b367
			}
		}
		else
Solution content 
			if(resultCode == Activity.RESULT_OK)
			{
				String sns = data.getStringExtra(Const.SNS);
				//FeedEntry feed = data.getParcelableExtra(Const.FEED_ITEM);
				String feed_id = data.getStringExtra(Const.FID);
				FeedEntry feed = zFeedOrg.fGetFeedByID(displayedSns, feed_id);
				
if(sns.equals(Const.SNS_FACEBOOK))
				{
					zFacebook.fResend(feed);
				} 
				else if (sns.equals(Const.SNS_RENREN))
				{
					zRenrenUtil.fResend(feed);
				}
				else if (sns.equals(Const.SNS_TWITTER))
				{
					zTwitterUtil.fResend(feed);
				} else if (sns.equals(Const.SNS_SINA)) {
					zSinaUtil.fResend(feed);
				}
				this.zSnsOrg.GetSnsInstance(sns).fResend(feed);

			}
		}
		else
File
PubSub.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
				int cntComments = Integer.parseInt(entry.getComments().getCount());
				// comment get from Facebook only shows the 1st and the last entry
				// need more research here
<<<<<<< HEAD
				if (cntComments > 0) {
					if(entry.getComments().getData() != null)
=======
				if (cntComments > 0 && entry.getComments().getData() != null) {
>>>>>>> 9076f490acdfdd1d12a38613c22bfe20b409b367
					cntComments = Math.min(cntComments, entry.getComments().getData().size());
				} else {
					cntComments = 0;
Solution content 
				int cntComments = Integer.parseInt(entry.getComments().getCount());
				// comment get from Facebook only shows the 1st and the last entry
				// need more research here
				if (cntComments > 0 && entry.getComments().getData() != null) {
					if(entry.getComments().getData() != null)
					cntComments = Math.min(cntComments, entry.getComments().getData().size());
				} else {
					cntComments = 0;
File
FeedOrganisor.java
Developer's decision
Combination
Kind of conflict
If statement
Chunk
Conflicting content 
					cntComments = 0;
				}
				for (int j = 0; j < cntComments; j++) {
<<<<<<< HEAD
					if( entry.getComments().getData() != null)
					{
						FBFeedEntryComment comment = entry.getComments().getData().get(j);
						if (comment != null ) {
							comment.setSns(Const.SNS_FACEBOOK);
							comment.setCommetedfeedID(entry.getId());
							zDBHelper.fInsertComments(comment);
						}
=======
 					FBFeedEntryComment comment = entry.getComments().getData().get(j);
					if (comment != null ) {
						comment.setSns(Const.SNS_FACEBOOK);
						comment.setCommetedfeedID(entry.getId());
						zDBHelper.fInsertComments(comment);
>>>>>>> 9076f490acdfdd1d12a38613c22bfe20b409b367
					}
				}
Solution content 
					cntComments = 0;
				}
				for (int j = 0; j < cntComments; j++) {
					if( entry.getComments().getData() != null)
					{
                                         if (comment != null ) {
						comment.setSns(Const.SNS_FACEBOOK);
						comment.setCommetedfeedID(entry.getId());
						zDBHelper.fInsertComments(comment);


						}
					}
				}
File
FeedOrganisor.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable