diff options
| author | Mathieu Cartaud | 2016-06-15 08:13:57 +0000 |
|---|---|---|
| committer | Mathieu Cartaud | 2016-06-15 14:29:59 +0000 |
| commit | 6477d1125eebfd494f4a3d1a666519e24daedf9d (patch) | |
| tree | df98e6aaac6dfb813ea055617a1ce1387064f041 /plugins/org.eclipse.emf.compare.rcp.ui/src/org | |
| parent | 5722fba2307aeda65d7367dd302bcd9b20f02a7a (diff) | |
| download | org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.tar.gz org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.tar.xz org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.zip | |
Switch to Eclipse mars.2
Format all non generated classes to get ride of formatter
incompatibilities
Migrate checkstyle config for checkstyle 6.19
Change-Id: I8c2b31765053a3686de62320f893bedf4ad81d1f
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.rcp.ui/src/org')
46 files changed, 429 insertions, 382 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java index a58bdeabd..c0fe60a61 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java @@ -170,23 +170,23 @@ public class EMFCompareRCPUIPlugin extends AbstractUIPlugin { accessorFactoryRegistry = new AccessorFactoryRegistryImpl(); accessorFactoryRegistryListener = new AccessorFactoryExtensionRegistryListener(PLUGIN_ID, ACCESSOR_FACTORY_PPID, getLog(), accessorFactoryRegistry); - extensionRegistry.addListener(accessorFactoryRegistryListener, PLUGIN_ID - + "." + ACCESSOR_FACTORY_PPID); //$NON-NLS-1$ + extensionRegistry.addListener(accessorFactoryRegistryListener, + PLUGIN_ID + "." + ACCESSOR_FACTORY_PPID); //$NON-NLS-1$ accessorFactoryRegistryListener.readRegistry(extensionRegistry); differenceGroupExtenderRegistry = new DifferenceGroupExtenderRegistryImpl(); differenceGroupExtenderRegistryListener = new DifferenceGroupExtenderRegistryListener(PLUGIN_ID, DIFFERENCE_GROUP_EXTENDER_PPID, getLog(), differenceGroupExtenderRegistry); - extensionRegistry.addListener(differenceGroupExtenderRegistryListener, PLUGIN_ID - + "." + DIFFERENCE_GROUP_EXTENDER_PPID); //$NON-NLS-1$ + extensionRegistry.addListener(differenceGroupExtenderRegistryListener, + PLUGIN_ID + "." + DIFFERENCE_GROUP_EXTENDER_PPID); //$NON-NLS-1$ differenceGroupExtenderRegistryListener.readRegistry(extensionRegistry); matchEngineConfiguratorRegistry = new ConcurrentHashMap<String, IConfigurationUIFactory>(); matchEngineConfiguratorRegistryListener = new ConfigurationUIRegistryEventListener(PLUGIN_ID, MATCH_ENGINE_FACTORY_CONFIGURATION_UI_PPID, getLog(), matchEngineConfiguratorRegistry, EMFCompareRCPPlugin.getDefault().getMatchEngineFactoryDescriptorRegistry()); - extensionRegistry.addListener(matchEngineConfiguratorRegistryListener, PLUGIN_ID + '.' - + MATCH_ENGINE_FACTORY_CONFIGURATION_UI_PPID); + extensionRegistry.addListener(matchEngineConfiguratorRegistryListener, + PLUGIN_ID + '.' + MATCH_ENGINE_FACTORY_CONFIGURATION_UI_PPID); matchEngineConfiguratorRegistryListener.readRegistry(extensionRegistry); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/IComparisonAndScopeChange.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/IComparisonAndScopeChange.java index cab4d3eb8..af277d119 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/IComparisonAndScopeChange.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/IComparisonAndScopeChange.java @@ -15,7 +15,6 @@ import org.eclipse.emf.compare.scope.IComparisonScope; /** * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a> - * */ public interface IComparisonAndScopeChange { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/AdapterFactoryChange.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/AdapterFactoryChange.java index 6c9b7114f..adcf23ad8 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/AdapterFactoryChange.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/AdapterFactoryChange.java @@ -17,4 +17,4 @@ public class AdapterFactoryChange extends CompareEvent<AdapterFactory> implement public AdapterFactoryChange(AdapterFactory oldValue, AdapterFactory newValue) { super(oldValue, newValue); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/ComparisonAndScopeChange.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/ComparisonAndScopeChange.java index 5216f8137..8f19e30eb 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/ComparisonAndScopeChange.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/ComparisonAndScopeChange.java @@ -32,36 +32,40 @@ public class ComparisonAndScopeChange implements ICompareEvent, IComparisonAndSc this.newScope = newScope; } - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.rcp.ui.internal.configuration.IComparisonAndScopeChange#getOldComparison() */ public Comparison getOldComparison() { return oldComparison; } - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.rcp.ui.internal.configuration.IComparisonAndScopeChange#getNewComparison() */ public Comparison getNewComparison() { return newComparison; } - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.rcp.ui.internal.configuration.IComparisonAndScopeChange#getOldScope() */ public IComparisonScope getOldScope() { return oldScope; } - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.rcp.ui.internal.configuration.IComparisonAndScopeChange#getNewScope() */ public IComparisonScope getNewScope() { return newScope; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/ConfigurationUIRegistryEventListener.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/ConfigurationUIRegistryEventListener.java index bd679c118..70df1071b 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/ConfigurationUIRegistryEventListener.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/ConfigurationUIRegistryEventListener.java @@ -73,8 +73,8 @@ public class ConfigurationUIRegistryEventListener extends AbstractRegistryEventL logMissingAttribute(element, ITEM_TO_CONFIGURE_ATTR); ret = false; } else if (element.getAttribute(ITEM_TO_CONFIGURE_ATTR) != null) { - Object itemToConfigure = registryOfConfiguredItem.getItemDescriptor(element - .getAttribute(ITEM_TO_CONFIGURE_ATTR)); + Object itemToConfigure = registryOfConfiguredItem + .getItemDescriptor(element.getAttribute(ITEM_TO_CONFIGURE_ATTR)); if (itemToConfigure == null) { log(IStatus.WARNING, element, EMFCompareRCPUIMessages .getString("ConfigurationUIRegistryEventListener.incorrectIdParameter.message")); //$NON-NLS-1$ @@ -108,14 +108,12 @@ public class ConfigurationUIRegistryEventListener extends AbstractRegistryEventL String itemToConfigureID = element.getAttribute(ITEM_TO_CONFIGURE_ATTR); IConfigurationUIFactory previous = registry.put(itemToConfigureID, configurationFactory); if (previous != null) { - log(IStatus.WARNING, element, EMFCompareRCPUIMessages.getString( - "duplicate.extension", registry.getClass().getName())); //$NON-NLS-1$ + log(IStatus.WARNING, element, EMFCompareRCPUIMessages.getString("duplicate.extension", //$NON-NLS-1$ + registry.getClass().getName())); } } else { - log(IStatus.WARNING, - element, - EMFCompareRCPUIMessages - .getString("ConfigurationUIRegistryEventListener.incorrectConfiguratorParameter.message")); //$NON-NLS-1$ + log(IStatus.WARNING, element, EMFCompareRCPUIMessages.getString( + "ConfigurationUIRegistryEventListener.incorrectConfiguratorParameter.message")); //$NON-NLS-1$ } } catch (CoreException e) { log(element, e); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguatorUIFactory.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguatorUIFactory.java index ae6567b63..dc3edf4dd 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguatorUIFactory.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguatorUIFactory.java @@ -27,7 +27,8 @@ public class DefaultMatchEngineConfiguatorUIFactory implements IConfigurationUIF * {@inheritDoc} */ public AbstractConfigurationUI createUI(Composite parent, int style, Preferences pref) { - DefaultMatchEngineConfiguratorUI composite = new DefaultMatchEngineConfiguratorUI(parent, style, pref); + DefaultMatchEngineConfiguratorUI composite = new DefaultMatchEngineConfiguratorUI(parent, style, + pref); composite.createContent(); return composite; } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguratorUI.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguratorUI.java index c54419379..e5f4c480c 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguratorUI.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguratorUI.java @@ -62,14 +62,14 @@ public class DefaultMatchEngineConfiguratorUI extends AbstractConfigurationUI { this.setLayout(gridLayout); Label text = new Label(this, SWT.WRAP); - text.setText(EMFCompareRCPUIMessages - .getString("DefaultMatchEngineConfiguratorUI.useIdentifier.label")); //$NON-NLS-1$ + text.setText( + EMFCompareRCPUIMessages.getString("DefaultMatchEngineConfiguratorUI.useIdentifier.label")); //$NON-NLS-1$ text.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, true, false)); whenAvailableButton = new Button(this, SWT.RADIO | SWT.WRAP); whenAvailableButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, true, false)); - whenAvailableButton.setText(EMFCompareRCPUIMessages - .getString("DefaultMatchEngineConfiguratorUI.whenAvailable.label")); //$NON-NLS-1$ + whenAvailableButton.setText( + EMFCompareRCPUIMessages.getString("DefaultMatchEngineConfiguratorUI.whenAvailable.label")); //$NON-NLS-1$ onlyButton = new Button(this, SWT.RADIO | SWT.WRAP); onlyButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, true, false)); @@ -122,16 +122,16 @@ public class DefaultMatchEngineConfiguratorUI extends AbstractConfigurationUI { public void resetDefault() { // Set default if (whenAvailableButton != null && !whenAvailableButton.isDisposed()) { - whenAvailableButton - .setSelection(DefaultRCPMatchEngineFactory.DEFAULT_USE_IDENTIFIER_ATRIBUTE == UseIdentifiers.WHEN_AVAILABLE); + whenAvailableButton.setSelection( + DefaultRCPMatchEngineFactory.DEFAULT_USE_IDENTIFIER_ATRIBUTE == UseIdentifiers.WHEN_AVAILABLE); } if (onlyButton != null && !onlyButton.isDisposed()) { - onlyButton - .setSelection(DefaultRCPMatchEngineFactory.DEFAULT_USE_IDENTIFIER_ATRIBUTE == UseIdentifiers.ONLY); + onlyButton.setSelection( + DefaultRCPMatchEngineFactory.DEFAULT_USE_IDENTIFIER_ATRIBUTE == UseIdentifiers.ONLY); } if (neverButton != null && !neverButton.isDisposed()) { - neverButton - .setSelection(DefaultRCPMatchEngineFactory.DEFAULT_USE_IDENTIFIER_ATRIBUTE == UseIdentifiers.NEVER); + neverButton.setSelection( + DefaultRCPMatchEngineFactory.DEFAULT_USE_IDENTIFIER_ATRIBUTE == UseIdentifiers.NEVER); } dataHolder.setValue(DefaultRCPMatchEngineFactory.DEFAULT_USE_IDENTIFIER_ATRIBUTE); try { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/SingleStructuralFeatureAccessorFactory.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/SingleStructuralFeatureAccessorFactory.java index f0a3690ef..52206f37d 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/SingleStructuralFeatureAccessorFactory.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/SingleStructuralFeatureAccessorFactory.java @@ -80,7 +80,8 @@ public class SingleStructuralFeatureAccessorFactory extends AbstractAccessorFact * java.lang.Object) */ public ITypedElement createAncestor(AdapterFactory adapterFactory, Object target) { - return new SingleStructuralFeatureAccessorImpl(adapterFactory, (Diff)target, MergeViewerSide.ANCESTOR); + return new SingleStructuralFeatureAccessorImpl(adapterFactory, (Diff)target, + MergeViewerSide.ANCESTOR); } } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java index 7dc8e069e..262045b68 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java @@ -126,16 +126,16 @@ public class ContainmentReferenceChangeAccessorImpl extends AbstractStructuralFe } } else if (getSide() != MergeViewerSide.ANCESTOR || (getSide() == MergeViewerSide.ANCESTOR && match.getOrigin() != null)) { - ResourceAttachmentChange diff = getFirst(filter(match.getDifferences(), - ResourceAttachmentChange.class), null); - container = new MergeViewerItem.Container(getComparison(), diff, match.getLeft(), match - .getRight(), match.getOrigin(), getSide(), getRootAdapterFactory()); + ResourceAttachmentChange diff = getFirst( + filter(match.getDifferences(), ResourceAttachmentChange.class), null); + container = new MergeViewerItem.Container(getComparison(), diff, match.getLeft(), + match.getRight(), match.getOrigin(), getSide(), getRootAdapterFactory()); items.add(container); } } - final IMergeViewerItem newContainer = ResourceUIUtil.addNewContainerForNotLoadedFragmentMatches( - items, getSide(), getComparison(), getRootAdapterFactory()); + final IMergeViewerItem newContainer = ResourceUIUtil.addNewContainerForNotLoadedFragmentMatches(items, + getSide(), getComparison(), getRootAdapterFactory()); if (newContainer != null) { ret.add(newContainer); } else { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/FeatureMapKeyChangeAccessorImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/FeatureMapKeyChangeAccessorImpl.java index 4b30d0316..b9b631b45 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/FeatureMapKeyChangeAccessorImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/FeatureMapKeyChangeAccessorImpl.java @@ -61,8 +61,8 @@ public class FeatureMapKeyChangeAccessorImpl extends AbstractStructuralFeatureAc final EStructuralFeature leftKey = getKey(MergeViewerSide.LEFT); final EStructuralFeature rightKey = getKey(MergeViewerSide.RIGHT); final EStructuralFeature ancestorKey = getKey(MergeViewerSide.ANCESTOR); - final MergeViewerItem item = new MergeViewerItem(getComparison(), getInitialDiff(), leftKey, - rightKey, ancestorKey, getSide(), getRootAdapterFactory()); + final MergeViewerItem item = new MergeViewerItem(getComparison(), getInitialDiff(), leftKey, rightKey, + ancestorKey, getSide(), getRootAdapterFactory()); return ImmutableList.of(item); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java index 08eca5569..a3990f153 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java @@ -159,16 +159,16 @@ public class MatchAccessor extends AbstractTypedElementAdapter implements ICompa } } else if (getSide() != MergeViewerSide.ANCESTOR || (getSide() == MergeViewerSide.ANCESTOR && match.getOrigin() != null)) { - ResourceAttachmentChange diff = getFirst(filter(match.getDifferences(), - ResourceAttachmentChange.class), null); - container = new MergeViewerItem.Container(getComparison(), diff, match.getLeft(), match - .getRight(), match.getOrigin(), getSide(), getRootAdapterFactory()); + ResourceAttachmentChange diff = getFirst( + filter(match.getDifferences(), ResourceAttachmentChange.class), null); + container = new MergeViewerItem.Container(getComparison(), diff, match.getLeft(), + match.getRight(), match.getOrigin(), getSide(), getRootAdapterFactory()); items.add(container); } } - final IMergeViewerItem newContainer = ResourceUIUtil.addNewContainerForNotLoadedFragmentMatches( - items, getSide(), getComparison(), getRootAdapterFactory()); + final IMergeViewerItem newContainer = ResourceUIUtil.addNewContainerForNotLoadedFragmentMatches(items, + getSide(), getComparison(), getRootAdapterFactory()); if (newContainer != null) { ret.add(newContainer); } else { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java index 4f7bd3975..b62132a80 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java @@ -84,8 +84,8 @@ public class ResourceContentsAccessorImpl extends AbstractTypedElementAdapter im */ public IMergeViewerItem getInitialItem() { Diff initialDiff = fDiff; - EObject diffValue = (EObject)MergeViewerUtil.getResourceAttachmentChangeValue( - (ResourceAttachmentChange)initialDiff, getSide()); + EObject diffValue = (EObject)MergeViewerUtil + .getResourceAttachmentChangeValue((ResourceAttachmentChange)initialDiff, getSide()); if (DifferenceState.MERGED == initialDiff.getState()) { Object left = MergeViewerUtil.getValueFromResourceAttachmentChange( (ResourceAttachmentChange)initialDiff, getComparison(), MergeViewerSide.LEFT); @@ -194,8 +194,8 @@ public class ResourceContentsAccessorImpl extends AbstractTypedElementAdapter im * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.legacy.ITypedElement#getImage() */ public Image getImage() { - return ExtendedImageRegistry.getInstance().getImage( - EcoreEditPlugin.getPlugin().getImage("full/obj16/EObject")); //$NON-NLS-1$ + return ExtendedImageRegistry.getInstance() + .getImage(EcoreEditPlugin.getPlugin().getImage("full/obj16/EObject")); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceLocationChangeAccessorImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceLocationChangeAccessorImpl.java index 81d40f4c4..233392187 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceLocationChangeAccessorImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceLocationChangeAccessorImpl.java @@ -74,8 +74,9 @@ public class ResourceLocationChangeAccessorImpl extends AbstractTypedElementAdap * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.ICompareAccessor#getInitialItem() */ public IMergeViewerItem getInitialItem() { - return new MergeViewerItem(fComparison, fDiff, fOwnerMatchResource.getLeft(), fOwnerMatchResource - .getRight(), fOwnerMatchResource.getOrigin(), fSide, getRootAdapterFactory()); + return new MergeViewerItem(fComparison, fDiff, fOwnerMatchResource.getLeft(), + fOwnerMatchResource.getRight(), fOwnerMatchResource.getOrigin(), fSide, + getRootAdapterFactory()); } /** diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/SingleStructuralFeatureAccessorImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/SingleStructuralFeatureAccessorImpl.java index 6e2a3d318..06ef29f8b 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/SingleStructuralFeatureAccessorImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/SingleStructuralFeatureAccessorImpl.java @@ -38,7 +38,8 @@ public class SingleStructuralFeatureAccessorImpl extends AbstractStructuralFeatu * @param side * the side of the accessor. */ - public SingleStructuralFeatureAccessorImpl(AdapterFactory adapterFactory, Diff diff, MergeViewerSide side) { + public SingleStructuralFeatureAccessorImpl(AdapterFactory adapterFactory, Diff diff, + MergeViewerSide side) { super(adapterFactory, diff, side); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/StringAttributeChangeAccessor.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/StringAttributeChangeAccessor.java index 484097866..e155549b0 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/StringAttributeChangeAccessor.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/StringAttributeChangeAccessor.java @@ -107,8 +107,8 @@ public class StringAttributeChangeAccessor implements ITypedElement, IStreamCont * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.legacy.ITypedElement#getImage() */ public Image getImage() { - return ExtendedImageRegistry.getInstance().getImage( - EcoreEditPlugin.getPlugin().getImage("full/obj16/EAttribute")); //$NON-NLS-1$ + return ExtendedImageRegistry.getInstance() + .getImage(EcoreEditPlugin.getPlugin().getImage("full/obj16/EAttribute")); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/ColorChangeEvent.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/ColorChangeEvent.java index 705376387..d6d70bb17 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/ColorChangeEvent.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/ColorChangeEvent.java @@ -17,7 +17,7 @@ package org.eclipse.emf.compare.rcp.ui.internal.mergeviewer; */ public class ColorChangeEvent implements IColorChangeEvent { - /** Id of the color that have changed.*/ + /** Id of the color that have changed. */ private final String colorId; /** diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/CompareColorImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/CompareColorImpl.java index fcc8b41b6..6bb02ecfc 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/CompareColorImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/CompareColorImpl.java @@ -117,8 +117,8 @@ public class CompareColorImpl implements RemovalListener<RGB, Color>, ICompareCo public CompareColorImpl(Display fDisplay, boolean leftIsLocal, ColorRegistry colorRegistry) { this.fDisplay = fDisplay; this.fLeftIsLocal = leftIsLocal; - this.fColors = CacheBuilder.newBuilder().maximumSize(MAX_CACHE_SIZE).removalListener(this).build( - new CacheLoader<RGB, Color>() { + this.fColors = CacheBuilder.newBuilder().maximumSize(MAX_CACHE_SIZE).removalListener(this) + .build(new CacheLoader<RGB, Color>() { @Override public Color load(RGB rgb) throws Exception { return new Color(CompareColorImpl.this.fDisplay, rgb); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractStructuredMergeViewer.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractStructuredMergeViewer.java index 6115c0d34..205b83310 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractStructuredMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractStructuredMergeViewer.java @@ -142,8 +142,8 @@ public abstract class AbstractStructuredMergeViewer extends AbstractMergeViewer * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ public void selectionChanged(SelectionChangedEvent event) { - fireSelectionChanged(new SelectionChangedEvent(AbstractStructuredMergeViewer.this, event - .getSelection())); + fireSelectionChanged( + new SelectionChangedEvent(AbstractStructuredMergeViewer.this, event.getSelection())); } } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractTableOrTreeMergeViewer.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractTableOrTreeMergeViewer.java index ed9d1f369..4f5ba6157 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractTableOrTreeMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractTableOrTreeMergeViewer.java @@ -150,10 +150,11 @@ public abstract class AbstractTableOrTreeMergeViewer extends AbstractStructuredM if (diff != null) { if (MergeViewerUtil.isVisibleInMergeViewer(diff, getDifferenceGroupProvider(), getDifferenceFilter()) - && !MergeViewerUtil.isMarkAsMerged(diff, mergeViewerItem, getCompareConfiguration())) { + && !MergeViewerUtil.isMarkAsMerged(diff, mergeViewerItem, + getCompareConfiguration())) { if (mergeViewerItem.isInsertionPoint()) { - paintItemDiffBox(event, itemWrapper, diff, getBoundsForInsertionPoint(event, - itemWrapper)); + paintItemDiffBox(event, itemWrapper, diff, + getBoundsForInsertionPoint(event, itemWrapper)); } else { paintItemDiffBox(event, itemWrapper, diff, getBounds(event, itemWrapper)); } @@ -222,12 +223,13 @@ public abstract class AbstractTableOrTreeMergeViewer extends AbstractStructuredM * @param g * the SWT GC tool. */ - private void drawLineFromCenterToBox(AbstractTableOrTreeItemWrapper itemWrapper, Rectangle boxBounds, GC g) { + private void drawLineFromCenterToBox(AbstractTableOrTreeItemWrapper itemWrapper, Rectangle boxBounds, + GC g) { AbstractTableOrTreeItemWrapper parent = itemWrapper.getParentItem(); final int xOffset; if (getContentProvider() instanceof ITreeContentProvider) { - final boolean hasChildren = ((ITreeContentProvider)getContentProvider()).hasChildren(itemWrapper - .getData()); + final boolean hasChildren = ((ITreeContentProvider)getContentProvider()) + .hasChildren(itemWrapper.getData()); if (hasChildren) { if (parent != null) { xOffset = parent.getImageBounds(0).x; @@ -258,7 +260,8 @@ public abstract class AbstractTableOrTreeMergeViewer extends AbstractStructuredM * @param g * the SWT GC tool. */ - private void drawLineFromBoxToCenter(AbstractTableOrTreeItemWrapper itemWrapper, Rectangle boxBounds, GC g) { + private void drawLineFromBoxToCenter(AbstractTableOrTreeItemWrapper itemWrapper, Rectangle boxBounds, + GC g) { Rectangle itemBounds = itemWrapper.getBounds(); Rectangle clientArea = itemWrapper.getParent().getClientArea(); Point from = new Point(0, 0); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java index 6e57c46a1..87a6f33b7 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java @@ -87,8 +87,8 @@ public class TableMergeViewer extends AbstractTableOrTreeMergeViewer { fInfoViewer = new InfoViewer(composite, getSide()); fInfoViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1)); - fTableViewer = new TableViewer(composite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL - | SWT.FULL_SELECTION); + fTableViewer = new TableViewer(composite, + SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION); fTableViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); return composite; @@ -294,8 +294,8 @@ public class TableMergeViewer extends AbstractTableOrTreeMergeViewer { if (getLabelProvider() instanceof ILabelProvider) { ILabelProvider labelProvider = (ILabelProvider)getLabelProvider(); - fFeatureLabel.setText(EMFCompareRCPUIMessages - .getString("TableMergeViewer.featureMapEntryKeyLabel")); //$NON-NLS-1$ + fFeatureLabel.setText( + EMFCompareRCPUIMessages.getString("TableMergeViewer.featureMapEntryKeyLabel")); //$NON-NLS-1$ fEObjectIcon.setImage(labelProvider.getImage(entryValue)); fEObjectLabel.setText(labelProvider.getText(entryValue)); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java index 5358e5e1d..1e790a75f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java @@ -357,15 +357,14 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { final List<Object> sideContent = ReferenceUtil.getAsList((EObject)getSideValue(getSide()), eStructuralFeature); - final List<Object> oppositeContent = ReferenceUtil.getAsList((EObject)getSideValue(getSide() - .opposite()), eStructuralFeature); + final List<Object> oppositeContent = ReferenceUtil + .getAsList((EObject)getSideValue(getSide().opposite()), eStructuralFeature); for (Diff diff : Lists.reverse(differences)) { EObject value = (EObject)MergeViewerUtil.getDiffValue(diff); Match match = getComparison().getMatch(value); - if (!isPseudoAddConflict(diff) - && (isAddOnOppositeSide(diff) || isDeleteOnSameSide(diff) || isInsertOnBothSides(diff, - match))) { + if (!isPseudoAddConflict(diff) && (isAddOnOppositeSide(diff) || isDeleteOnSameSide(diff) + || isInsertOnBothSides(diff, match))) { if (match == null && diff.getState() == DifferenceState.MERGED) { EObject bestSideValue = (EObject)getBestSideValue(); match = getComparison().getMatch(bestSideValue); @@ -373,20 +372,22 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { } if (match != null && !isRealAddConflict(diff, match)) { - IMergeViewerItem.Container insertionPoint = new MergeViewerItem.Container( - getComparison(), diff, match.getLeft(), match.getRight(), match.getOrigin(), - getSide(), getAdapterFactory()); + IMergeViewerItem.Container insertionPoint = new MergeViewerItem.Container(getComparison(), + diff, match.getLeft(), match.getRight(), match.getOrigin(), getSide(), + getAdapterFactory()); final int insertionIndex; if (match.getLeft() == null && match.getRight() == null && diff.getConflict() != null && diff.getConflict().getKind() == ConflictKind.PSEUDO) { // pseudo conflict delete... - insertionIndex = ReferenceUtil.getAsList( - (EObject)getSideValue(MergeViewerSide.ANCESTOR), eStructuralFeature).indexOf( - value); + insertionIndex = ReferenceUtil + .getAsList((EObject)getSideValue(MergeViewerSide.ANCESTOR), + eStructuralFeature) + .indexOf(value); } else { - insertionIndex = Math.min(DiffUtil.findInsertionIndex(comparison, oppositeContent, - sideContent, value), ret.size()); + insertionIndex = Math.min( + DiffUtil.findInsertionIndex(comparison, oppositeContent, sideContent, value), + ret.size()); } // offset the insertion by the number of previous insertion points in the list @@ -525,7 +526,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { EObject value = (EObject)MergeViewerUtil.getDiffValue(diff); Match match = getComparison().getMatch(value); - if (isAddOnOppositeSide(diff) || isDeleteOnSameSide(diff) || isInsertOnBothSides(diff, match)) { + if (isAddOnOppositeSide(diff) || isDeleteOnSameSide(diff) + || isInsertOnBothSides(diff, match)) { if (match == null && diff.getState() == DifferenceState.MERGED) { EObject bestSideValue = (EObject)getBestSideValue(); match = getComparison().getMatch(bestSideValue); @@ -574,8 +576,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { Match match = getComparison().getMatch(eObject); - ReferenceChange referenceChange = (ReferenceChange)getFirst(filter(getComparison().getDifferences( - eObject), CONTAINMENT_REFERENCE_CHANGE), null); + ReferenceChange referenceChange = (ReferenceChange)getFirst( + filter(getComparison().getDifferences(eObject), CONTAINMENT_REFERENCE_CHANGE), null); if (match != null) { return new MergeViewerItem.Container(getComparison(), referenceChange, match, getSide(), getAdapterFactory()); @@ -680,8 +682,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { ITreeItemContentProvider treeItemContentProvider = (ITreeItemContentProvider)getAdapterFactory() .adapt(sideValue, ITreeItemContentProvider.class); - Object parent = treeItemContentProvider != null ? treeItemContentProvider - .getParent(sideValue) : null; + Object parent = treeItemContentProvider != null ? treeItemContentProvider.getParent(sideValue) + : null; if (parent instanceof EObject) { ret = createBasicContainer((EObject)parent); } else if (parent instanceof Resource) { @@ -707,7 +709,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { if (ResourceUIUtil.isFragment(uri)) { final Object object = getBestSideValue(); final Match matchOfValue = getComparison().getMatch((EObject)object); - final NotLoadedFragmentMatch notLoadedFragmentMatch = new NotLoadedFragmentMatch(matchOfValue); + final NotLoadedFragmentMatch notLoadedFragmentMatch = new NotLoadedFragmentMatch( + matchOfValue); parent = new MergeViewerItem.Container(getComparison(), getDiff(), notLoadedFragmentMatch, notLoadedFragmentMatch, notLoadedFragmentMatch, getSide(), getAdapterFactory()); } else { @@ -809,8 +812,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { EObject bestSideValue = (EObject)getBestSideValue(); Match match = getComparison().getMatch(bestSideValue); - Iterable<Diff> differences = match == null ? Collections.<Diff> emptyList() : ImmutableList - .copyOf(filter(match.getDifferences(), CONTAINMENT_REFERENCE_CHANGE)); + Iterable<Diff> differences = match == null ? Collections.<Diff> emptyList() + : ImmutableList.copyOf(filter(match.getDifferences(), CONTAINMENT_REFERENCE_CHANGE)); Collection<? extends EStructuralFeature> childrenFeatures = getChildrenFeatures(bestSideValue); for (EStructuralFeature eStructuralFeature : childrenFeatures) { @@ -840,8 +843,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { if (getSide() != MergeViewerSide.ANCESTOR) { Iterable<Diff> differencesOnFeature = filter(differences, onFeature(reference.getName())); - Iterable<Diff> filteredDiffs = filter(differencesOnFeature, visibleInMergeViewer(predicate, - groupProvider)); + Iterable<Diff> filteredDiffs = filter(differencesOnFeature, + visibleInMergeViewer(predicate, groupProvider)); return yieldsInsertionPoint(filteredDiffs); } @@ -867,8 +870,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { if (getSide() != MergeViewerSide.ANCESTOR) { Iterable<Diff> differencesOnFeature = filter(differences, onFeatures(derivedFeatures)); - Iterable<Diff> filteredDiffs = filter(differencesOnFeature, visibleInMergeViewer(predicate, - groupProvider)); + Iterable<Diff> filteredDiffs = filter(differencesOnFeature, + visibleInMergeViewer(predicate, groupProvider)); return yieldsInsertionPoint(filteredDiffs); } @@ -876,8 +879,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { } private boolean hasNotLoadedFragmentsItems(Match match) { - Collection<Match> childrenMatches = ResourceUIUtil.getChildrenMatchWithNotLoadedParent( - getComparison(), match, getSide()); + Collection<Match> childrenMatches = ResourceUIUtil + .getChildrenMatchWithNotLoadedParent(getComparison(), match, getSide()); return !childrenMatches.isEmpty(); } @@ -904,13 +907,14 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { Object sideValue = getSideValue(getSide()); EObject bestSideValue = (EObject)getBestSideValue(); - final Collection<? extends EStructuralFeature> childrenFeatures = getChildrenFeatures(bestSideValue); + final Collection<? extends EStructuralFeature> childrenFeatures = getChildrenFeatures( + bestSideValue); Match match = getComparison().getMatch(bestSideValue); final ImmutableList<Diff> differences; if (match != null) { - differences = ImmutableList.copyOf(filter(match.getDifferences(), - CONTAINMENT_REFERENCE_CHANGE)); + differences = ImmutableList + .copyOf(filter(match.getDifferences(), CONTAINMENT_REFERENCE_CHANGE)); } else { differences = ImmutableList.of(); } @@ -945,8 +949,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { for (Match match : matches) { final MergeViewerItem.Container container; if (match instanceof NotLoadedFragmentMatch) { - container = new MergeViewerItem.Container(getComparison(), getDiff(), match, match, - match, getSide(), getAdapterFactory()); + container = new MergeViewerItem.Container(getComparison(), getDiff(), match, match, match, + getSide(), getAdapterFactory()); } else { container = new MergeViewerItem.Container(getComparison(), getDiff(), match.getLeft(), match.getRight(), match.getOrigin(), getSide(), getAdapterFactory()); @@ -967,8 +971,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { */ private List<IMergeViewerItem> getNotLoadedFragmentsItems(Match match) { final List<IMergeViewerItem> ret = newArrayList(); - final Collection<Match> childrenMatches = ResourceUIUtil.getChildrenMatchWithNotLoadedParent( - getComparison(), match, getSide()); + final Collection<Match> childrenMatches = ResourceUIUtil + .getChildrenMatchWithNotLoadedParent(getComparison(), match, getSide()); if (childrenMatches.size() > 0) { boolean setNames = childrenMatches.size() > 1; for (Match child : childrenMatches) { @@ -1007,8 +1011,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { List<Object> featureContent = ReferenceUtil.getAsList((EObject)container, reference); List<IMergeViewerItem> mergeViewerItem = createMergeViewerItemFrom(featureContent); if (getSide() != MergeViewerSide.ANCESTOR) { - Iterable<? extends Diff> differencesOnFeature = filter(differences, onFeature(reference - .getName())); + Iterable<? extends Diff> differencesOnFeature = filter(differences, + onFeature(reference.getName())); List<? extends Diff> filteredDiffs = filteredDiffs(differencesOnFeature, predicate, group); ret.addAll(createInsertionPoints(getComparison(), reference, mergeViewerItem, filteredDiffs)); } else { @@ -1048,7 +1052,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { if (getSide() != MergeViewerSide.ANCESTOR) { Iterable<Diff> differencesOnFeature = filter(differences, onFeatures(derivedFeatures)); List<? extends Diff> filteredDiffs = filteredDiffs(differencesOnFeature, predicate, group); - ret.addAll(createInsertionPoints(getComparison(), featureMap, mergeViewerItem, filteredDiffs)); + ret.addAll( + createInsertionPoints(getComparison(), featureMap, mergeViewerItem, filteredDiffs)); } else { ret.addAll(mergeViewerItem); } @@ -1072,7 +1077,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { */ protected Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { Collection<? extends EStructuralFeature> ret = Lists.newArrayList(); - Collection<? extends EStructuralFeature> childrenFeaturesFromItemProviderAdapter = getChildrenFeaturesFromItemProviderAdapter(object); + Collection<? extends EStructuralFeature> childrenFeaturesFromItemProviderAdapter = getChildrenFeaturesFromItemProviderAdapter( + object); if (childrenFeaturesFromItemProviderAdapter == null) { ret = getChildrenFeaturesFromEClass(object); } else { @@ -1097,8 +1103,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { Object object) { Collection<? extends EStructuralFeature> ret = null; - Object treeItemContentProvider = getAdapterFactory() - .adapt(object, ITreeItemContentProvider.class); + Object treeItemContentProvider = getAdapterFactory().adapt(object, + ITreeItemContentProvider.class); if (treeItemContentProvider instanceof ItemProviderAdapter) { ItemProviderAdapter itemProviderAdapter = (ItemProviderAdapter)treeItemContentProvider; @@ -1106,8 +1112,8 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { try { method = itemProviderAdapter.getClass().getMethod("getChildrenFeatures", Object.class); //$NON-NLS-1$ method.setAccessible(true); - ret = (Collection<? extends EStructuralFeature>)method - .invoke(itemProviderAdapter, object); + ret = (Collection<? extends EStructuralFeature>)method.invoke(itemProviderAdapter, + object); } catch (SecurityException e) { } catch (NoSuchMethodException e) { } catch (IllegalArgumentException e) { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java index 47cdd22db..fcc24a51a 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java @@ -84,7 +84,8 @@ public class ResourceAttachmentChangeMergeViewerItem extends MergeViewerItem.Con */ @SuppressWarnings("unchecked") @Override - public IMergeViewerItem[] getChildren(IDifferenceGroupProvider group, Predicate<? super EObject> filters) { + public IMergeViewerItem[] getChildren(IDifferenceGroupProvider group, + Predicate<? super EObject> filters) { Object sideValue = getSideValue(getSide()); Object bestSideValue = getBestSideValue(); @@ -128,9 +129,8 @@ public class ResourceAttachmentChangeMergeViewerItem extends MergeViewerItem.Con private boolean isUnrelated(ResourceAttachmentChange change, Object resource) { final String resourceURI = change.getResourceURI(); - return resource == null - || (resource instanceof Resource && resourceURI != null && !resourceURI - .equals(((Resource)resource).getURI().toString())); + return resource == null || (resource instanceof Resource && resourceURI != null + && !resourceURI.equals(((Resource)resource).getURI().toString())); } /** @@ -146,8 +146,8 @@ public class ResourceAttachmentChangeMergeViewerItem extends MergeViewerItem.Con Match match = getComparison().getMatch(eObject); if (match != null) { - ResourceAttachmentChange rac = getFirst(filter(match.getDifferences(), - ResourceAttachmentChange.class), null); + ResourceAttachmentChange rac = getFirst( + filter(match.getDifferences(), ResourceAttachmentChange.class), null); if (rac != null) { Object left = match.getLeft(); Object right = match.getRight(); @@ -221,17 +221,16 @@ public class ResourceAttachmentChangeMergeViewerItem extends MergeViewerItem.Con if ((b1 || b2 || b3 || b4 || b5 || b6 || b7 || b8) && b9) { Object ancestor = MergeViewerUtil.getValueFromResourceAttachmentChange(diff, comparison, IMergeViewer.MergeViewerSide.ANCESTOR); - if (left != null - && MergeViewerUtil.getResource(comparison, IMergeViewer.MergeViewerSide.LEFT, diff) == null) { + if (left != null && MergeViewerUtil.getResource(comparison, IMergeViewer.MergeViewerSide.LEFT, + diff) == null) { left = null; } - if (right != null - && MergeViewerUtil.getResource(comparison, IMergeViewer.MergeViewerSide.RIGHT, diff) == null) { + if (right != null && MergeViewerUtil.getResource(comparison, + IMergeViewer.MergeViewerSide.RIGHT, diff) == null) { right = null; } - if (ancestor != null - && MergeViewerUtil.getResource(comparison, IMergeViewer.MergeViewerSide.ANCESTOR, - diff) == null) { + if (ancestor != null && MergeViewerUtil.getResource(comparison, + IMergeViewer.MergeViewerSide.ANCESTOR, diff) == null) { ancestor = null; } if (b5 || b8) { @@ -240,8 +239,8 @@ public class ResourceAttachmentChangeMergeViewerItem extends MergeViewerItem.Con if (b6 || b7) { right = null; } - IMergeViewerItem insertionPoint = new MergeViewerItem.Container(comparison, diff, left, - right, ancestor, getSide(), getAdapterFactory()); + IMergeViewerItem insertionPoint = new MergeViewerItem.Container(comparison, diff, left, right, + ancestor, getSide(), getAdapterFactory()); final int insertionIndex; if (left == null && right == null && ancestor != null) { @@ -296,8 +295,8 @@ public class ResourceAttachmentChangeMergeViewerItem extends MergeViewerItem.Con expectedResource = MergeViewerUtil.getResource(comparison, IMergeViewer.MergeViewerSide.LEFT, diff); } else { - initialResource = MergeViewerUtil - .getResource(comparison, IMergeViewer.MergeViewerSide.LEFT, diff); + initialResource = MergeViewerUtil.getResource(comparison, IMergeViewer.MergeViewerSide.LEFT, + diff); expectedResource = MergeViewerUtil.getResource(comparison, IMergeViewer.MergeViewerSide.RIGHT, diff); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/AdapterFactoriesPreferencePage.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/AdapterFactoriesPreferencePage.java index e095377d0..21f9f394a 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/AdapterFactoriesPreferencePage.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/AdapterFactoriesPreferencePage.java @@ -89,8 +89,8 @@ public class AdapterFactoriesPreferencePage extends PreferencePage implements IW } private void fillViewer() { - List<RankedAdapterFactoryDescriptor> descriptors = Lists.newArrayList(EMFCompareRCPPlugin - .getDefault().getAdapterFactoryRegistry().getDescriptors()); + List<RankedAdapterFactoryDescriptor> descriptors = Lists + .newArrayList(EMFCompareRCPPlugin.getDefault().getAdapterFactoryRegistry().getDescriptors()); Collections.sort(descriptors, new Comparator<RankedAdapterFactoryDescriptor>() { public int compare(RankedAdapterFactoryDescriptor o1, RankedAdapterFactoryDescriptor o2) { @@ -100,17 +100,16 @@ public class AdapterFactoriesPreferencePage extends PreferencePage implements IW adapterFactoryDescriptorViewer.setInput(descriptors); - List<String> disabledDescriptors = EMFComparePreferences - .getDisabledAdapterFacotryDescriptorIds(EMFCompareRCPPlugin.getDefault() - .getEMFComparePreferences()); + List<String> disabledDescriptors = EMFComparePreferences.getDisabledAdapterFacotryDescriptorIds( + EMFCompareRCPPlugin.getDefault().getEMFComparePreferences()); initViewer(disabledDescriptors); } private void createDescriptionText(Composite parent) { Group descriptionComposite = new Group(parent, SWT.NONE); - descriptionComposite.setText(EMFCompareRCPUIMessages - .getString("AdapterFactoryPreferencePage.descriptionGroup.text")); //$NON-NLS-1$ + descriptionComposite.setText( + EMFCompareRCPUIMessages.getString("AdapterFactoryPreferencePage.descriptionGroup.text")); //$NON-NLS-1$ descriptionComposite.setLayout(new GridLayout(1, false)); descriptionComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); @@ -148,13 +147,13 @@ public class AdapterFactoriesPreferencePage extends PreferencePage implements IW private void createViewer(Composite containerComposite) { Group interactiveGroup = new Group(containerComposite, SWT.BORDER); - interactiveGroup.setText(EMFCompareRCPUIMessages - .getString("AdapterFactoryPreferencePage.itemProviderGroup.text")); //$NON-NLS-1$ + interactiveGroup.setText( + EMFCompareRCPUIMessages.getString("AdapterFactoryPreferencePage.itemProviderGroup.text")); //$NON-NLS-1$ interactiveGroup.setLayout(new GridLayout(1, false)); interactiveGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); - adapterFactoryDescriptorViewer = CheckboxTableViewer.newCheckList(interactiveGroup, SWT.BORDER - | SWT.V_SCROLL | SWT.FULL_SELECTION); + adapterFactoryDescriptorViewer = CheckboxTableViewer.newCheckList(interactiveGroup, + SWT.BORDER | SWT.V_SCROLL | SWT.FULL_SELECTION); adapterFactoryDescriptorViewer.setContentProvider(ArrayContentProvider.getInstance()); adapterFactoryDescriptorViewer.setLabelProvider(new LabelProvider() { @@ -209,17 +208,19 @@ public class AdapterFactoriesPreferencePage extends PreferencePage implements IW public boolean performOk() { Object[] checkedDescriptors = adapterFactoryDescriptorViewer.getCheckedElements(); - SetView<RankedAdapterFactoryDescriptor> descriptorsToDisable = Sets.difference(Sets - .newHashSet(EMFCompareRCPPlugin.getDefault().getAdapterFactoryRegistry().getDescriptors()), + SetView<RankedAdapterFactoryDescriptor> descriptorsToDisable = Sets.difference( + Sets.newHashSet( + EMFCompareRCPPlugin.getDefault().getAdapterFactoryRegistry().getDescriptors()), Sets.newHashSet(checkedDescriptors)); - Iterable<String> descriptorsToDisableIds = Iterables.transform(Iterables.filter(descriptorsToDisable, - RankedAdapterFactoryDescriptor.class), new Function<Object, String>() { + Iterable<String> descriptorsToDisableIds = Iterables.transform( + Iterables.filter(descriptorsToDisable, RankedAdapterFactoryDescriptor.class), + new Function<Object, String>() { - public String apply(Object input) { - return ((RankedAdapterFactoryDescriptor)input).getId(); - } - }); + public String apply(Object input) { + return ((RankedAdapterFactoryDescriptor)input).getId(); + } + }); getPreferenceStore().putValue(EMFComparePreferences.DISABLED_ADAPTER_FACTORY, Joiner.on(';').join(descriptorsToDisableIds)); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EditorPreferencePage.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EditorPreferencePage.java index ba4fd2eff..a360f0e97 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EditorPreferencePage.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EditorPreferencePage.java @@ -51,10 +51,9 @@ public class EditorPreferencePage extends PreferencePage implements IWorkbenchPr Composite container = new Composite(parent, SWT.NULL); container.setLayout(new GridLayout(1, false)); // Link to color tab - PreferenceLinkArea fileEditorsArea = new PreferenceLinkArea( - container, - SWT.NONE, - "org.eclipse.ui.preferencePages.ColorsAndFonts", EMFCompareRCPUIMessages.getString("EditorPreferencePage.mainTab.colorHyperLink.label"),//$NON-NLS-1$ //$NON-NLS-2$ + PreferenceLinkArea fileEditorsArea = new PreferenceLinkArea(container, SWT.NONE, + "org.eclipse.ui.preferencePages.ColorsAndFonts", //$NON-NLS-1$ + EMFCompareRCPUIMessages.getString("EditorPreferencePage.mainTab.colorHyperLink.label"), //$NON-NLS-1$ (IWorkbenchPreferenceContainer)getContainer(), "selectColor:" //$NON-NLS-1$ + CompareColorImpl.CONFLICTING_CHANGE_COLOR_THEME_KEY); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java index f2e991f26..9892e3e34 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java @@ -149,8 +149,8 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP IItemDescriptor<T> defaultEngine = ItemUtil.getDefaultItemDescriptor(registry, enginePreferenceKey, pref); InteractiveUIBuilder<T> uiBuilder = new InteractiveUIBuilder<T>(tabComposite, registry); - uiBuilder.setSimple(true).setDefaultCheck(Collections.singleton(defaultEngine)).setDefaultSelection( - defaultEngine).setHoldingData(dataHolder); + uiBuilder.setSimple(true).setDefaultCheck(Collections.singleton(defaultEngine)) + .setDefaultSelection(defaultEngine).setHoldingData(dataHolder); return uiBuilder.build(); } @@ -160,16 +160,17 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP * @param tabFolder */ private void createConflictDetectorTab(TabFolder tabFolder) { - IItemRegistry<IConflictDetector> conflictDetectorDescriptorRegistry = EMFCompareRCPPlugin - .getDefault().getConflictDetectorDescriptorRegistry(); + IItemRegistry<IConflictDetector> conflictDetectorDescriptorRegistry = EMFCompareRCPPlugin.getDefault() + .getConflictDetectorDescriptorRegistry(); // Create tab structure - Composite tabComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("EnginesPreferencePage.conflictDetector.tab.label"),//$NON-NLS-1$ + Composite tabComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("EnginesPreferencePage.conflictDetector.tab.label"), //$NON-NLS-1$ EMFCompareRCPUIMessages.getString("EnginesPreferencePage.conflictDetectorIntro.text"));//$NON-NLS-1$ InteractiveUIContent interactiveContent = createEngineUIBuilder(conflictDetectorDescriptorRegistry, - EMFComparePreferences.CONFLICTS_DETECTOR, EMFCompareRCPPlugin.getDefault() - .getEMFComparePreferences(), tabComposite, conflictsDetectorData); + EMFComparePreferences.CONFLICTS_DETECTOR, + EMFCompareRCPPlugin.getDefault().getEMFComparePreferences(), tabComposite, + conflictsDetectorData); // Save for reset default interactiveUis.put(EMFComparePreferences.CONFLICTS_DETECTOR, interactiveContent); @@ -184,13 +185,13 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP IItemRegistry<IReqEngine> reqEngineDescriptorRegistry = EMFCompareRCPPlugin.getDefault() .getReqEngineDescriptorRegistry(); // Create tab structure - Composite tabComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("EnginesPreferencePage.requirementEngine.tab.label"), //$NON-NLS-1$ + Composite tabComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("EnginesPreferencePage.requirementEngine.tab.label"), //$NON-NLS-1$ EMFCompareRCPUIMessages.getString("EnginesPreferencePage.reqEngineIntro.text")); //$NON-NLS-1$ InteractiveUIContent interactiveContent = createEngineUIBuilder(reqEngineDescriptorRegistry, - EMFComparePreferences.REQ_ENGINES, EMFCompareRCPPlugin.getDefault() - .getEMFComparePreferences(), tabComposite, reqEngineData); + EMFComparePreferences.REQ_ENGINES, + EMFCompareRCPPlugin.getDefault().getEMFComparePreferences(), tabComposite, reqEngineData); // Save for reset default interactiveUis.put(EMFComparePreferences.REQ_ENGINES, interactiveContent); @@ -205,13 +206,13 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP IItemRegistry<IEquiEngine> equiEngineDescriptorRegistry = EMFCompareRCPPlugin.getDefault() .getEquiEngineDescriptorRegistry(); // Create tab structure - Composite tabComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("EnginesPreferencePage.equivalenceEngine.tab.label"), //$NON-NLS-1$ + Composite tabComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("EnginesPreferencePage.equivalenceEngine.tab.label"), //$NON-NLS-1$ EMFCompareRCPUIMessages.getString("EnginesPreferencePage.equiEngineIntro.text")); //$NON-NLS-1$ InteractiveUIContent interactiveContent = createEngineUIBuilder(equiEngineDescriptorRegistry, - EMFComparePreferences.EQUI_ENGINES, EMFCompareRCPPlugin.getDefault() - .getEMFComparePreferences(), tabComposite, equiEngineData); + EMFComparePreferences.EQUI_ENGINES, + EMFCompareRCPPlugin.getDefault().getEMFComparePreferences(), tabComposite, equiEngineData); // Save for reset default interactiveUis.put(EMFComparePreferences.EQUI_ENGINES, interactiveContent); @@ -226,13 +227,14 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP IItemRegistry<IDiffEngine> diffEngineDescriptorRegistry = EMFCompareRCPPlugin.getDefault() .getDiffEngineDescriptorRegistry(); // Create tab structure - Composite tabComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("EnginesPreferencePage.differenceEngine.tab.label"), EMFCompareRCPUIMessages //$NON-NLS-1$ - .getString("EnginesPreferencePage.diffEngineIntro.text")); //$NON-NLS-1$ + Composite tabComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("EnginesPreferencePage.differenceEngine.tab.label"), //$NON-NLS-1$ + EMFCompareRCPUIMessages + .getString("EnginesPreferencePage.diffEngineIntro.text")); //$NON-NLS-1$ InteractiveUIContent interactiveContent = createEngineUIBuilder(diffEngineDescriptorRegistry, - EMFComparePreferences.DIFF_ENGINES, EMFCompareRCPPlugin.getDefault() - .getEMFComparePreferences(), tabComposite, diffEngineData); + EMFComparePreferences.DIFF_ENGINES, + EMFCompareRCPPlugin.getDefault().getEMFComparePreferences(), tabComposite, diffEngineData); // Save for reset default interactiveUis.put(EMFComparePreferences.DIFF_ENGINES, interactiveContent); @@ -249,16 +251,17 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP .getMatchEngineFactoryDescriptorRegistry(); IItemDescriptor<Factory> defaultMatchEngineDescriptor = matchEngineFactoryDescriptorRegistry .getItemDescriptor(DefaultRCPMatchEngineFactory.class.getCanonicalName()); - Composite tabComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("EnginesPreferencePage.matchEngine.tab.label"), EMFCompareRCPUIMessages //$NON-NLS-1$ - .getString("EnginesPreferencePage.matchEngineIntro.text")); //$NON-NLS-1$ + Composite tabComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("EnginesPreferencePage.matchEngine.tab.label"), //$NON-NLS-1$ + EMFCompareRCPUIMessages + .getString("EnginesPreferencePage.matchEngineIntro.text")); //$NON-NLS-1$ Map<String, IConfigurationUIFactory> configuratorUIRegistry = EMFCompareRCPUIPlugin.getDefault() .getMatchEngineConfiguratorRegistry(); String matchEnginePreferenceKey = EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES; - Set<IItemDescriptor<Factory>> activeItems = ItemUtil.getActiveItems( - matchEngineFactoryDescriptorRegistry, matchEnginePreferenceKey); + Set<IItemDescriptor<Factory>> activeItems = ItemUtil + .getActiveItems(matchEngineFactoryDescriptorRegistry, matchEnginePreferenceKey); InteractiveUIBuilder<IMatchEngine.Factory> builder = new InteractiveUIBuilder<IMatchEngine.Factory>( tabComposite, matchEngineFactoryDescriptorRegistry); @@ -304,17 +307,22 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP StringBuilder traceMessage = new StringBuilder("Engines preference serialization:\n"); //$NON-NLS-1$ String prefDelimiter = " :\n"; //$NON-NLS-1$ String newLine = "\n"; //$NON-NLS-1$ - traceMessage.append(EMFComparePreferences.DIFF_ENGINES).append(prefDelimiter).append( - getPreferenceStore().getString(EMFComparePreferences.DIFF_ENGINES)).append(newLine); - traceMessage.append(EMFComparePreferences.EQUI_ENGINES).append(prefDelimiter).append( - getPreferenceStore().getString(EMFComparePreferences.EQUI_ENGINES)).append(newLine); - traceMessage.append(EMFComparePreferences.REQ_ENGINES).append(prefDelimiter).append( - getPreferenceStore().getString(EMFComparePreferences.REQ_ENGINES)).append(newLine); - traceMessage.append(EMFComparePreferences.CONFLICTS_DETECTOR).append(prefDelimiter).append( - getPreferenceStore().getString(EMFComparePreferences.CONFLICTS_DETECTOR)).append(newLine); + traceMessage.append(EMFComparePreferences.DIFF_ENGINES).append(prefDelimiter) + .append(getPreferenceStore().getString(EMFComparePreferences.DIFF_ENGINES)) + .append(newLine); + traceMessage.append(EMFComparePreferences.EQUI_ENGINES).append(prefDelimiter) + .append(getPreferenceStore().getString(EMFComparePreferences.EQUI_ENGINES)) + .append(newLine); + traceMessage.append(EMFComparePreferences.REQ_ENGINES).append(prefDelimiter) + .append(getPreferenceStore().getString(EMFComparePreferences.REQ_ENGINES)) + .append(newLine); + traceMessage.append(EMFComparePreferences.CONFLICTS_DETECTOR).append(prefDelimiter) + .append(getPreferenceStore().getString(EMFComparePreferences.CONFLICTS_DETECTOR)) + .append(newLine); traceMessage.append(EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES).append(prefDelimiter) .append(getPreferenceStore() - .getString(EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES)).append(newLine); + .getString(EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES)) + .append(newLine); EMFCompareRCPPlugin.getDefault().log(IStatus.INFO, traceMessage.toString()); } @@ -326,18 +334,18 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP */ private void setEnginesPreferences() { // Update preferences preferences - setEnginePreferences(EMFComparePreferences.DIFF_ENGINES, diffEngineData.getData(), Collections - .singleton(EMFCompareRCPPlugin.getDefault().getDiffEngineDescriptorRegistry() + setEnginePreferences(EMFComparePreferences.DIFF_ENGINES, diffEngineData.getData(), + Collections.singleton(EMFCompareRCPPlugin.getDefault().getDiffEngineDescriptorRegistry() .getHighestRankingDescriptor())); - setEnginePreferences(EMFComparePreferences.EQUI_ENGINES, equiEngineData.getData(), Collections - .singleton(EMFCompareRCPPlugin.getDefault().getEquiEngineDescriptorRegistry() + setEnginePreferences(EMFComparePreferences.EQUI_ENGINES, equiEngineData.getData(), + Collections.singleton(EMFCompareRCPPlugin.getDefault().getEquiEngineDescriptorRegistry() .getHighestRankingDescriptor())); - setEnginePreferences(EMFComparePreferences.REQ_ENGINES, reqEngineData.getData(), Collections - .singleton(EMFCompareRCPPlugin.getDefault().getReqEngineDescriptorRegistry() + setEnginePreferences(EMFComparePreferences.REQ_ENGINES, reqEngineData.getData(), + Collections.singleton(EMFCompareRCPPlugin.getDefault().getReqEngineDescriptorRegistry() .getHighestRankingDescriptor())); setEnginePreferences(EMFComparePreferences.CONFLICTS_DETECTOR, conflictsDetectorData.getData(), - Collections.singleton(EMFCompareRCPPlugin.getDefault() - .getConflictDetectorDescriptorRegistry().getHighestRankingDescriptor())); + Collections.singleton(EMFCompareRCPPlugin.getDefault().getConflictDetectorDescriptorRegistry() + .getHighestRankingDescriptor())); // Set match engine to disable Set<IItemDescriptor<Factory>> matchEngineRegsitry = Sets.newHashSet(EMFCompareRCPPlugin.getDefault() .getMatchEngineFactoryDescriptorRegistry().getItemDescriptors()); @@ -352,8 +360,8 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP */ private void storeConfigurations() { for (Entry<String, InteractiveUIContent> interactiveContentEntry : interactiveUis.entrySet()) { - for (Entry<String, AbstractConfigurationUI> configuratorEntry : interactiveContentEntry - .getValue().getConfigurators().entrySet()) { + for (Entry<String, AbstractConfigurationUI> configuratorEntry : interactiveContentEntry.getValue() + .getConfigurators().entrySet()) { AbstractConfigurationUI configurator = configuratorEntry.getValue(); configurator.storeConfiguration(); } @@ -376,8 +384,8 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP traceMessage.append(nodeLabel).append(storeNode.absolutePath()).append(prefDelimiter); try { for (String propertyKey : storeNode.keys()) { - traceMessage.append(propertyKey).append(doubleDotLabel).append( - storeNode.get(propertyKey, emptyLabel)).append(newLine); + traceMessage.append(propertyKey).append(doubleDotLabel) + .append(storeNode.get(propertyKey, emptyLabel)).append(newLine); } } catch (BackingStoreException e) { e.printStackTrace(); @@ -393,17 +401,20 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP @Override protected void performDefaults() { - resetDefaultPreferencesToHighestRank(EMFCompareRCPPlugin.getDefault() - .getDiffEngineDescriptorRegistry(), EMFComparePreferences.DIFF_ENGINES, diffEngineData); - resetDefaultPreferencesToHighestRank(EMFCompareRCPPlugin.getDefault() - .getReqEngineDescriptorRegistry(), EMFComparePreferences.REQ_ENGINES, reqEngineData); - resetDefaultPreferencesToHighestRank(EMFCompareRCPPlugin.getDefault() - .getEquiEngineDescriptorRegistry(), EMFComparePreferences.EQUI_ENGINES, equiEngineData); - resetDefaultPreferencesToHighestRank(EMFCompareRCPPlugin.getDefault() - .getConflictDetectorDescriptorRegistry(), EMFComparePreferences.CONFLICTS_DETECTOR, - conflictsDetectorData); - resetDefaultPreferencesToAll(EMFCompareRCPPlugin.getDefault() - .getMatchEngineFactoryDescriptorRegistry(), + resetDefaultPreferencesToHighestRank( + EMFCompareRCPPlugin.getDefault().getDiffEngineDescriptorRegistry(), + EMFComparePreferences.DIFF_ENGINES, diffEngineData); + resetDefaultPreferencesToHighestRank( + EMFCompareRCPPlugin.getDefault().getReqEngineDescriptorRegistry(), + EMFComparePreferences.REQ_ENGINES, reqEngineData); + resetDefaultPreferencesToHighestRank( + EMFCompareRCPPlugin.getDefault().getEquiEngineDescriptorRegistry(), + EMFComparePreferences.EQUI_ENGINES, equiEngineData); + resetDefaultPreferencesToHighestRank( + EMFCompareRCPPlugin.getDefault().getConflictDetectorDescriptorRegistry(), + EMFComparePreferences.CONFLICTS_DETECTOR, conflictsDetectorData); + resetDefaultPreferencesToAll( + EMFCompareRCPPlugin.getDefault().getMatchEngineFactoryDescriptorRegistry(), EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES, matchEnginesData); resetConfigurations(); @@ -454,8 +465,8 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP IItemDescriptor<T> defaultEngine = registry.getHighestRankingDescriptor(); interactiveContent.select(defaultEngine); List<IItemDescriptor<T>> itemDescriptors = registry.getItemDescriptors(); - interactiveContent.checkElements(itemDescriptors.toArray(new IItemDescriptor[itemDescriptors - .size()])); + interactiveContent + .checkElements(itemDescriptors.toArray(new IItemDescriptor[itemDescriptors.size()])); dataObject.setData(Sets.newHashSet(itemDescriptors)); } } @@ -467,11 +478,12 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP * @param currentSelectedEngine * @param defaultConf */ - private <T> void setEnginePreferences(String preferenceKey, - Set<IItemDescriptor<T>> currentSelectedEngine, Collection<IItemDescriptor<T>> defaultConf) { + private <T> void setEnginePreferences(String preferenceKey, Set<IItemDescriptor<T>> currentSelectedEngine, + Collection<IItemDescriptor<T>> defaultConf) { if (currentSelectedEngine != null && !currentSelectedEngine.containsAll(defaultConf)) { StringBuilder descriptorsKey = new StringBuilder(); - for (Iterator<IItemDescriptor<T>> iterator = currentSelectedEngine.iterator(); iterator.hasNext();) { + for (Iterator<IItemDescriptor<T>> iterator = currentSelectedEngine.iterator(); iterator + .hasNext();) { IItemDescriptor<T> iItemDescriptor = iterator.next(); descriptorsKey.append(iItemDescriptor.getID()); if (iterator.hasNext()) { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/FiltersPreferencePage.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/FiltersPreferencePage.java index b8e4acfd3..1cacbbe8f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/FiltersPreferencePage.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/FiltersPreferencePage.java @@ -122,9 +122,10 @@ public class FiltersPreferencePage extends PreferencePage implements IWorkbenchP * @param tabFolder */ private void createDefaultEnabledFilterTab(TabFolder tabFolder) { - enabledFilterTabComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("FiltersPreferencePage.select.tab.label"), EMFCompareRCPUIMessages //$NON-NLS-1$ - .getString("FiltersPreferencePage.selectIntro.text")); //$NON-NLS-1$ + enabledFilterTabComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("FiltersPreferencePage.select.tab.label"), //$NON-NLS-1$ + EMFCompareRCPUIMessages + .getString("FiltersPreferencePage.selectIntro.text")); //$NON-NLS-1$ if (filterManager == null) { filterManager = EMFCompareRCPUIPlugin.getDefault().getDifferenceFilterManager(); } @@ -139,9 +140,10 @@ public class FiltersPreferencePage extends PreferencePage implements IWorkbenchP * @param tabFolder */ private void createActivateFilterTab(TabFolder tabFolder) { - activateFilterTabComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("FiltersPreferencePage.activate.tab.label"), EMFCompareRCPUIMessages //$NON-NLS-1$ - .getString("FiltersPreferencePage.activateIntro.text")); //$NON-NLS-1$ + activateFilterTabComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("FiltersPreferencePage.activate.tab.label"), //$NON-NLS-1$ + EMFCompareRCPUIMessages + .getString("FiltersPreferencePage.activateIntro.text")); //$NON-NLS-1$ if (filterManager == null) { filterManager = EMFCompareRCPUIPlugin.getDefault().getDifferenceFilterManager(); } @@ -283,11 +285,11 @@ public class FiltersPreferencePage extends PreferencePage implements IWorkbenchP Label introductionText = new Label(contentComposite, SWT.WRAP); if (isDeactivateTab) { - introductionText.setText(EMFCompareRCPUIMessages - .getString("FiltersPreferencePage.INTRO_DEACTIVATE_TEXT")); //$NON-NLS-1$ + introductionText.setText( + EMFCompareRCPUIMessages.getString("FiltersPreferencePage.INTRO_DEACTIVATE_TEXT")); //$NON-NLS-1$ } else { - introductionText.setText(EMFCompareRCPUIMessages - .getString("FiltersPreferencePage.INTRO_SELECT_TEXT")); //$NON-NLS-1$ + introductionText.setText( + EMFCompareRCPUIMessages.getString("FiltersPreferencePage.INTRO_SELECT_TEXT")); //$NON-NLS-1$ } introductionText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); // Engine chooser composite @@ -325,7 +327,8 @@ public class FiltersPreferencePage extends PreferencePage implements IWorkbenchP synchronizationGroup.setText(EMFCompareRCPUIMessages .getString("InteractiveFilterUIContent.sync.behavior.group.label")); //$NON-NLS-1$ Label label = new Label(synchronizationGroup, SWT.WRAP); - label.setText(EMFCompareRCPUIMessages.getString("InteractiveFilterUIContent.sync.behavior.label")); //$NON-NLS-1$ + label.setText( + EMFCompareRCPUIMessages.getString("InteractiveFilterUIContent.sync.behavior.label")); //$NON-NLS-1$ label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); combo = new Combo(synchronizationGroup, SWT.DROP_DOWN | SWT.READ_ONLY); for (String comboLabel : comboValues) { @@ -434,13 +437,13 @@ public class FiltersPreferencePage extends PreferencePage implements IWorkbenchP */ private Label createDescriptionComposite(Composite composite) { Group descriptionComposite = new Group(composite, SWT.NONE); - descriptionComposite.setText(EMFCompareRCPUIMessages - .getString("InteractiveUIContent.descriptionComposite.label")); //$NON-NLS-1$ + descriptionComposite.setText( + EMFCompareRCPUIMessages.getString("InteractiveUIContent.descriptionComposite.label")); //$NON-NLS-1$ descriptionComposite.setLayout(new GridLayout(1, false)); descriptionComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1)); Label engineDescriptionLabel = new Label(descriptionComposite, SWT.WRAP); - engineDescriptionLabel.setBackground(Display.getCurrent().getSystemColor( - SWT.COLOR_WIDGET_BACKGROUND)); + engineDescriptionLabel + .setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND)); GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1); layoutData.widthHint = 400; layoutData.heightHint = 50; diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/GroupsPreferencePage.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/GroupsPreferencePage.java index ca254f2d5..94c608cb5 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/GroupsPreferencePage.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/GroupsPreferencePage.java @@ -72,9 +72,9 @@ public class GroupsPreferencePage extends PreferencePage implements IWorkbenchPr private GroupsInteractiveContent threeWayComparisonContent; /** {@link DifferenceGroupManager}. */ - private DifferenceGroupManager groupManager = new DifferenceGroupManager(EMFCompareRCPUIPlugin - .getDefault().getEMFCompareUIPreferences(), EMFCompareRCPUIPlugin.getDefault() - .getItemDifferenceGroupProviderRegistry()); + private DifferenceGroupManager groupManager = new DifferenceGroupManager( + EMFCompareRCPUIPlugin.getDefault().getEMFCompareUIPreferences(), + EMFCompareRCPUIPlugin.getDefault().getItemDifferenceGroupProviderRegistry()); /** * Gets the preference key for synchronization behavior. @@ -125,8 +125,8 @@ public class GroupsPreferencePage extends PreferencePage implements IWorkbenchPr * Holding tab folder. */ private void fillTwoWayComparisonTab(TabFolder tabFolder) { - Composite tabSkeletonComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("GroupsPreferencePage.twoWayComparisonTab.label"), //$NON-NLS-1$ + Composite tabSkeletonComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("GroupsPreferencePage.twoWayComparisonTab.label"), //$NON-NLS-1$ EMFCompareRCPUIMessages.getString("GroupsPreferencePage.viewerDescription.label")); //$NON-NLS-1$ List<IItemDescriptor<Descriptor>> currentGroupRanking = groupManager.getCurrentGroupRanking(false); @@ -143,8 +143,8 @@ public class GroupsPreferencePage extends PreferencePage implements IWorkbenchPr * Holding tab folder. */ private void fillThreeWayComparisonTab(TabFolder tabFolder) { - Composite tabSkeletonComposite = createTabSkeleton(tabFolder, EMFCompareRCPUIMessages - .getString("GroupsPreferencePage.threeWayComparisonTab.label"), //$NON-NLS-1$ + Composite tabSkeletonComposite = createTabSkeleton(tabFolder, + EMFCompareRCPUIMessages.getString("GroupsPreferencePage.threeWayComparisonTab.label"), //$NON-NLS-1$ EMFCompareRCPUIMessages.getString("GroupsPreferencePage.viewerDescription.label")); //$NON-NLS-1$ List<IItemDescriptor<Descriptor>> currentGroupRanking = groupManager.getCurrentGroupRanking(true); @@ -282,9 +282,10 @@ public class GroupsPreferencePage extends PreferencePage implements IWorkbenchPr if (TracingConstant.CONFIGURATION_TRACING_ACTIVATED) { StringBuilder builder = new StringBuilder(); // Print each preferences - builder.append("Preference ").append(getGroupSynchronizationPreferenceKey(isThreeWay)).append(":\n"); //$NON-NLS-1$ //$NON-NLS-2$ - String preferenceValue = getPreferenceStore().getString( - getGroupSynchronizationPreferenceKey(isThreeWay)); + builder.append("Preference ").append(getGroupSynchronizationPreferenceKey(isThreeWay)) //$NON-NLS-1$ + .append(":\n"); //$NON-NLS-1$ + String preferenceValue = getPreferenceStore() + .getString(getGroupSynchronizationPreferenceKey(isThreeWay)); builder.append(preferenceValue); EMFCompareRCPUIPlugin.getDefault().log(IStatus.INFO, builder.toString()); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/LoggingPreferencePage.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/LoggingPreferencePage.java index 58511fcf6..44615cd7a 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/LoggingPreferencePage.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/LoggingPreferencePage.java @@ -61,7 +61,7 @@ public class LoggingPreferencePage extends PreferencePage implements IWorkbenchP private Text maxBackupField; - private final String[] LOG_LEVELS = new String[] {"OFF", "ERROR", "INFO", "DEBUG" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + private final String[] LOG_LEVELS = new String[] {"OFF", "ERROR", "INFO", "DEBUG" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ /** * Constructor. @@ -105,8 +105,8 @@ public class LoggingPreferencePage extends PreferencePage implements IWorkbenchP group.setLayout(new GridLayout(3, false)); group.setText(EMFCompareRCPUIMessages.getString("LoggingPreferencePage.preferencePage.description")); //$NON-NLS-1$ - new Label(group, SWT.LEAD).setText(EMFCompareRCPUIMessages - .getString("LoggingPreferencePage.log.level")); //$NON-NLS-1$ + new Label(group, SWT.LEAD) + .setText(EMFCompareRCPUIMessages.getString("LoggingPreferencePage.log.level")); //$NON-NLS-1$ levelCombo = new Combo(group, SWT.DROP_DOWN); levelCombo.setItems(LOG_LEVELS); levelCombo.setLayoutData(getDefaultFieldGridData(40)); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/PostProcessorPreferencePage.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/PostProcessorPreferencePage.java index 63dfa9c4a..48a3efb77 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/PostProcessorPreferencePage.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/PostProcessorPreferencePage.java @@ -100,8 +100,8 @@ public class PostProcessorPreferencePage extends PreferencePage implements IWork Composite container = new Composite(parent, SWT.NULL); container.setLayout(new GridLayout(1, true)); Label introductionText = new Label(container, SWT.WRAP); - introductionText.setText(EMFCompareRCPUIMessages - .getString("PostProcessorPreferencePage.preferencePage.description")); //$NON-NLS-1$ + introductionText.setText( + EMFCompareRCPUIMessages.getString("PostProcessorPreferencePage.preferencePage.description")); //$NON-NLS-1$ IItemRegistry<IPostProcessor.Descriptor> postProcessorRegistryDescriptor = EMFCompareRCPPlugin .getDefault().getPostProcessorDescriptorRegistry(); @@ -109,12 +109,12 @@ public class PostProcessorPreferencePage extends PreferencePage implements IWork postProcessorRegistryDescriptor, EMFComparePreferences.DISABLED_POST_PROCESSOR); InteractiveUIBuilder<Descriptor> postProcessorUIBuilder = new InteractiveUIBuilder<IPostProcessor.Descriptor>( container, postProcessorRegistryDescriptor); - Set<IItemDescriptor<Descriptor>> descriptors = Sets.newLinkedHashSet(postProcessorRegistryDescriptor - .getItemDescriptors()); + Set<IItemDescriptor<Descriptor>> descriptors = Sets + .newLinkedHashSet(postProcessorRegistryDescriptor.getItemDescriptors()); postProcessorUIBuilder.setConfigurationNodeKey(EMFComparePreferences.DISABLED_POST_PROCESSOR) - .setDefaultCheck(descriptors).setDefaultSelection( - postProcessorRegistryDescriptor.getHighestRankingDescriptor()).setHoldingData( - dataHolder).setDefaultCheck(activesPostProcessor); + .setDefaultCheck(descriptors) + .setDefaultSelection(postProcessorRegistryDescriptor.getHighestRankingDescriptor()) + .setHoldingData(dataHolder).setDefaultCheck(activesPostProcessor); interactiveUI = postProcessorUIBuilder.build(); return container; @@ -122,19 +122,19 @@ public class PostProcessorPreferencePage extends PreferencePage implements IWork @Override public boolean performOk() { - Set<IItemDescriptor<Descriptor>> postProcessorDescriptors = Sets.newLinkedHashSet(EMFCompareRCPPlugin - .getDefault().getPostProcessorDescriptorRegistry().getItemDescriptors()); - SetView<IItemDescriptor<Descriptor>> postProcessorToDisable = Sets.difference( - postProcessorDescriptors, dataHolder.getData()); + Set<IItemDescriptor<Descriptor>> postProcessorDescriptors = Sets.newLinkedHashSet( + EMFCompareRCPPlugin.getDefault().getPostProcessorDescriptorRegistry().getItemDescriptors()); + SetView<IItemDescriptor<Descriptor>> postProcessorToDisable = Sets + .difference(postProcessorDescriptors, dataHolder.getData()); setEnginePreferences(EMFComparePreferences.DISABLED_POST_PROCESSOR, postProcessorToDisable); if (TracingConstant.CONFIGURATION_TRACING_ACTIVATED) { StringBuilder traceMessage = new StringBuilder("Post processor preference serialization:\n"); //$NON-NLS-1$ String prefDelimiter = " :\n"; //$NON-NLS-1$ String newLine = "\n"; //$NON-NLS-1$ - traceMessage.append(EMFComparePreferences.DISABLED_POST_PROCESSOR).append(prefDelimiter).append( - getPreferenceStore().getString(EMFComparePreferences.DISABLED_POST_PROCESSOR)).append( - newLine); + traceMessage.append(EMFComparePreferences.DISABLED_POST_PROCESSOR).append(prefDelimiter) + .append(getPreferenceStore().getString(EMFComparePreferences.DISABLED_POST_PROCESSOR)) + .append(newLine); EMFCompareRCPPlugin.getDefault().log(IStatus.INFO, traceMessage.toString()); } @@ -143,8 +143,8 @@ public class PostProcessorPreferencePage extends PreferencePage implements IWork @Override protected void performDefaults() { - Set<IItemDescriptor<Descriptor>> descriptors = Sets.newLinkedHashSet(EMFCompareRCPPlugin.getDefault() - .getPostProcessorDescriptorRegistry().getItemDescriptors()); + Set<IItemDescriptor<Descriptor>> descriptors = Sets.newLinkedHashSet( + EMFCompareRCPPlugin.getDefault().getPostProcessorDescriptorRegistry().getItemDescriptors()); interactiveUI.checkElements(descriptors.toArray(new IItemDescriptor[descriptors.size()])); dataHolder.setData(descriptors); super.performDefaults(); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/GroupsInteractiveContent.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/GroupsInteractiveContent.java index e053dfcb1..0213d4062 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/GroupsInteractiveContent.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/GroupsInteractiveContent.java @@ -126,8 +126,8 @@ public class GroupsInteractiveContent { GridLayout layout = new GridLayout(2, false); synchronizationGroup.setLayout(layout); synchronizationGroup.setLayoutData(layoutData); - synchronizationGroup.setText(EMFCompareRCPUIMessages - .getString("GroupsInteractiveContent.SYNC_BEHAVIOR_GROUP_LABEL")); //$NON-NLS-1$ + synchronizationGroup.setText( + EMFCompareRCPUIMessages.getString("GroupsInteractiveContent.SYNC_BEHAVIOR_GROUP_LABEL")); //$NON-NLS-1$ Label label = new Label(synchronizationGroup, SWT.WRAP); label.setText(EMFCompareRCPUIMessages.getString("GroupsInteractiveContent.SYNC_BEHAVIOR_LABEL")); //$NON-NLS-1$ label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); @@ -211,8 +211,8 @@ public class GroupsInteractiveContent { */ private Label createDescriptionComposite(Composite composite) { Group descriptionComposite = new Group(composite, SWT.NONE); - descriptionComposite.setText(EMFCompareRCPUIMessages - .getString("InteractiveUIContent.descriptionComposite.label")); //$NON-NLS-1$ + descriptionComposite.setText( + EMFCompareRCPUIMessages.getString("InteractiveUIContent.descriptionComposite.label")); //$NON-NLS-1$ descriptionComposite.setLayout(new GridLayout(1, false)); descriptionComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); Label engineDescriptionLabel = new Label(descriptionComposite, SWT.WRAP); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/InteractiveUIContent.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/InteractiveUIContent.java index a7a6e47fd..55af71306 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/InteractiveUIContent.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/InteractiveUIContent.java @@ -79,7 +79,7 @@ public final class InteractiveUIContent { /** Height hint for description composite. */ private static final int DESCRIPTION_COMPOSITE_HEIGHT_HINT = 50; - + /** Width hint for description composite. */ private static final int DESCRIPTION_COMPOSITE_WIDTH_HINT = 400; @@ -134,7 +134,8 @@ public final class InteractiveUIContent { defaultComposite.setLayout(new GridLayout(1, true)); Label text = new Label(defaultComposite, SWT.WRAP); text.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, true, 1, 1)); - text.setText(EMFCompareRCPUIMessages.getString("InteractiveUIContent.defaultConfiguration.label")); //$NON-NLS-1$ + text.setText( + EMFCompareRCPUIMessages.getString("InteractiveUIContent.defaultConfiguration.label")); //$NON-NLS-1$ } else { this.configurationComposite = null; this.defaultComposite = null; @@ -192,8 +193,8 @@ public final class InteractiveUIContent { */ private Group createConfigComposite(Composite composite) { Group confComposite = new Group(composite, SWT.NONE); - confComposite.setText(EMFCompareRCPUIMessages - .getString("InteractiveUIContent.configurationComposite.label")); //$NON-NLS-1$ + confComposite.setText( + EMFCompareRCPUIMessages.getString("InteractiveUIContent.configurationComposite.label")); //$NON-NLS-1$ StackLayout layout = new StackLayout(); layout.marginHeight = 10; layout.marginWidth = 10; @@ -214,8 +215,8 @@ public final class InteractiveUIContent { */ private Label createDescriptionComposite(Composite composite) { Group descriptionComposite = new Group(composite, SWT.NONE); - descriptionComposite.setText(EMFCompareRCPUIMessages - .getString("InteractiveUIContent.descriptionComposite.label")); //$NON-NLS-1$ + descriptionComposite.setText( + EMFCompareRCPUIMessages.getString("InteractiveUIContent.descriptionComposite.label")); //$NON-NLS-1$ descriptionComposite.setLayout(new GridLayout(1, false)); descriptionComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1)); Label engineDescriptionLabel = new Label(descriptionComposite, SWT.WRAP); @@ -362,8 +363,9 @@ public final class InteractiveUIContent { // Prevent from nothing checked if (descriptorViewer.getCheckedElements().length == 0) { descriptorViewer.setCheckedElements(new Object[] {element }); - MessageDialog.openWarning(shell, EMFCompareRCPUIMessages - .getString("InteractiveUIContent.incorrectSelection.title"), //$NON-NLS-1$ + MessageDialog.openWarning(shell, + EMFCompareRCPUIMessages + .getString("InteractiveUIContent.incorrectSelection.title"), //$NON-NLS-1$ EMFCompareRCPUIMessages .getString("InteractiveUIContent.incorrectSelection.message")); //$NON-NLS-1$ } @@ -595,8 +597,8 @@ public final class InteractiveUIContent { if (isSimple) { style = style | SWT.SINGLE; } - CheckboxTableViewer descriptorViewer = CheckboxTableViewer.newCheckList(interactiveUI - .getViewerComposite(), style); + CheckboxTableViewer descriptorViewer = CheckboxTableViewer + .newCheckList(interactiveUI.getViewerComposite(), style); interactiveUI.setViewer(descriptorViewer); descriptorViewer.setContentProvider(ArrayContentProvider.getInstance()); descriptorViewer.setLabelProvider(new ItemDescriptorLabelProvider()); @@ -682,8 +684,8 @@ public final class InteractiveUIContent { // Bind the button with the corresponding field in data IViewerObservableSet target = ViewersObservables.observeCheckedElements(descriptorViewer, IItemDescriptor.class); - IObservableSet model = PojoProperties.set(DataHolder.class, DataHolder.DATA_FIELD_NAME).observe( - dataObject); + IObservableSet model = PojoProperties.set(DataHolder.class, DataHolder.DATA_FIELD_NAME) + .observe(dataObject); ctx.bindSet(target, model); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterAction.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterAction.java index 4a90b0c41..1fba012c5 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterAction.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterAction.java @@ -110,13 +110,13 @@ public class FilterAction extends Action { * Synchronizes UI filter selection with the preferences. */ private void synchonizeFilters() { - Set<IDifferenceFilter> byDefaultFilters = Sets.newLinkedHashSet(filterManager - .getCurrentByDefaultFilters()); - //Add newly activated filters + Set<IDifferenceFilter> byDefaultFilters = Sets + .newLinkedHashSet(filterManager.getCurrentByDefaultFilters()); + // Add newly activated filters for (IDifferenceFilter activeFilter : structureMergeViewerFilter.getSelectedDifferenceFilters()) { byDefaultFilters.add(activeFilter); } - //Remove deactivated filters + // Remove deactivated filters for (IDifferenceFilter toDeactivateFilter : structureMergeViewerFilter .getUnSelectedDifferenceFilters()) { byDefaultFilters.remove(toDeactivateFilter); @@ -149,14 +149,14 @@ public class FilterAction extends Action { */ @SuppressWarnings("deprecation") public void run() { - MessageDialogWithToggle dialog = new SynchronizerDialog(shell, EMFCompareRCPUIMessages - .getString("FilterAction.synchronization.dialog.title"), //$NON-NLS-1$ + MessageDialogWithToggle dialog = new SynchronizerDialog(shell, + EMFCompareRCPUIMessages.getString("FilterAction.synchronization.dialog.title"), //$NON-NLS-1$ EMFCompareRCPUIMessages.getString("FilterAction.synchronization.dialog.message"), //$NON-NLS-1$ FiltersPreferencePage.PAGE_ID); dialog.setPrefKey(FiltersPreferencePage.SYNCHRONIZATION_BEHAVIOR); - dialog.setPrefStore(new ScopedPreferenceStore(new InstanceScope(), - EMFCompareRCPUIPlugin.PLUGIN_ID)); + dialog.setPrefStore( + new ScopedPreferenceStore(new InstanceScope(), EMFCompareRCPUIPlugin.PLUGIN_ID)); if (dialog.open() == IDialogConstants.YES_ID) { synchonizeFilters(); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupAction.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupAction.java index 13715f142..08e7d0bef 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupAction.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupAction.java @@ -108,8 +108,9 @@ public class GroupAction extends Action { */ private void handleSynchronization(Event event) { final Shell shell = event.display.getActiveShell(); - String preferenceValue = preferences.get(GroupsPreferencePage - .getGroupSynchronizationPreferenceKey(isThreeWay), MessageDialogWithToggle.PROMPT); + String preferenceValue = preferences.get( + GroupsPreferencePage.getGroupSynchronizationPreferenceKey(isThreeWay), + MessageDialogWithToggle.PROMPT); if (MessageDialogWithToggle.PROMPT.equals(preferenceValue)) { shell.getDisplay().asyncExec(new SynchronizationRunnable(shell)); } else if (MessageDialogWithToggle.ALWAYS.equals(preferenceValue)) { @@ -138,10 +139,8 @@ public class GroupAction extends Action { /* * If not found then the group provider may have been removed from the registry. Just log warning. */ - EMFCompareRCPUIPlugin - .getDefault() - .log(IStatus.WARNING, - "Enable to set selected difference group provider as default group provider. The selected group provider is not in the registry anymore"); //$NON-NLS-1$ + EMFCompareRCPUIPlugin.getDefault().log(IStatus.WARNING, + "Enable to set selected difference group provider as default group provider. The selected group provider is not in the registry anymore"); //$NON-NLS-1$ } } @@ -168,14 +167,14 @@ public class GroupAction extends Action { * {@inheritDoc} */ public void run() { - MessageDialogWithToggle dialog = new SynchronizerDialog(shell, EMFCompareRCPUIMessages - .getString("GroupAction.synchronization.dialog.title"), //$NON-NLS-1$ + MessageDialogWithToggle dialog = new SynchronizerDialog(shell, + EMFCompareRCPUIMessages.getString("GroupAction.synchronization.dialog.title"), //$NON-NLS-1$ EMFCompareRCPUIMessages.getString("GroupAction.synchronization.dialog.message"), //$NON-NLS-1$ GroupsPreferencePage.PAGE_ID); dialog.setPrefKey(GroupsPreferencePage.getGroupSynchronizationPreferenceKey(isThreeWay)); - dialog.setPrefStore(new ScopedPreferenceStore(new InstanceScope(), - EMFCompareRCPUIPlugin.PLUGIN_ID)); + dialog.setPrefStore( + new ScopedPreferenceStore(new InstanceScope(), EMFCompareRCPUIPlugin.PLUGIN_ID)); if (dialog.open() == IDialogConstants.YES_ID) { setSelectedGroupAsDefault(); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java index 59ad016a6..34111ac24 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java @@ -71,20 +71,20 @@ public class GroupActionMenu extends Action implements IMenuCreator { */ public void updateMenu(IComparisonScope scope, Comparison comparison) { menuManager.removeAll(); - DifferenceGroupManager groupManager = new DifferenceGroupManager(EMFCompareRCPUIPlugin.getDefault() - .getEMFCompareUIPreferences(), EMFCompareRCPUIPlugin.getDefault() - .getItemDifferenceGroupProviderRegistry()); + DifferenceGroupManager groupManager = new DifferenceGroupManager( + EMFCompareRCPUIPlugin.getDefault().getEMFCompareUIPreferences(), + EMFCompareRCPUIPlugin.getDefault().getItemDifferenceGroupProviderRegistry()); for (IDifferenceGroupProvider.Descriptor dgp : registry.getGroupProviders(scope, comparison)) { IDifferenceGroupProvider gp = dgp.createGroupProvider(); if (gp != null) { final IAction action; if (gp.getClass() == structureMergeViewerGrouper.getProvider().getClass()) { - action = new GroupAction(structureMergeViewerGrouper, dgp, structureMergeViewerGrouper - .getProvider(), groupManager, comparison.isThreeWay()); + action = new GroupAction(structureMergeViewerGrouper, dgp, + structureMergeViewerGrouper.getProvider(), groupManager, comparison.isThreeWay()); action.setChecked(true); } else { - action = new GroupAction(structureMergeViewerGrouper, dgp, gp, groupManager, comparison - .isThreeWay()); + action = new GroupAction(structureMergeViewerGrouper, dgp, gp, groupManager, + comparison.isThreeWay()); } menuManager.add(action); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java index 56dfe8486..dc21be95b 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java @@ -60,8 +60,9 @@ public class CascadingDifferencesFilter extends AbstractDifferenceFilter { parentData = null; } if (parentData instanceof Diff - && !((parentData instanceof ResourceAttachmentChange) || ofKind( - DifferenceKind.MOVE).apply((Diff)parentData)) && data instanceof Diff) { + && !((parentData instanceof ResourceAttachmentChange) + || ofKind(DifferenceKind.MOVE).apply((Diff)parentData)) + && data instanceof Diff) { Iterator<EObject> eAllDataContents = transform(treeNode.eAllContents(), IDifferenceGroup.TREE_NODE_DATA); return CASCADING_DIFF.apply(data) && !any(eAllDataContents, not(CASCADING_DIFF)); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterManager.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterManager.java index 2e44595e2..77b104a7c 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterManager.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterManager.java @@ -60,7 +60,9 @@ public class DifferenceFilterManager { /** The {@link Preferences} holding the value for filter preferences. */ private final Preferences preferenceStore; - /** Predicate use to transform {@link DifferenceFilterDefaultConfiguration} to {@link IDifferenceFilter}. */ + /** + * Predicate use to transform {@link DifferenceFilterDefaultConfiguration} to {@link IDifferenceFilter}. + */ private final static Function<DifferenceFilterDefaultConfiguration, IDifferenceFilter> TO_FILTER = new Function<DifferenceFilterManager.DifferenceFilterDefaultConfiguration, IDifferenceFilter>() { public IDifferenceFilter apply(DifferenceFilterDefaultConfiguration arg0) { @@ -199,8 +201,8 @@ public class DifferenceFilterManager { */ public void setCurrentActiveFilters(Set<IDifferenceFilter> activeFilters) { final Set<IDeactivableDiffFilter> inactiveFilters; - Set<IDeactivableDiffFilter> deactivableFilters = Sets.newLinkedHashSet(Iterables.filter( - getAllFilters(), IDeactivableDiffFilter.class)); + Set<IDeactivableDiffFilter> deactivableFilters = Sets + .newLinkedHashSet(Iterables.filter(getAllFilters(), IDeactivableDiffFilter.class)); if (activeFilters == null) { inactiveFilters = deactivableFilters; } else { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/StructureMergeViewerGrouper.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/StructureMergeViewerGrouper.java index 5504709de..197deb9be 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/StructureMergeViewerGrouper.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/StructureMergeViewerGrouper.java @@ -113,7 +113,8 @@ public final class StructureMergeViewerGrouper { * @param groupProvider * the selected IDifferenceGroupProvider. */ - protected void registerDifferenceGroupProvider(Notifier notifier, IDifferenceGroupProvider groupProvider) { + protected void registerDifferenceGroupProvider(Notifier notifier, + IDifferenceGroupProvider groupProvider) { List<Adapter> eAdapters = notifier.eAdapters(); Adapter oldGroupProvider = EcoreUtil.getAdapter(eAdapters, IDifferenceGroupProvider.class); if (oldGroupProvider != null) { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/BasicDifferenceGroupImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/BasicDifferenceGroupImpl.java index d241354cf..2a7ab755c 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/BasicDifferenceGroupImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/BasicDifferenceGroupImpl.java @@ -133,9 +133,10 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference */ public BasicDifferenceGroupImpl(Comparison comparison, Predicate<? super Diff> filter, ECrossReferenceAdapter crossReferenceAdapter) { - this(comparison, filter, - EMFCompareRCPUIMessages.getString("BasicDifferenceGroup.name"), EMFCompareRCPUIPlugin //$NON-NLS-1$ - .getImage("icons/full/toolb16/group.gif"), crossReferenceAdapter); //$NON-NLS-1$ + this(comparison, filter, EMFCompareRCPUIMessages.getString("BasicDifferenceGroup.name"), //$NON-NLS-1$ + EMFCompareRCPUIPlugin + .getImage("icons/full/toolb16/group.gif"), //$NON-NLS-1$ + crossReferenceAdapter); } /** @@ -539,9 +540,8 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference final ChildrenSide side; if (diff != null) { final Conflict c = diff.getConflict(); - if (c != null - && or(hasConflict(ConflictKind.PSEUDO), - and(hasConflict(ConflictKind.REAL), ofKind(DifferenceKind.ADD))).apply(diff)) { + if (c != null && or(hasConflict(ConflictKind.PSEUDO), + and(hasConflict(ConflictKind.REAL), ofKind(DifferenceKind.ADD))).apply(diff)) { side = ChildrenSide.getValueFrom(diff.getSource()); } else { side = ChildrenSide.BOTH; @@ -604,8 +604,8 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference return matchResourceSubTrees; } - final Iterable<ResourceAttachmentChange> attachmentChanges = Iterables.filter(comparison - .getDifferences(), ResourceAttachmentChange.class); + final Iterable<ResourceAttachmentChange> attachmentChanges = Iterables + .filter(comparison.getDifferences(), ResourceAttachmentChange.class); final Multimap<String, ResourceAttachmentChange> uriToRAC = LinkedHashMultimap.create(); for (ResourceAttachmentChange attachmentChange : attachmentChanges) { @@ -735,8 +735,8 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference for (TreeNode node : nodes) { EObject data = TREE_NODE_DATA.apply(node); if (data instanceof NotLoadedFragmentMatch) { - ((NotLoadedFragmentMatch)data).setName(ResourceUIUtil - .getResourceName((NotLoadedFragmentMatch)data)); + ((NotLoadedFragmentMatch)data) + .setName(ResourceUIUtil.getResourceName((NotLoadedFragmentMatch)data)); } } } @@ -780,8 +780,8 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference EObject data = TREE_NODE_DATA.apply(node); if (data instanceof NotLoadedFragmentMatch) { matches.add((Match)data); - ((NotLoadedFragmentMatch)data).setName(ResourceUIUtil - .getResourceName((NotLoadedFragmentMatch)data)); + ((NotLoadedFragmentMatch)data) + .setName(ResourceUIUtil.getResourceName((NotLoadedFragmentMatch)data)); newNodes.remove(node); fragmentNodes.add(node); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupDescriptorWrapper.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupDescriptorWrapper.java index 08fed43eb..1c10b6db9 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupDescriptorWrapper.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupDescriptorWrapper.java @@ -47,8 +47,8 @@ public class DifferenceGroupDescriptorWrapper extends AbstractItemDescriptor<IDi */ public DifferenceGroupDescriptorWrapper(String label, String description, IConfigurationElement elem, int rank, ComparisonType comparisonType) { - super(label, description, rank, elem - .getAttribute(DifferenceGroupProviderExtensionRegistryListener.ATT_CLASS)); + super(label, description, rank, + elem.getAttribute(DifferenceGroupProviderExtensionRegistryListener.ATT_CLASS)); this.element = elem; this.type = comparisonType; } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java index 9a6186d40..6e663d323 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java @@ -133,8 +133,8 @@ public class DifferenceGroupProviderExtensionRegistryListener extends AbstractRe } String label = element.getAttribute(ATT_LABEL); String description = element.getAttribute(ATT_DESCRIPTION); - DifferenceGroupDescriptorWrapper itemDescriptor = new DifferenceGroupDescriptorWrapper(label, description, - element, rank, type); + DifferenceGroupDescriptorWrapper itemDescriptor = new DifferenceGroupDescriptorWrapper(label, + description, element, rank, type); IItemDescriptor<Descriptor> previous = groupProviderRegistry.add(itemDescriptor); if (previous != null) { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupRegistryImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupRegistryImpl.java index 20e8f8cdb..3c4747864 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupRegistryImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupRegistryImpl.java @@ -124,8 +124,8 @@ public class DifferenceGroupRegistryImpl implements IDifferenceGroupProvider.Des Preconditions.checkNotNull(providerDescriptor); IDifferenceGroupProvider groupProvider = providerDescriptor.createGroupProvider(); WrapperItemDescriptor<IDifferenceGroupProvider.Descriptor> descriptor = new WrapperItemDescriptor<IDifferenceGroupProvider.Descriptor>( - providerDescriptor.getLabel(), providerDescriptor.getDescription(), providerDescriptor - .getRank(), groupProvider.getClass().getName(), providerDescriptor); + providerDescriptor.getLabel(), providerDescriptor.getDescription(), + providerDescriptor.getRank(), groupProvider.getClass().getName(), providerDescriptor); IItemDescriptor<Descriptor> oldValue = registry.add(descriptor); if (oldValue != null) { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java index 093afb5ff..efbfce9e5 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java @@ -41,20 +41,24 @@ public class KindGroupProvider extends AbstractDifferenceGroupProvider { @Override protected Collection<? extends IDifferenceGroup> buildGroups(Comparison comparison2) { final IDifferenceGroup additions = new BasicDifferenceGroupImpl(getComparison(), - ofKind(DifferenceKind.ADD), EMFCompareRCPUIMessages - .getString("KindGroupProvider.addition.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + ofKind(DifferenceKind.ADD), + EMFCompareRCPUIMessages.getString("KindGroupProvider.addition.label"), //$NON-NLS-1$ + getCrossReferenceAdapter()); ((BasicDifferenceGroupImpl)additions).buildSubTree(); final IDifferenceGroup deletions = new BasicDifferenceGroupImpl(getComparison(), - ofKind(DifferenceKind.DELETE), EMFCompareRCPUIMessages - .getString("KindGroupProvider.deletion.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + ofKind(DifferenceKind.DELETE), + EMFCompareRCPUIMessages.getString("KindGroupProvider.deletion.label"), //$NON-NLS-1$ + getCrossReferenceAdapter()); ((BasicDifferenceGroupImpl)deletions).buildSubTree(); final IDifferenceGroup changes = new BasicDifferenceGroupImpl(getComparison(), - ofKind(DifferenceKind.CHANGE), EMFCompareRCPUIMessages - .getString("KindGroupProvider.change.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + ofKind(DifferenceKind.CHANGE), + EMFCompareRCPUIMessages.getString("KindGroupProvider.change.label"), //$NON-NLS-1$ + getCrossReferenceAdapter()); ((BasicDifferenceGroupImpl)changes).buildSubTree(); final IDifferenceGroup moves = new BasicDifferenceGroupImpl(getComparison(), - ofKind(DifferenceKind.MOVE), EMFCompareRCPUIMessages - .getString("KindGroupProvider.move.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + ofKind(DifferenceKind.MOVE), + EMFCompareRCPUIMessages.getString("KindGroupProvider.move.label"), //$NON-NLS-1$ + getCrossReferenceAdapter()); ((BasicDifferenceGroupImpl)moves).buildSubTree(); Collection<IDifferenceGroup> groups = Lists.newArrayList(); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java index 3a7fffbae..ab1509628 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java @@ -112,8 +112,8 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv Iterator<EObject> eAllData = transform(eAllContents, TREE_NODE_DATA); UnmodifiableIterator<Diff> eAllDiffData = filter(eAllData, Diff.class); Collection<Diff> diffs = Sets.newHashSet(eAllDiffData); - boolean unresolvedDiffs = any(diffs, and(hasState(DifferenceState.UNRESOLVED), hasConflict( - ConflictKind.REAL, ConflictKind.PSEUDO))); + boolean unresolvedDiffs = any(diffs, and(hasState(DifferenceState.UNRESOLVED), + hasConflict(ConflictKind.REAL, ConflictKind.PSEUDO))); if (unresolvedDiffs) { ret.append("> ", Style.DECORATIONS_STYLER); //$NON-NLS-1$ } @@ -171,8 +171,8 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv */ protected void buildSubTree(TreeNode parentNode, Conflict conflict, Match match, Collection<Match> alreadyProcessedContainedMatches) { - buildSubTree(parentNode, conflict, match, alreadyProcessedContainedMatches, Sets - .<Match> newHashSet()); + buildSubTree(parentNode, conflict, match, alreadyProcessedContainedMatches, + Sets.<Match> newHashSet()); } /** @@ -190,18 +190,19 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv * already processed matches. */ private void buildSubTree(TreeNode parentNode, Conflict conflict, Match match, - Collection<Match> alreadyProcessedContainedMatches, Collection<Match> alreadyProcessedMatches) { + Collection<Match> alreadyProcessedContainedMatches, + Collection<Match> alreadyProcessedMatches) { // Use a LinkedHashSet for the first argument of Sets.intersection, in order to keep the order of // differences. - SetView<Diff> setView = Sets.intersection(Sets.newLinkedHashSet(match.getDifferences()), Sets - .newHashSet(conflict.getDifferences())); + SetView<Diff> setView = Sets.intersection(Sets.newLinkedHashSet(match.getDifferences()), + Sets.newHashSet(conflict.getDifferences())); for (Diff diff : setView) { if (!isParentPseudoConflictFromOtherSide(diff, parentNode.getData())) { TreeNode diffNode = wrap(diff); parentNode.getChildren().add(diffNode); if (isContainment(diff)) { - final Match diffMatch = ComparisonUtil.getComparison(diff).getMatch( - ((ReferenceChange)diff).getValue()); + final Match diffMatch = ComparisonUtil.getComparison(diff) + .getMatch(((ReferenceChange)diff).getValue()); if (diffMatch != null && !alreadyProcessedContainedMatches.contains(diffMatch)) { // we don't want callers deeper in the tree to modify the sets of already // processed contained matches @@ -269,8 +270,8 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv if (subMatch != null) { for (Diff diff : conflict.getDifferences()) { if (isContainment(diff)) { - final Match realMatch = diff.getMatch().getComparison().getMatch( - ((ReferenceChange)diff).getValue()); + final Match realMatch = diff.getMatch().getComparison() + .getMatch(((ReferenceChange)diff).getValue()); if (subMatch.equals(realMatch)) { return true; } @@ -313,19 +314,22 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv rightLabel = EMFCompareRCPUIMessages.getString("ThreeWayComparisonGroupProvider.right.label"); //$NON-NLS-1$ } - final BasicDifferenceGroupImpl conflicts = new ConflictsGroupImpl(getComparison(), hasConflict( - ConflictKind.REAL, ConflictKind.PSEUDO), EMFCompareRCPUIMessages - .getString("ThreeWayComparisonGroupProvider.conflicts.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + final BasicDifferenceGroupImpl conflicts = new ConflictsGroupImpl(getComparison(), + hasConflict(ConflictKind.REAL, ConflictKind.PSEUDO), + EMFCompareRCPUIMessages.getString("ThreeWayComparisonGroupProvider.conflicts.label"), //$NON-NLS-1$ + getCrossReferenceAdapter()); conflicts.buildSubTree(); - final BasicDifferenceGroupImpl leftSide = new BasicDifferenceGroupImpl(getComparison(), Predicates - .and(fromSide(DifferenceSource.LEFT), Predicates.not(hasConflict(ConflictKind.REAL, - ConflictKind.PSEUDO))), leftLabel, getCrossReferenceAdapter()); + final BasicDifferenceGroupImpl leftSide = new BasicDifferenceGroupImpl(getComparison(), + Predicates.and(fromSide(DifferenceSource.LEFT), + Predicates.not(hasConflict(ConflictKind.REAL, ConflictKind.PSEUDO))), + leftLabel, getCrossReferenceAdapter()); leftSide.buildSubTree(); - final BasicDifferenceGroupImpl rightSide = new BasicDifferenceGroupImpl(getComparison(), Predicates - .and(fromSide(DifferenceSource.RIGHT), Predicates.not(hasConflict(ConflictKind.REAL, - ConflictKind.PSEUDO))), rightLabel, getCrossReferenceAdapter()); + final BasicDifferenceGroupImpl rightSide = new BasicDifferenceGroupImpl(getComparison(), + Predicates.and(fromSide(DifferenceSource.RIGHT), + Predicates.not(hasConflict(ConflictKind.REAL, ConflictKind.PSEUDO))), + rightLabel, getCrossReferenceAdapter()); rightSide.buildSubTree(); return ImmutableList.of(conflicts, leftSide, rightSide); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java index acb55cfe1..704984b3f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java @@ -71,7 +71,7 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II * @param adapterFactory * the given factory * @param structureMergeViewerFilter - * the given structure merge viewer filter + * the given structure merge viewer filter */ public TreeNodeItemProviderSpec(AdapterFactory adapterFactory, StructureMergeViewerFilter structureMergeViewerFilter) { @@ -112,8 +112,8 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II TreeNode treeNode = (TreeNode)object; EObject data = treeNode.getData(); if (data instanceof Comparison) { - IDifferenceGroupProvider groupProvider = (IDifferenceGroupProvider)EcoreUtil.getExistingAdapter( - treeNode, IDifferenceGroupProvider.class); + IDifferenceGroupProvider groupProvider = (IDifferenceGroupProvider)EcoreUtil + .getExistingAdapter(treeNode, IDifferenceGroupProvider.class); Comparison comparison = (Comparison)data; Collection<? extends IDifferenceGroup> groups = groupProvider.getGroups(comparison); if (groups.isEmpty()) { @@ -153,8 +153,8 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II protected void initMapping(Collection<? extends IDifferenceGroup> groups, IDifferenceGroupProvider groupProvider, TreeNode treeNode) { for (IDifferenceGroup differenceGroup : groups) { - groupItemProviderAdapters.put(groupProvider, new GroupItemProviderAdapter(adapterFactory, - treeNode, differenceGroup)); + groupItemProviderAdapters.put(groupProvider, + new GroupItemProviderAdapter(adapterFactory, treeNode, differenceGroup)); } } @@ -176,13 +176,13 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II if (any(allDifferences, hasState(DifferenceState.UNRESOLVED))) { styledString.append("> ", Style.DECORATIONS_STYLER); //$NON-NLS-1$ } - treeNodeText = ((ExtendedAdapterFactoryItemDelegator)itemDelegator).getStyledText(treeNode - .getData()); + treeNodeText = ((ExtendedAdapterFactoryItemDelegator)itemDelegator) + .getStyledText(treeNode.getData()); } else if (data instanceof Conflict) { treeNodeText = getTreeNodeText(treeNode, (Conflict)data); } else { - treeNodeText = ((ExtendedAdapterFactoryItemDelegator)itemDelegator).getStyledText(treeNode - .getData()); + treeNodeText = ((ExtendedAdapterFactoryItemDelegator)itemDelegator) + .getStyledText(treeNode.getData()); } return styledString.append(treeNodeText); } @@ -272,8 +272,8 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II final Iterator<EObject> eAllContents = transform(visibleNodes, IDifferenceGroup.TREE_NODE_DATA); final Iterator<Diff> allDifferences = filter(eAllContents, Diff.class); final Collection<Diff> d = Sets.newHashSet(allDifferences); - final int unresolvedDiffCount = Iterables.size(Iterables.filter(d, - hasState(DifferenceState.UNRESOLVED))); + final int unresolvedDiffCount = Iterables + .size(Iterables.filter(d, hasState(DifferenceState.UNRESOLVED))); if (unresolvedDiffCount > 0) { ret.append("> ", Style.DECORATIONS_STYLER); //$NON-NLS-1$ @@ -286,9 +286,12 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II } if (unresolvedDiffCount > 0) { - ret.append(" [" //$NON-NLS-1$ - + EMFCompareEditMessages.getString("unresolved", Integer.valueOf(unresolvedDiffCount), //$NON-NLS-1$ - Integer.valueOf(d.size())) + "]", //$NON-NLS-1$ + ret.append( + " [" //$NON-NLS-1$ + + EMFCompareEditMessages.getString("unresolved", //$NON-NLS-1$ + Integer.valueOf(unresolvedDiffCount), + Integer.valueOf(d.size())) + + "]", //$NON-NLS-1$ Style.DECORATIONS_STYLER); } else { ret.append(" [" + EMFCompareEditMessages.getString("resolved") + "]", Style.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java index 715a409af..c3aec930b 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java @@ -283,16 +283,16 @@ public final class MergeViewerUtil { if (diffResourceURI.equals(resourceURI.toString())) { return resource; } else if (side == MergeViewerSide.RIGHT - && (diffResourceURI.equals(matchResource.getLeftURI()) || diffResourceURI - .equals(matchResource.getOriginURI()))) { + && (diffResourceURI.equals(matchResource.getLeftURI()) + || diffResourceURI.equals(matchResource.getOriginURI()))) { return resource; } else if (side == MergeViewerSide.LEFT - && (diffResourceURI.equals(matchResource.getRightURI()) || diffResourceURI - .equals(matchResource.getOriginURI()))) { + && (diffResourceURI.equals(matchResource.getRightURI()) + || diffResourceURI.equals(matchResource.getOriginURI()))) { return resource; } else if (side == MergeViewerSide.ANCESTOR - && (diffResourceURI.equals(matchResource.getLeftURI()) || diffResourceURI - .equals(matchResource.getRightURI()))) { + && (diffResourceURI.equals(matchResource.getLeftURI()) + || diffResourceURI.equals(matchResource.getRightURI()))) { return resource; } } @@ -323,7 +323,8 @@ public final class MergeViewerUtil { * @param side * @return */ - public static Object getResourceAttachmentChangeValue(ResourceAttachmentChange diff, MergeViewerSide side) { + public static Object getResourceAttachmentChangeValue(ResourceAttachmentChange diff, + MergeViewerSide side) { final Object ret; Match match = diff.getMatch(); switch (side) { @@ -368,8 +369,8 @@ public final class MergeViewerUtil { throw new IllegalStateException(); } } else { - ret = matchingValue(object, comparison, getResourceContents(comparison, side, - (ResourceAttachmentChange)object)); + ret = matchingValue(object, comparison, + getResourceContents(comparison, side, (ResourceAttachmentChange)object)); } } else { ret = matchingValue(object, comparison, getResourceContents(comparison, side, null)); @@ -404,8 +405,8 @@ public final class MergeViewerUtil { Iterable<TreeNode> nodes = groupProvider.getTreeNodes(diff); boolean isDisplayedInSMV = any(nodes, predicate); - boolean isPrimeRefining = !isEmpty(filter(transform(nodes, IDifferenceGroup.TREE_NODE_DATA), - IS_PRIME_REFINING)); + boolean isPrimeRefining = !isEmpty( + filter(transform(nodes, IDifferenceGroup.TREE_NODE_DATA), IS_PRIME_REFINING)); return (isDisplayedInSMV || isPrimeRefining); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java index 518b06c53..e1e5b4f9f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java @@ -641,8 +641,8 @@ public class ResourceUIUtil { Match matchParent = comparison.getMatch(firstLoadedParent); if (matchParent != null) { if (!comparison.getMatches().contains(matchParent)) { - container = new MergeViewerItem.Container(comparison, null, match.getLeft(), match - .getRight(), match.getOrigin(), side, adapterFactory); + container = new MergeViewerItem.Container(comparison, null, match.getLeft(), + match.getRight(), match.getOrigin(), side, adapterFactory); } else { container = null; } @@ -680,7 +680,8 @@ public class ResourceUIUtil { // Need to replace by top-container NotLoadedFragment item NotLoadedFragmentMatch notLoadedFragmentMatch = new NotLoadedFragmentMatch( notLoadedFragmentMatches); - for (NotLoadedFragmentMatch match : filter(notLoadedFragmentMatches, NotLoadedFragmentMatch.class)) { + for (NotLoadedFragmentMatch match : filter(notLoadedFragmentMatches, + NotLoadedFragmentMatch.class)) { match.setName(getResourceName(match)); } newContainer = new MergeViewerItem.Container(comparison, null, notLoadedFragmentMatch, |