diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui')
34 files changed, 166 insertions, 94 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/.settings/.api_filters b/plugins/org.eclipse.emf.compare.ide.ui/.settings/.api_filters new file mode 100644 index 000000000..dfdd15da0 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.ide.ui/.settings/.api_filters @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.emf.compare.ide.ui" version="2"> + <resource path="src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java" type="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.table.TableContentMergeViewer"> + <filter id="571519004"> + <message_arguments> + <message_argument value="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.table.TableContentMergeViewer.createMergeViewer(Composite, IMergeViewerMergeViewerSide)"/> + <message_argument value="ArrayContentProvider"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingFile.java" type="org.eclipse.emf.compare.ide.ui.internal.logical.ForwardingFile"> + <filter id="574619656"> + <message_arguments> + <message_argument value="IFile"/> + <message_argument value="ForwardingFile"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingResource.java" type="org.eclipse.emf.compare.ide.ui.internal.logical.ForwardingResource"> + <filter id="574619656"> + <message_arguments> + <message_argument value="IResource"/> + <message_argument value="ForwardingResource"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java" type="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.WrappableTreeViewer"> + <filter id="571473929"> + <message_arguments> + <message_argument value="TreeViewer"/> + <message_argument value="WrappableTreeViewer"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF index 3e470fe11..819d11c84 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.ide.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, @@ -37,7 +37,7 @@ Export-Package: org.eclipse.emf.compare.ide.ui.internal;x-internal:=true, org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions;x-internal:=true, org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;x-internal:=true, org.eclipse.emf.compare.ide.ui.internal.util;x-internal:=true, - org.eclipse.emf.compare.ide.ui.logical;x-internal:=true + org.eclipse.emf.compare.ide.ui.logical Import-Package: com.google.common.annotations;version="[11.0.0,15.0.0)", com.google.common.base;version="[11.0.0,15.0.0)", com.google.common.cache;version="[11.0.0,15.0.0)", diff --git a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml index eb5b3ab64..7dd893b6b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.ide.ui</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java index 56abb297c..10e6d85e2 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -93,7 +93,7 @@ import org.eclipse.ui.views.properties.PropertySheet; */ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer implements ISelectionChangedListener, ICompareColor.Provider, IAdaptable, CommandStackListener { - private static final String HANDLER_SERVICE = "fHandlerService"; + private static final String HANDLER_SERVICE = "fHandlerService"; //$NON-NLS-1$ /** * Width of center bar @@ -326,7 +326,7 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im IMenuService menuService = (IMenuService)workbench.getService(IMenuService.class); if (menuService != null) { menuService.populateContributionManager(toolBarManager, - "toolbar:org.eclipse.emf.compare.contentmergeviewer.toolbar"); + "toolbar:org.eclipse.emf.compare.contentmergeviewer.toolbar"); //$NON-NLS-1$ } } @@ -350,6 +350,7 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im */ @Override protected void copy(final boolean leftToRight) { + // TODO this is used from an action we delete from the view, so can probably be removed altogether final List<Diff> differences; if (getCompareConfiguration().getComparison().isThreeWay()) { diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java index 247bd5f10..d5a1eed9c 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -198,13 +198,13 @@ public class TableContentMergeViewer extends EMFCompareContentMergeViewer { IMergeViewerItem mergeViewerItem = (IMergeViewerItem)object; final Object value = mergeViewerItem.getSideValue(side); if (value instanceof EObject && ((EObject)value).eIsProxy()) { - text = "proxy : " + ((InternalEObject)value).eProxyURI().toString(); + text = "proxy : " + ((InternalEObject)value).eProxyURI().toString(); //$NON-NLS-1$ } else if (mergeViewerItem.isInsertionPoint()) { // workaround for 406513: Windows specific issue. Only labels of (Tree/Table)Item are // selectable on Windows platform. The labels of placeholders in (Tree/Table)Viewer // are one whitespace. Placeholder are then selectable at the very left of itself. // Add a 42 whitespaces label to workaround. - text = Strings.repeat(" ", 42); + text = Strings.repeat(" ", 42); //$NON-NLS-1$ } else { text = super.getColumnText(value, columnIndex); } @@ -313,9 +313,9 @@ public class TableContentMergeViewer extends EMFCompareContentMergeViewer { if (iContributionItem instanceof ActionContributionItem) { IAction action = ((ActionContributionItem)iContributionItem).getAction(); String id = action.getActionDefinitionId(); - if ("org.eclipse.compare.copyAllLeftToRight".equals(id)) { + if ("org.eclipse.compare.copyAllLeftToRight".equals(id)) { //$NON-NLS-1$ toolBarManager.remove(iContributionItem); - } else if ("org.eclipse.compare.copyAllRightToLeft".equals(id)) { + } else if ("org.eclipse.compare.copyAllRightToLeft".equals(id)) { //$NON-NLS-1$ toolBarManager.remove(iContributionItem); } } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java index e5d7f5977..222c01c1e 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -191,7 +191,6 @@ public class EMFCompareTextMergeViewer extends TextMergeViewer implements Comman }); } - @SuppressWarnings("resource") // closed by Closeables private String getString(IStreamContentAccessor contentAccessor) { String ret = null; @@ -232,7 +231,7 @@ public class EMFCompareTextMergeViewer extends TextMergeViewer implements Comman protected String getContents(boolean isLeft, String charsetName) { try { - return new String(getContents(isLeft), Charsets.UTF_8.name()); + return new String(getContents(isLeft), charsetName); } catch (UnsupportedEncodingException e) { // UTF_8 is a standard charset guaranteed to be supported by all Java platform // implementations diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java index f34368937..98a2bf535 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -255,20 +255,20 @@ public class TreeContentMergeViewer extends EMFCompareContentMergeViewer { IMergeViewerItem mergeViewerItem = (IMergeViewerItem)object; final Object value = mergeViewerItem.getSideValue(side); if (value instanceof EObject && ((EObject)value).eIsProxy()) { - text = "proxy : " + ((InternalEObject)value).eProxyURI().toString(); + text = "proxy : " + ((InternalEObject)value).eProxyURI().toString(); //$NON-NLS-1$ } else if (mergeViewerItem.isInsertionPoint()) { // workaround for 406513: Windows specific issue. Only labels of (Tree/Table)Item are // selectable on Windows platform. The labels of placeholders in (Tree/Table)Viewer // are one whitespace. Placeholder are then selectable at the very left of itself. // Add a 42 whitespaces label to workaround. - text = " "; + text = " "; //$NON-NLS-1$ } else if (value == null && mergeViewerItem.getSideValue(side.opposite()) instanceof Resource) { - text = "Unknown resource"; + text = getResourceBundle().getString("UnkownResource"); //$NON-NLS-1$ } else if (value == null && mergeViewerItem.getLeft() == null && mergeViewerItem.getRight() == null && mergeViewerItem.getAncestor() instanceof Resource) { - text = "Unknown resource"; + text = getResourceBundle().getString("UnkownResource"); //$NON-NLS-1$ } else { text = super.getText(value); } @@ -379,9 +379,9 @@ public class TreeContentMergeViewer extends EMFCompareContentMergeViewer { if (iContributionItem instanceof ActionContributionItem) { IAction action = ((ActionContributionItem)iContributionItem).getAction(); String id = action.getActionDefinitionId(); - if ("org.eclipse.compare.copyAllLeftToRight".equals(id)) { + if ("org.eclipse.compare.copyAllLeftToRight".equals(id)) { //$NON-NLS-1$ toolBarManager.remove(iContributionItem); - } else if ("org.eclipse.compare.copyAllRightToLeft".equals(id)) { + } else if ("org.eclipse.compare.copyAllRightToLeft".equals(id)) { //$NON-NLS-1$ toolBarManager.remove(iContributionItem); } } @@ -418,17 +418,17 @@ public class TreeContentMergeViewer extends EMFCompareContentMergeViewer { Rectangle rightBounds = rightItem.getBounds(); from.y = leftBounds.y + (leftBounds.height / 2) - leftClientArea.y; - if ("gtk".equals(SWT.getPlatform())) { + if ("gtk".equals(SWT.getPlatform())) { //$NON-NLS-1$ from.y -= 1; - } else if ("win32".equals(SWT.getPlatform())) { + } else if ("win32".equals(SWT.getPlatform())) { //$NON-NLS-1$ from.y += 1; } to.x = control.getBounds().width; to.y = rightBounds.y + (rightBounds.height / 2) - rightClientArea.y; - if ("gtk".equals(SWT.getPlatform())) { + if ("gtk".equals(SWT.getPlatform())) { //$NON-NLS-1$ to.y -= 1; - } else if ("win32".equals(SWT.getPlatform())) { + } else if ("win32".equals(SWT.getPlatform())) { //$NON-NLS-1$ to.y += 1; } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties index 9b7e4b3d9..e4958fda3 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties @@ -19,6 +19,8 @@ compareProgressTask.title= Computing Differences... tooComplexError.title= Error
tooComplexError.message= Too many differences. Turn on the 'Ignore White Space' option or do a structure compare first.
+UnkownResource = Unknown Resource
+
#####################################################
# Toolbar actions
#####################################################
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java index 79564e9a0..912e46d73 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -193,7 +193,7 @@ public class DynamicObject { if (member instanceof AccessibleObject) {
((AccessibleObject)member).setAccessible(true);
} else {
- throw new RuntimeException("Can not set accessible " + member);
+ throw new RuntimeException("Can not set accessible " + member); //$NON-NLS-1$
}
}
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java index 15fb344d5..ebe4cda2b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -77,8 +78,8 @@ public class CompareInDialog extends AbstractCompareHandler { && right instanceof EObject && (EcoreUtil.isAncestor((EObject)left, (EObject)right) || EcoreUtil.isAncestor( (EObject)right, (EObject)left))) { - MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", - "Can't run a comparison between an object and one of its ancestor."); + MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", //$NON-NLS-1$ + EMFCompareIDEUIMessages.getString("CompareSelfWithAncestor")); //$NON-NLS-1$ } else { final CompareEditorInput input = createCompareEditorInput(activePart, adapterFactory, left, right, origin); diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java index 8a493aead..742f36999 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -77,8 +78,8 @@ public class CompareInNewEditor extends AbstractCompareHandler { && right instanceof EObject && (EcoreUtil.isAncestor((EObject)left, (EObject)right) || EcoreUtil.isAncestor( (EObject)right, (EObject)left))) { - MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", - "Can't run a comparison between an object and one of its ancestor."); + MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", //$NON-NLS-1$ + EMFCompareIDEUIMessages.getString("CompareSelfWithAncestor")); //$NON-NLS-1$ } else { final CompareEditorInput input = createCompareEditorInput(activePart, adapterFactory, left, right, origin); diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java index 698a55dc7..18fa7139d 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -61,9 +61,10 @@ public class SelectAncestorDialog extends MessageDialog { for (int i = 0; i < 3; i++) { buttons[i] = new Button(composite, SWT.RADIO); buttons[i].addSelectionListener(selectionListener); - String text = "'" + AdapterFactoryUtil.getText(adapterFactory, notifiers[i]) + "'"; + @SuppressWarnings("deprecation") + String text = "'" + AdapterFactoryUtil.getText(adapterFactory, notifiers[i]) + "'"; //$NON-NLS-1$ //$NON-NLS-2$ if (notifiers[i] instanceof EObject) { - text = text + " (" + EcoreUtil.getURI(((EObject)notifiers[i])) + ")"; + text = text + " (" + EcoreUtil.getURI(((EObject)notifiers[i])) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } buttons[i].setText(text); buttons[i].setFont(parent.getFont()); diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties index bead3fbbb..b7b2c680f 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties @@ -37,4 +37,6 @@ dropdown.accept.tooltip = Show consequences of accepting change dropdown.reject.tooltip = Show consequences of rejecting change undo.menu.item.text = Merge -redo.menu.item.text = Merge
\ No newline at end of file +redo.menu.item.text = Merge + +CompareSelfWithAncestor = Cannot run a comparison between an object and one of its ancestors.
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java index 50b332ad7..85d500d6f 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,7 +47,6 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.team.core.subscribers.Subscriber;
import org.eclipse.team.core.subscribers.SubscriberMergeContext;
-import org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant;
@@ -194,11 +193,12 @@ public final class ComparisonScopeBuilder { */
@SuppressWarnings("restriction")
private static Subscriber getSubscriber(ICompareContainer container) {
- if (container instanceof ModelCompareEditorInput) {
- final ModelCompareEditorInput modelInput = (ModelCompareEditorInput)container;
+ if (container instanceof org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput) {
+ final org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput modelInput = (org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput)container;
ISynchronizeParticipant participant = null;
try {
- final Field field = ModelCompareEditorInput.class.getDeclaredField("participant"); //$NON-NLS-1$
+ final Field field = org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput.class
+ .getDeclaredField("participant"); //$NON-NLS-1$
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
field.setAccessible(true);
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingAdaptable.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingAdaptable.java index e2ae80bbb..be24c6567 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingAdaptable.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingAdaptable.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,8 @@ public abstract class ForwardingAdaptable extends ForwardingObject implements IA *
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ // Suppressing warning : super.getAdapter() is raw
+ @SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
return delegate().getAdapter(adapter);
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RevisionedURIConverter.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RevisionedURIConverter.java index 79667926c..dfea02f63 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RevisionedURIConverter.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RevisionedURIConverter.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2013 Obeo.
+ * Copyright (c) 2011, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -67,7 +67,6 @@ public final class RevisionedURIConverter extends StorageURIConverter { * @see org.eclipse.emf.compare.ide.utils.StorageURIConverter#createInputStream(org.eclipse.emf.common.util.URI,
* java.util.Map)
*/
- @SuppressWarnings("resource")
@Override
public InputStream createInputStream(URI uri, Map<?, ?> options) throws IOException {
InputStream stream = null;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressInfoComposite.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressInfoComposite.java index 605e1f1ee..bebb68913 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressInfoComposite.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressInfoComposite.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,7 +64,7 @@ public class JobProgressInfoComposite extends Composite { gridLayout.horizontalSpacing = 2;
setLayout(gridLayout);
- Image jobImage = EMFCompareIDEUIPlugin.getImage("icons/full/eobj16/task.gif");
+ Image jobImage = EMFCompareIDEUIPlugin.getImage("icons/full/eobj16/task.gif"); //$NON-NLS-1$
jobNameLabel = new Label(this, SWT.NONE);
int horizontalIndent = jobImage.getBounds().width + 2;
GridData gridData = new GridData();
@@ -101,8 +101,8 @@ public class JobProgressInfoComposite extends Composite { JobProgressInfoComposite.this.job.cancel();
}
});
- actionButton.setImage(EMFCompareIDEUIPlugin.getImage("icons/full/dobj16/stop.gif"));
- actionButton.setDisabledImage(EMFCompareIDEUIPlugin.getImage("icons/full/eobj16/stop.gif"));
+ actionButton.setImage(EMFCompareIDEUIPlugin.getImage("icons/full/dobj16/stop.gif")); //$NON-NLS-1$
+ actionButton.setDisabledImage(EMFCompareIDEUIPlugin.getImage("icons/full/eobj16/stop.gif")); //$NON-NLS-1$
taskNameLabel = new Label(this, SWT.NONE);
gridData = new GridData();
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressMonitorWrapper.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressMonitorWrapper.java index 540794f13..46cc02238 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressMonitorWrapper.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressMonitorWrapper.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,12 +38,12 @@ public final class JobProgressMonitorWrapper extends ProgressMonitorWrapper { * @see org.eclipse.core.runtime.ProgressMonitorWrapper#beginTask(java.lang.String, int)
*/
@Override
- public void beginTask(String name, int totalWork) {
- this.totalWork = totalWork;
+ public void beginTask(String name, int tota) {
+ this.totalWork = tota;
this.worked = 0;
this.progressInfoItem.init();
this.progressInfoItem.setTaskName(name);
- super.beginTask(name, totalWork);
+ super.beginTask(name, tota);
}
/**
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java index 495b00e86..c6ea4ab90 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -364,6 +364,8 @@ public abstract class AbstractStructuredViewerWrapper<C extends Control, V exten *
* @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, boolean)
*/
+ // Suppressing warning : super is raw
+ @SuppressWarnings("rawtypes")
@Override
protected final void setSelectionToWidget(List l, boolean reveal) {
fViewer.setSelectionToWidget(l, reveal);
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java index f5048801c..b84b8311b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -92,7 +92,7 @@ public class CompareToolBar implements ISelectionChangedListener { IMenuService menuService = (IMenuService)workbench.getService(IMenuService.class);
if (menuService != null) {
menuService.populateContributionManager(toolbarManager,
- "toolbar:org.eclipse.emf.compare.structuremergeviewer.toolbar");
+ "toolbar:org.eclipse.emf.compare.structuremergeviewer.toolbar"); //$NON-NLS-1$
}
boolean leftEditable = compareConfiguration.isLeftEditable();
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java index 17e30a969..67ef5ed4d 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -228,7 +228,7 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap } }; - navigatable = new Navigatable(fAdapterFactory, getViewer()); + navigatable = new Navigatable(getViewer()); toolBar = new CompareToolBar(structureMergeViewerGrouper, structureMergeViewerFilter, getCompareConfiguration()); @@ -340,12 +340,12 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap * @see org.eclipse.jface.viewers.TreeViewer#isExpandable(java.lang.Object) */ @Override - public boolean isExpandable(Object parent) { + public boolean isExpandable(Object element) { if (hasFilters()) { // workaround for 65762 - return getFilteredChildren(parent).length > 0; + return getFilteredChildren(element).length > 0; } - return super.isExpandable(parent); + return super.isExpandable(element); } }; treeViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -432,7 +432,7 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap } @Subscribe - public void mergePreviewModeChange(IMergePreviewModeChange event) { + public void mergePreviewModeChange(@SuppressWarnings("unused") IMergePreviewModeChange event) { dependencyData.updateDependencies(getSelection()); internalRedraw(); } @@ -445,7 +445,8 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap } @Subscribe - public void handleDifferenceGroupProviderChange(IDifferenceGroupProviderChange event) { + public void handleDifferenceGroupProviderChange( + @SuppressWarnings("unused") IDifferenceGroupProviderChange event) { SWTUtil.safeRefresh(this, false); } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/IWrappableStructuredViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/IWrappableStructuredViewer.java index 937e15e1d..c1a6147ca 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/IWrappableStructuredViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/IWrappableStructuredViewer.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -220,6 +220,8 @@ interface IWrappableStructuredViewer { *
* @see org.eclipse.jface.viewers.StructuredViewer#getSelectionFromWidget()
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
List getSelectionFromWidget();
/**
@@ -440,6 +442,8 @@ interface IWrappableStructuredViewer { *
* @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, boolean)
*/
+ @SuppressWarnings("rawtypes")
+ // Suppressing warning since super is raw
void setSelectionToWidget(List l, boolean reveal);
/**
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java index 3443925cc..7a69f448b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@ package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer; import java.util.Arrays;
import org.eclipse.compare.INavigatable;
-import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.ISelection;
@@ -26,15 +25,12 @@ import org.eclipse.swt.widgets.Item; */
public class Navigatable implements INavigatable {
- private final AdapterFactory adapterFactory;
-
private final WrappableTreeViewer viewer;
/**
* @param adapterFactory
*/
- public Navigatable(AdapterFactory adapterFactory, WrappableTreeViewer viewer) {
- this.adapterFactory = adapterFactory;
+ public Navigatable(WrappableTreeViewer viewer) {
this.viewer = viewer;
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java index 61453875c..da8aa0223 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -221,6 +221,8 @@ class WrappableTreeViewer extends TreeViewer implements IWrappableStructuredView *
* @see org.eclipse.jface.viewers.TreeViewer#setSelection(java.util.List)
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
@Override
public void setSelection(List items) {
super.setSelection(items);
@@ -481,6 +483,8 @@ class WrappableTreeViewer extends TreeViewer implements IWrappableStructuredView * @see org.eclipse.jface.viewers.AbstractTreeViewer#isSameSelection(java.util.List,
* org.eclipse.swt.widgets.Item[])
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
@Override
public boolean isSameSelection(List items, Item[] current) {
return super.isSameSelection(items, current);
@@ -542,6 +546,8 @@ class WrappableTreeViewer extends TreeViewer implements IWrappableStructuredView *
* @see org.eclipse.jface.viewers.AbstractTreeViewer#getSelectionFromWidget()
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
@Override
public List getSelectionFromWidget() {
return super.getSelectionFromWidget();
@@ -675,6 +681,8 @@ class WrappableTreeViewer extends TreeViewer implements IWrappableStructuredView *
* @see org.eclipse.jface.viewers.AbstractTreeViewer#setSelectionToWidget(java.util.List, boolean)
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
@Override
public void setSelectionToWidget(List v, boolean reveal) {
super.setSelectionToWidget(v, reveal);
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java index b0b4eb282..7dbeb9c7f 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -31,6 +31,7 @@ import org.eclipse.emf.compare.domain.IMergeRunnable; import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages; import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin; import org.eclipse.emf.compare.internal.merge.MergeMode; +import org.eclipse.emf.compare.internal.utils.ComparisonUtil; import org.eclipse.emf.compare.merge.IMerger; import org.eclipse.emf.compare.merge.IMerger.Registry; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroup; @@ -155,8 +156,8 @@ public class MergeAction extends BaseSelectionListenerAction { List<Diff> differencesToMerge = newArrayList(selectedDifferences); if (cascadingDifferencesFilterEnabled) { - Iterable<Diff> cascadingDifferences = concat(transform(selectedDifferences, - org.eclipse.emf.compare.utils.DiffUtil.getSubDiffs(leftToRight))); + Iterable<Diff> cascadingDifferences = concat(transform(selectedDifferences, ComparisonUtil + .getSubDiffs(leftToRight))); addAll(differencesToMerge, cascadingDifferences); } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java index 406800e95..60b117305 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -78,31 +78,31 @@ final class MergeRunnableImpl implements IMergeRunnable { * @param isLeftEditable
* @param isRightEditable
*/
- private void markAllAsMerged(Collection<Diff> diffToMarkAsMerged, MergeMode mergeMode) {
+ private void markAllAsMerged(Collection<Diff> diffToMarkAsMerged, MergeMode mode) {
for (Diff diff : diffToMarkAsMerged) {
- markAsMerged(diff, mergeMode);
+ markAsMerged(diff, mode);
}
}
- private void markAsMerged(Diff diff, MergeMode mergeMode) {
+ private void markAsMerged(Diff diff, MergeMode mode) {
diff.setState(DifferenceState.MERGED);
- addOrUpdateMergeData(diff, mergeMode);
+ addOrUpdateMergeData(diff, mode);
}
- private void addOrUpdateMergeData(Collection<Diff> differences, MergeMode mergeMode) {
+ private void addOrUpdateMergeData(Collection<Diff> differences, MergeMode mode) {
for (Diff difference : differences) {
- addOrUpdateMergeData(difference, mergeMode);
+ addOrUpdateMergeData(difference, mode);
}
}
- private void addOrUpdateMergeData(Diff diff, MergeMode mergeMode) {
+ private void addOrUpdateMergeData(Diff diff, MergeMode mode) {
IMergeData mergeData = (IMergeData)EcoreUtil.getExistingAdapter(diff, IMergeData.class);
if (mergeData != null) {
- mergeData.setMergeMode(mergeMode);
+ mergeData.setMergeMode(mode);
mergeData.setLeftEditable(isLeftEditable);
mergeData.setRightEditable(isRightEditable);
} else {
- mergeData = new MergeDataImpl(mergeMode, isLeftEditable, isRightEditable);
+ mergeData = new MergeDataImpl(mode, isLeftEditable, isRightEditable);
diff.eAdapters().add(mergeData);
}
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInput.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInput.java index 0849434d5..54e316c72 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInput.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -80,8 +80,8 @@ public class TreeNodeCompareInput extends CompareInputAdapter implements INotify } if (getAdapterFactory() instanceof IChangeNotifier) { - IChangeNotifier changeNotifier = (IChangeNotifier)getAdapterFactory(); - changeNotifier.fireNotifyChanged(notification); + IChangeNotifier localChangeNotifier = (IChangeNotifier)getAdapterFactory(); + localChangeNotifier.fireNotifyChanged(notification); } } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java index 460e88017..a51a23491 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java @@ -1,3 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2007, 2014 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + * Obeo - adapted for EMF Compare + *******************************************************************************/ package org.eclipse.emf.compare.ide.ui.internal.util; import java.util.ArrayList; @@ -17,7 +28,7 @@ import org.eclipse.ui.services.IServiceLocator; public class CompareHandlerService { - private final List fActivations = new ArrayList(); + private final List<IHandlerActivation> fActivations = new ArrayList<IHandlerActivation>(); private final Expression fExpression; @@ -25,7 +36,7 @@ public class CompareHandlerService { private boolean fDisposed; - private List fPaneActivations = new ArrayList(); + private List<IHandlerActivation> fPaneActivations = new ArrayList<IHandlerActivation>(); private IHandlerService fHandlerService; diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java index d85da64d4..fa18d1e52 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@ import com.google.common.annotations.Beta; * code.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public abstract class AbstractModelResolver implements IModelResolver {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java index 1085ee54a..33b0f65b0 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; * scope, since we know there can be no differences on such resources.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
+ * @since 4.0
*/
@Beta
public interface IModelMinimizer {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelResolver.java index 7b07bcdb1..08495db1e 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelResolver.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelResolver.java @@ -25,6 +25,7 @@ import org.eclipse.emf.compare.ide.utils.StorageTraversal; * </p>
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public interface IModelResolver {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProvider.java index 50e6cd3da..7e3b3dba1 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProvider.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProvider.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; * Used by the logical model to wrap types that can provide IStorages.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public interface IStorageProvider {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java index f3796c3ea..daffbfb7a 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.CoreException; * proper remote content.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public interface IStorageProviderAccessor {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java index eae2c10cd..ba53ee771 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2013 Obeo.
+ * Copyright (c) 2011, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@ import org.eclipse.emf.compare.ide.utils.StorageTraversal; * sides of a comparison while we build its scope.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public final class SynchronizationModel {
|