Description Mikaël Barbero 2011-05-20 05:05:47 EDT

I'd like to define the label/image of my AbstractDiffExtension within their generated ItemProvider, but it seems it is impossible. Here is a possible workaround: 

Generated AbstractDiffExtension subclasses should return null on call to getText() getImage() (manual change in the generated code) and the ModelStructureLabelProvider of ModelStructureMergeViewer should be changed to :

@Override
public Image getImage(Object object) {
	Image image = null;
	if (object instanceof AbstractDiffExtension) {
		image = (Image)((AbstractDiffExtension)object).getImage();
	} else if (object instanceof IFile) {
		image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
	} 

	// fallback to ItemProvider	
	if (image == null) {
		image = adapterProvider.getImage(object);
	}
	
	return image;
}

@Override
public String getText(Object object) {
	String text = null;
	if (object instanceof AbstractDiffExtension) {
		text = ((AbstractDiffExtension)object).getText();
	} else if (object instanceof IFile) {
		text = ((IFile)object).getName();
	} else if (object instanceof Resource) {
		text = ((Resource)object).getURI().lastSegment();
	}
	
	// fallback to ItemProvider
	if (text == null || "".equals(text)) { //$NON-NLS-1$
		text = adapterProvider.getText(object);
	}

	return text;
}

It does not change the behavior of existing code, it just change the logic to fallback to the ItemProvider instead of returning <null>.