Projects >> training >>362a3af535882fcb70217fef88c9d139eeafb6db

Chunk
Conflicting content
	}
	
	
<<<<<<< HEAD
	/** With the dashboard part, we can now receive selection from outside of this view */
	@Inject
	@Optional
	public void selectionChanged(@Named(IServiceConstants.ACTIVE_SELECTION) Object selection, 
			                     @Named(IServiceConstants.ACTIVE_PART) MPart currentPart)
	{
		// Nothing to do if nothing available.
		if (currentPart == null || selection == null || agencyViewer == null)
			return;
		
		// Is this selection coming from outside of this part ? 
		// In this case must set it on the viewer if created
		if ( ! VIEW_ID.equals(currentPart.getElementId()))
=======
	/** WIth the dashboard, we can now receive selection from outside of this view */
	@Inject
	@Optional
	public void selectionChanged(@Named(IServiceConstants.ACTIVE_SELECTION) Object selection, @Named(IServiceConstants.ACTIVE_PART) MPart currentPart)
	{
		// Is this selection coming outside of this part ? In this case must set
		// it on all viewers if created
		if ((currentPart != null) && ( ! VIEW_ID.equals(currentPart.getElementId())) && (agencyViewer != null) && (selection != null))
>>>>>>> 79f1fc97c760facc5ffaf2b76ba5e0cb2c85dbef
		{
			// Must recreate a structuredSelection ! :)
			IStructuredSelection ss = new StructuredSelection(selection);
Solution content
	}
	
	
	/** With the dashboard part, we can now receive selection from outside of this view */
	@Inject
	@Optional
	public void selectionChanged(@Named(IServiceConstants.ACTIVE_SELECTION) Object selection, 
			                     @Named(IServiceConstants.ACTIVE_PART) MPart currentPart)
	{
		// Nothing to do if nothing available.
		if (currentPart == null || selection == null || agencyViewer == null)
			return;
		
		// Is this selection coming from outside of this part ? 
		// In this case must set it on the viewer if created
		if ( ! VIEW_ID.equals(currentPart.getElementId()))
		{
			// Must recreate a structuredSelection ! :)
			IStructuredSelection ss = new StructuredSelection(selection);
File
RentalAgencyPart.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
If statement
Method signature