diff -pruN 4.8-1/bundles/org.eclipse.compare/about.html 4.9-1/bundles/org.eclipse.compare/about.html --- 4.8-1/bundles/org.eclipse.compare/about.html 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/about.html 2018-08-27 13:38:05.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

June 2, 2006

-

License

+

About This Content

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

November 30, 2017

+

License

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+ +

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.compare/build.properties 4.9-1/bundles/org.eclipse.compare/build.properties --- 4.8-1/bundles/org.eclipse.compare/build.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/build.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2011 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareNavigator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareNavigator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareNavigator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareNavigator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IDocumentRange.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IDocumentRange.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IDocumentRange.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IDocumentRange.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IFlushable.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IFlushable.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IFlushable.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IFlushable.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IMergeViewerContentProvider.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IMergeViewerContentProvider.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IMergeViewerContentProvider.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/IMergeViewerContentProvider.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ITokenComparator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ITokenComparator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ITokenComparator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ITokenComparator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -26,6 +29,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.ResourceBundle; import org.eclipse.compare.CompareConfiguration; @@ -855,7 +859,7 @@ public class TextMergeViewer extends Con StyledText textWidget = fSourceViewer.getSourceViewer().getTextWidget(); if (textWidget != null && !textWidget.isDisposed()) { if (fNeedsValidation) { - fSourceViewer.getSourceViewer().getTextWidget().removeVerifyListener(this); + textWidget.removeVerifyListener(this); fNeedsValidation = false; } IDocument oldDoc= internalGetDocument(fSourceViewer); @@ -1292,32 +1296,41 @@ public class TextMergeViewer extends Con @Override public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) { - return fFocusPart.getSourceViewer().getFindReplaceTarget().findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord); + return Optional.ofNullable(getTarget()).map( + target -> target.findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord)) + .orElse(-1); + } + + private IFindReplaceTarget getTarget() { + return Optional.ofNullable(fFocusPart).map(MergeSourceViewer::getSourceViewer) + .map(SourceViewer::getFindReplaceTarget) + .orElse(null); } @Override public Point getSelection() { - return fFocusPart.getSourceViewer().getFindReplaceTarget().getSelection(); + return Optional.ofNullable(getTarget()).map(target -> target.getSelection()) + .orElse(new Point(-1, -1)); } @Override public String getSelectionText() { - return fFocusPart.getSourceViewer().getFindReplaceTarget().getSelectionText(); + return Optional.ofNullable(getTarget()).map(IFindReplaceTarget::getSelectionText).orElse(""); //$NON-NLS-1$ } @Override public boolean isEditable() { - return fFocusPart.getSourceViewer().getFindReplaceTarget().isEditable(); + return Optional.ofNullable(getTarget()).map(IFindReplaceTarget::isEditable).orElse(false); } @Override public void replaceSelection(String text) { - fFocusPart.getSourceViewer().getFindReplaceTarget().replaceSelection(text); + Optional.ofNullable(getTarget()).ifPresent(target -> target.replaceSelection(text)); } @Override public int findAndSelect(int offset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord, boolean regExSearch) { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension3) { return ((IFindReplaceTargetExtension3) findReplaceTarget).findAndSelect(offset, findString, searchForward, caseSensitive, wholeWord, regExSearch); } @@ -1330,7 +1343,7 @@ public class TextMergeViewer extends Con @Override public void replaceSelection(String text, boolean regExReplace) { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension3) { ((IFindReplaceTargetExtension3) findReplaceTarget).replaceSelection(text, regExReplace); return; @@ -1343,16 +1356,17 @@ public class TextMergeViewer extends Con @Override public boolean validateTargetState() { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension2) { return ((IFindReplaceTargetExtension2) findReplaceTarget).validateTargetState(); } + // TODO not sure if true when findReplaceTarget is null return true; } @Override public void beginSession() { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension) { ((IFindReplaceTargetExtension) findReplaceTarget).beginSession(); } @@ -1360,7 +1374,7 @@ public class TextMergeViewer extends Con @Override public void endSession() { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension) { ((IFindReplaceTargetExtension) findReplaceTarget).endSession(); } @@ -1368,7 +1382,7 @@ public class TextMergeViewer extends Con @Override public IRegion getScope() { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension) { return ((IFindReplaceTargetExtension) findReplaceTarget).getScope(); } @@ -1377,7 +1391,7 @@ public class TextMergeViewer extends Con @Override public void setScope(IRegion scope) { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension) { ((IFindReplaceTargetExtension) findReplaceTarget).setScope(scope); } @@ -1385,7 +1399,7 @@ public class TextMergeViewer extends Con @Override public Point getLineSelection() { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension) { return ((IFindReplaceTargetExtension) findReplaceTarget).getLineSelection(); } @@ -1394,7 +1408,7 @@ public class TextMergeViewer extends Con @Override public void setSelection(int offset, int length) { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension) { ((IFindReplaceTargetExtension) findReplaceTarget).setSelection(offset, length); } @@ -1402,7 +1416,7 @@ public class TextMergeViewer extends Con @Override public void setScopeHighlightColor(Color color) { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension) { ((IFindReplaceTargetExtension) findReplaceTarget).setScopeHighlightColor(color); } @@ -1410,7 +1424,7 @@ public class TextMergeViewer extends Con @Override public void setReplaceAllMode(boolean replaceAll) { - IFindReplaceTarget findReplaceTarget = fFocusPart.getSourceViewer().getFindReplaceTarget(); + IFindReplaceTarget findReplaceTarget = getTarget(); if (findReplaceTarget instanceof IFindReplaceTargetExtension) { ((IFindReplaceTargetExtension) findReplaceTarget).setReplaceAllMode(replaceAll); } @@ -3826,97 +3840,70 @@ public class TextMergeViewer extends Con private void configureCompareFilterActions(Object input, Object ancestor, Object left, Object right) { - if (getCompareConfiguration() != null) { - CompareFilterDescriptor[] compareFilterDescriptors = - CompareUIPlugin.getDefault().findCompareFilters(input); - - Object current = getCompareConfiguration().getProperty( - ChangeCompareFilterPropertyAction.COMPARE_FILTER_ACTIONS); - boolean currentFiltersMatch = false; - if (current != null - && current instanceof List - && ((List) current).size() == compareFilterDescriptors.length) { - currentFiltersMatch = true; - @SuppressWarnings("unchecked") - List currentFilterActions = - (List) current; - for (int i = 0; i < compareFilterDescriptors.length; i++) { - boolean match = false; - for (int j = 0; j < currentFilterActions.size(); j++) { - if (compareFilterDescriptors[i] - .getFilterId() - .equals(currentFilterActions.get(j).getFilterId())) { - match = true; - break; - } - } - if (!match) { - currentFiltersMatch = false; + if (getCompareConfiguration() == null) { + return; + } + + CompareFilterDescriptor[] compareFilterDescriptors = CompareUIPlugin.getDefault().findCompareFilters(input); + Object current = getCompareConfiguration() + .getProperty(ChangeCompareFilterPropertyAction.COMPARE_FILTER_ACTIONS); + boolean currentFiltersMatch = false; + if (current != null && current instanceof List + && ((List) current).size() == compareFilterDescriptors.length) { + currentFiltersMatch = true; + @SuppressWarnings("unchecked") + List currentFilterActions = (List) current; + for (int i = 0; i < compareFilterDescriptors.length; i++) { + boolean match = false; + for (int j = 0; j < currentFilterActions.size(); j++) { + if (compareFilterDescriptors[i].getFilterId().equals(currentFilterActions.get(j).getFilterId())) { + match = true; break; } } + if (!match) { + currentFiltersMatch = false; + break; + } } - - if (!currentFiltersMatch) { - getCompareConfiguration() - .setProperty( - ChangeCompareFilterPropertyAction.COMPARE_FILTERS_INITIALIZING, - Boolean.TRUE); - disposeCompareFilterActions(true); - fCompareFilterActions.clear(); - for (int i = 0; i < compareFilterDescriptors.length; i++) { - ChangeCompareFilterPropertyAction compareFilterAction = new ChangeCompareFilterPropertyAction( - compareFilterDescriptors[i], - getCompareConfiguration()); - compareFilterAction.setInput(input, ancestor, left, right); - fCompareFilterActions.add(compareFilterAction); - fLeft.addTextAction(compareFilterAction); - fRight.addTextAction(compareFilterAction); - fAncestor.addTextAction(compareFilterAction); - - if (getCompareConfiguration().getContainer() - .getActionBars() != null) { + } + if (!currentFiltersMatch) { + getCompareConfiguration().setProperty(ChangeCompareFilterPropertyAction.COMPARE_FILTERS_INITIALIZING, + Boolean.TRUE); + disposeCompareFilterActions(true); + fCompareFilterActions.clear(); + for (int i = 0; i < compareFilterDescriptors.length; i++) { + ChangeCompareFilterPropertyAction compareFilterAction = new ChangeCompareFilterPropertyAction( + compareFilterDescriptors[i], getCompareConfiguration()); + compareFilterAction.setInput(input, ancestor, left, right); + fCompareFilterActions.add(compareFilterAction); + fLeft.addTextAction(compareFilterAction); + fRight.addTextAction(compareFilterAction); + fAncestor.addTextAction(compareFilterAction); + + if (getCompareConfiguration().getContainer().getActionBars() != null) { + getCompareConfiguration().getContainer().getActionBars().getToolBarManager() + .appendToGroup(CompareEditorContributor.FILTER_SEPARATOR, compareFilterAction); + if (compareFilterAction.getActionDefinitionId() != null) getCompareConfiguration() .getContainer() .getActionBars() - .getToolBarManager() - .appendToGroup( - CompareEditorContributor.FILTER_SEPARATOR, + .setGlobalActionHandler(compareFilterAction.getActionDefinitionId(), compareFilterAction); - if (compareFilterAction.getActionDefinitionId() != null) - getCompareConfiguration() - .getContainer() - .getActionBars() - .setGlobalActionHandler( - compareFilterAction - .getActionDefinitionId(), - compareFilterAction); - } - } - if (!fCompareFilterActions.isEmpty() - && getCompareConfiguration().getContainer() - .getActionBars() != null) { - getCompareConfiguration().getContainer().getActionBars() - .getToolBarManager().markDirty(); - getCompareConfiguration().getContainer().getActionBars() - .getToolBarManager().update(true); - getCompareConfiguration().getContainer().getActionBars() - .updateActionBars(); - } - getCompareConfiguration() - .setProperty( - ChangeCompareFilterPropertyAction.COMPARE_FILTER_ACTIONS, - fCompareFilterActions); - getCompareConfiguration() - .setProperty( - ChangeCompareFilterPropertyAction.COMPARE_FILTERS_INITIALIZING, - null); - } else { - for (int i = 0; i < fCompareFilterActions.size(); i++) { - fCompareFilterActions - .get(i).setInput(input, ancestor, left, right); } } + if (!fCompareFilterActions.isEmpty() && getCompareConfiguration().getContainer().getActionBars() != null) { + getCompareConfiguration().getContainer().getActionBars().getToolBarManager().markDirty(); + getCompareConfiguration().getContainer().getActionBars().getToolBarManager().update(true); + getCompareConfiguration().getContainer().getActionBars().updateActionBars(); + } + getCompareConfiguration().setProperty(ChangeCompareFilterPropertyAction.COMPARE_FILTER_ACTIONS, + fCompareFilterActions); + getCompareConfiguration().setProperty(ChangeCompareFilterPropertyAction.COMPARE_FILTERS_INITIALIZING, null); + } else { + for (int i = 0; i < fCompareFilterActions.size(); i++) { + fCompareFilterActions.get(i).setInput(input, ancestor, left, right); + } } } diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2016 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareContainer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareContainer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareContainer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareContainer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareFilter.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareFilter.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareFilter.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareFilter.java 2018-08-27 13:38:05.000000000 +0000 @@ -6,10 +6,13 @@ import org.eclipse.jface.text.IRegion; /******************************************************************************* * Copyright (c) 2013 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareInputLabelProvider.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareInputLabelProvider.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareInputLabelProvider.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareInputLabelProvider.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareNavigator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareNavigator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareNavigator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareNavigator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IContentChangeListener.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IContentChangeListener.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IContentChangeListener.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IContentChangeListener.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IContentChangeNotifier.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IContentChangeNotifier.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IContentChangeNotifier.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IContentChangeNotifier.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContentExtension.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContentExtension.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContentExtension.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContentExtension.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IModificationDate.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IModificationDate.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IModificationDate.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IModificationDate.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/INavigatable.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/INavigatable.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/INavigatable.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/INavigatable.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AbstractViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AbstractViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AbstractViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AbstractViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AdapterFactory.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AdapterFactory.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AdapterFactory.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AdapterFactory.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2011 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerResources.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerResources.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerResources.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerResources.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2011 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BufferedCanvas.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BufferedCanvas.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BufferedCanvas.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BufferedCanvas.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BufferedResourceNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BufferedResourceNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BufferedResourceNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BufferedResourceNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangeCompareFilterPropertyAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangeCompareFilterPropertyAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangeCompareFilterPropertyAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangeCompareFilterPropertyAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2013 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContainer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContainer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContainer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContainer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2013 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorInputNavigator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorInputNavigator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorInputNavigator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorInputNavigator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorSelectionProvider.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorSelectionProvider.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorSelectionProvider.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorSelectionProvider.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareFilterDescriptor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareFilterDescriptor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareFilterDescriptor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareFilterDescriptor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferenceInitializer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferenceInitializer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferenceInitializer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferenceInitializer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -54,7 +57,7 @@ import org.eclipse.ui.preferences.IWorkb public class ComparePreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - class FakeInput implements ITypedElement, IEncodedStreamContentAccessor { + private static class FakeInput implements ITypedElement, IEncodedStreamContentAccessor { static final String UTF_16= "UTF-16"; //$NON-NLS-1$ String fContent; @@ -81,6 +84,21 @@ public class ComparePreferencePage exten public String getCharset() { return UTF_16; } + + private String loadPreviewContentFromFile(String key) { + + String preview= Utilities.getString(key); + String separator= System.getProperty("line.separator"); //$NON-NLS-1$ + StringBuilder buffer= new StringBuilder(); + for (int i= 0; i < preview.length(); i++) { + char c= preview.charAt(i); + if (c == '\n') + buffer.append(separator); + else + buffer.append(c); + } + return buffer.toString(); + } } private static final String PREFIX= CompareUIPlugin.PLUGIN_ID + "."; //$NON-NLS-1$ @@ -103,7 +121,6 @@ public class ComparePreferencePage exten public static final String SWAPPED = PREFIX + "Swapped"; //$NON-NLS-1$ - private TextMergeViewer fPreviewViewer; private IPropertyChangeListener fPreferenceChangeListener; private CompareConfiguration fCompareConfiguration; private OverlayPreferenceStore fOverlayStore; @@ -149,10 +166,8 @@ public class ComparePreferencePage exten store.setDefault(PREF_SAVE_ALL_EDITORS, false); store.setDefault(ADDED_LINES_REGEX, ""); //$NON-NLS-1$ store.setDefault(REMOVED_LINES_REGEX, ""); //$NON-NLS-1$ - //store.setDefault(USE_SPLINES, false); store.setDefault(USE_SINGLE_LINE, true); store.setDefault(HIGHLIGHT_TOKEN_CHANGES, true); - //store.setDefault(USE_RESOLVE_UI, false); store.setDefault(CAPPING_DISABLED, false); store.setDefault(PATH_FILTER, ""); //$NON-NLS-1$ store.setDefault(ICompareUIConstants.PREF_NAVIGATION_END_ACTION, ICompareUIConstants.PREF_VALUE_PROMPT); @@ -162,8 +177,6 @@ public class ComparePreferencePage exten public ComparePreferencePage() { - //setDescription(Utilities.getString("ComparePreferencePage.description")); //$NON-NLS-1$ - setPreferenceStore(CompareUIPlugin.getDefault().getPreferenceStore()); fOverlayStore= new OverlayPreferenceStore(getPreferenceStore(), fKeys); @@ -189,7 +202,7 @@ public class ComparePreferencePage exten fOverlayStore.setValue(ADDED_LINES_REGEX, addedLinesRegex.getText()); fOverlayStore.setValue(REMOVED_LINES_REGEX, removedLinesRegex.getText()); - editors.forEach(editor -> editor.store()); + editors.forEach(FieldEditor::store); fOverlayStore.propagate(); ComparePlugin.getDefault().setCappingDisabled( @@ -222,12 +235,12 @@ public class ComparePreferencePage exten super.dispose(); } - static public boolean getSaveAllEditors() { + public static boolean getSaveAllEditors() { IPreferenceStore store= CompareUIPlugin.getDefault().getPreferenceStore(); return store.getBoolean(PREF_SAVE_ALL_EDITORS); } - static public void setSaveAllEditors(boolean value) { + public static void setSaveAllEditors(boolean value) { IPreferenceStore store= CompareUIPlugin.getDefault().getPreferenceStore(); store.setValue(PREF_SAVE_ALL_EDITORS, value); } @@ -246,12 +259,10 @@ public class ComparePreferencePage exten TabItem item= new TabItem(folder, SWT.NONE); item.setText(Utilities.getString("ComparePreferencePage.generalTab.label")); //$NON-NLS-1$ - //item.setImage(JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CFILE)); item.setControl(createGeneralPage(folder)); item= new TabItem(folder, SWT.NONE); item.setText(Utilities.getString("ComparePreferencePage.textCompareTab.label")); //$NON-NLS-1$ - //item.setImage(JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CFILE)); item.setControl(createTextComparePage(folder)); fTextCompareTab = item; @@ -399,7 +410,7 @@ public class ComparePreferencePage exten fCompareConfiguration.setRightLabel(Utilities.getString("ComparePreferencePage.right.label")); //$NON-NLS-1$ fCompareConfiguration.setRightEditable(false); - fPreviewViewer= new TextMergeViewer(parent, SWT.BORDER, fCompareConfiguration); + TextMergeViewer fPreviewViewer= new TextMergeViewer(parent, SWT.BORDER, fCompareConfiguration); fPreviewViewer.setInput( new DiffNode(Differencer.CONFLICTING, @@ -434,7 +445,7 @@ public class ComparePreferencePage exten if (removedLinesRegex != null) removedLinesRegex.setText(fOverlayStore.getString(REMOVED_LINES_REGEX)); - editors.forEach(editor -> editor.load()); + editors.forEach(FieldEditor::load); } // overlay stuff @@ -466,21 +477,6 @@ public class ComparePreferencePage exten return checkBox; } - private String loadPreviewContentFromFile(String key) { - - String preview= Utilities.getString(key); - String separator= System.getProperty("line.separator"); //$NON-NLS-1$ - StringBuilder buffer= new StringBuilder(); - for (int i= 0; i < preview.length(); i++) { - char c= preview.charAt(i); - if (c == '\n') - buffer.append(separator); - else - buffer.append(c); - } - return buffer.toString(); - } - @Override public void applyData(Object data) { if (ComparePreferencePage.CAPPING_DISABLED.equals(data)) { diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2013 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2011 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2011 Aleksandra Wozniak and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Aleksandra Wozniak (aleksandra.k.wozniak@gmail.com) - initial implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Aleksandra Wozniak and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Aleksandra Wozniak (aleksandra.k.wozniak@gmail.com) - initial implementation @@ -17,35 +20,14 @@ import java.io.IOException; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareUI; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectDescription; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.dialogs.IMessageProvider; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.core.resources.*; +import org.eclipse.core.runtime.*; +import org.eclipse.jface.dialogs.*; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; -import org.eclipse.swt.dnd.DND; -import org.eclipse.swt.dnd.DragSource; -import org.eclipse.swt.dnd.DragSourceEvent; -import org.eclipse.swt.dnd.DragSourceListener; -import org.eclipse.swt.dnd.DropTarget; -import org.eclipse.swt.dnd.DropTargetEvent; -import org.eclipse.swt.dnd.DropTargetListener; -import org.eclipse.swt.dnd.TextTransfer; -import org.eclipse.swt.dnd.Transfer; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.dnd.*; +import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; @@ -287,20 +269,15 @@ public class CompareWithOtherResourceDia } protected void initDrag() { - DragSource source = new DragSource(text, DND.DROP_MOVE - | DND.DROP_COPY | DND.DROP_DEFAULT); - Transfer[] types = new Transfer[] { TextTransfer.getInstance(), - ResourceTransfer.getInstance() }; - source.setTransfer(types); + DragSource source = new DragSource(text, DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT); + source.setTransfer(TextTransfer.getInstance(), ResourceTransfer.getInstance()); source.addDragListener(new FileTextDragListener(this)); } protected void initDrop() { DropTarget target = new DropTarget(text, DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT); - Transfer[] types = new Transfer[] { TextTransfer.getInstance(), - ResourceTransfer.getInstance() }; - target.setTransfer(types); + target.setTransfer(TextTransfer.getInstance(), ResourceTransfer.getInstance()); target.addDropListener(new FileTextDropListener(this)); } @@ -316,11 +293,7 @@ public class CompareWithOtherResourceDia protected void createMainButton(Composite parent) { super.createMainButton(parent); mainButton.setText(CompareMessages.CompareWithOtherResourceDialog_externalFileMainButton); - mainButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } + mainButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { IResource r = tmpProject.getExternalFile(); @@ -349,11 +322,7 @@ public class CompareWithOtherResourceDia protected void createMainButton(Composite parent) { super.createMainButton(parent); mainButton.setText(CompareMessages.CompareWithOtherResourceDialog_externalFolderMainButton); - mainButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } + mainButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { IResource r = tmpProject.getExternalFolder(); @@ -408,12 +377,12 @@ public class CompareWithOtherResourceDia externalFileContent, externalFolderContent }; for (int i = 0; i < elements.length; i++) { elements[i].getRadioButton().addListener(SWT.Selection, event -> { - for (int j = 0; j < elements.length; j++) { - if (event.widget != elements[j].getRadioButton()) - elements[j].setEnabled(false); + for (ContentTypeElement element : elements) { + if (event.widget != element.getRadioButton()) + element.setEnabled(false); else { - elements[j].setEnabled(true); - setResource(elements[j].getResource()); + element.setEnabled(true); + setResource(element.getResource()); } } }); @@ -463,6 +432,9 @@ public class CompareWithOtherResourceDia workspaceContent.setEnabled(false); externalFileContent.setEnabled(false); externalFolderContent.setEnabled(true); + break; + default: + break; } } } @@ -485,7 +457,6 @@ public class CompareWithOtherResourceDia private class InternalExpandable extends InternalSection { private ExpandableComposite expandable; - private Button clearButton; public InternalExpandable(Composite parent) { createContents(parent); @@ -509,13 +480,9 @@ public class CompareWithOtherResourceDia } private void createClearButton(Composite parent) { - clearButton = new Button(parent, SWT.PUSH); + Button clearButton = new Button(parent, SWT.PUSH); clearButton.setText(CompareMessages.CompareWithOtherResourceDialog_clear); - clearButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } + clearButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { clearResource(); @@ -541,7 +508,7 @@ public class CompareWithOtherResourceDia private static final String TMP_PROJECT_NAME = ".org.eclipse.compare.tmp"; //$NON-NLS-1$ - private final static String TMP_PROJECT_FILE = "\n" //$NON-NLS-1$ + private static final String TMP_PROJECT_FILE = "\n" //$NON-NLS-1$ + "\n" //$NON-NLS-1$ + "\t" + TMP_PROJECT_NAME + "\t\n" //$NON-NLS-1$ //$NON-NLS-2$ + "\t\n" //$NON-NLS-1$ @@ -552,7 +519,7 @@ public class CompareWithOtherResourceDia + "\t\n" + "\t\n" //$NON-NLS-1$//$NON-NLS-2$ + ""; //$NON-NLS-1$ - private final static String TMP_FOLDER_NAME = "tmpFolder"; //$NON-NLS-1$ + private static final String TMP_FOLDER_NAME = "tmpFolder"; //$NON-NLS-1$ private ExternalResourcesProject() { // nothing to do here @@ -671,8 +638,7 @@ public class CompareWithOtherResourceDia } private IProject getTmpProject() { - return ResourcesPlugin.getWorkspace().getRoot().getProject( - TMP_PROJECT_NAME); + return ResourcesPlugin.getWorkspace().getRoot().getProject(TMP_PROJECT_NAME); } } @@ -685,11 +651,9 @@ public class CompareWithOtherResourceDia /** * Creates the dialog. * - * @param shell - * a shell - * @param selection - * if the selection is not null, it will be set as initial files - * for comparison + * @param shell a shell + * @param selection if the selection is not null, it will be set as initial + * files for comparison * @since 3.4 */ protected CompareWithOtherResourceDialog(Shell shell, ISelection selection) { @@ -698,13 +662,6 @@ public class CompareWithOtherResourceDia this.selection = selection; } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets - * .Composite) - */ @Override protected Control createDialogArea(Composite parent) { @@ -735,18 +692,10 @@ public class CompareWithOtherResourceDia private void adjustSize(boolean expanded) { int minWidth = convertHorizontalDLUsToPixels(MIN_WIDTH); - int minHeight = convertVerticalDLUsToPixels(expanded ? MIN_HEIGHT_WITH_ANCESTOR - : MIN_HEIGHT_WITHOUT_ANCESTOR); + int minHeight = convertVerticalDLUsToPixels(expanded ? MIN_HEIGHT_WITH_ANCESTOR : MIN_HEIGHT_WITHOUT_ANCESTOR); getShell().setMinimumSize(minWidth, minHeight); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse - * .swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); @@ -771,6 +720,8 @@ public class CompareWithOtherResourceDia leftPanel.workspaceContent.setResource(selectedResources[1]); rightPanel.workspaceContent.setResource(selectedResources[2]); break; + default: + break; } setInitialContentTypes(); } @@ -790,21 +741,17 @@ public class CompareWithOtherResourceDia resources = new IResource[] { ancestorPanel.getResource(), leftPanel.getResource(), rightPanel.getResource() }; - ResourceCompareInput r = new ResourceCompareInput( - new CompareConfiguration()); + ResourceCompareInput r = new ResourceCompareInput(new CompareConfiguration()); return r.isEnabled(new StructuredSelection(resources)); } private void updateErrorInfo() { if (okButton != null) { - if (leftPanel.getResource() == null - || rightPanel.getResource() == null) { - setMessage(CompareMessages.CompareWithOtherResourceDialog_error_empty, - IMessageProvider.ERROR); + if (leftPanel.getResource() == null || rightPanel.getResource() == null) { + setMessage(CompareMessages.CompareWithOtherResourceDialog_error_empty, IMessageProvider.ERROR); okButton.setEnabled(false); } else if (!isComparePossible()) { - setMessage( - CompareMessages.CompareWithOtherResourceDialog_error_not_comparable, + setMessage(CompareMessages.CompareWithOtherResourceDialog_error_not_comparable, IMessageProvider.ERROR); okButton.setEnabled(false); } else { @@ -835,14 +782,10 @@ public class CompareWithOtherResourceDia return resources; } - /* - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() - */ @Override protected IDialogSettings getDialogBoundsSettings() { String sectionName = getClass().getName() + "_dialogBounds"; //$NON-NLS-1$ - IDialogSettings settings = CompareUIPlugin.getDefault() - .getDialogSettings(); + IDialogSettings settings = CompareUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(sectionName); if (section == null) section = settings.addNewSection(sectionName); diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceHandler.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceHandler.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceHandler.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceHandler.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ContentChangeNotifier.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ContentChangeNotifier.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ContentChangeNotifier.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ContentChangeNotifier.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImageDescriptor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImageDescriptor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImageDescriptor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImageDescriptor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocumentManager.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocumentManager.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocumentManager.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocumentManager.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ExceptionHandler.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ExceptionHandler.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ExceptionHandler.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ExceptionHandler.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareContextIds.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareContextIds.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareContextIds.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareContextIds.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IFlushable2.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IFlushable2.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IFlushable2.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IFlushable2.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageCanvas.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageCanvas.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageCanvas.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageCanvas.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2016 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IMergeViewerTestAdapter.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IMergeViewerTestAdapter.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IMergeViewerTestAdapter.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IMergeViewerTestAdapter.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2013 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ISavingSaveable.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ISavingSaveable.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ISavingSaveable.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ISavingSaveable.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IViewerDescriptor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IViewerDescriptor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IViewerDescriptor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IViewerDescriptor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ListContentProvider.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ListContentProvider.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ListContentProvider.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ListContentProvider.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/LineComparator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/LineComparator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/LineComparator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/LineComparator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2004, 2011 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MirroredMergeViewerContentProvider.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MirroredMergeViewerContentProvider.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MirroredMergeViewerContentProvider.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MirroredMergeViewerContentProvider.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 Conrad Groth and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Conrad Groth - Bug 213780 - Compare With direction should be configurable diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationEndDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationEndDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationEndDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationEndDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NullViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NullViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NullViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NullViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OutlineViewerCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OutlineViewerCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OutlineViewerCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OutlineViewerCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/FilePatch.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/FilePatch.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/FilePatch.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/FilePatch.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkDiffNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkDiffNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkDiffNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkDiffNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkTypedElement.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkTypedElement.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkTypedElement.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/HunkTypedElement.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -529,7 +532,9 @@ public class InputPatchPage extends Wiza fWorkspaceSelectLabel.setText(PatchMessages.InputPatchPage_WorkspaceSelectPatch_text); fTreeViewer= new TreeViewer(newComp, SWT.BORDER); - fTreeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true); + layoutData.heightHint = 300; + fTreeViewer.getTree().setLayoutData(layoutData); fTreeViewer.setLabelProvider(new WorkbenchLabelProvider()); fTreeViewer.setContentProvider(new WorkbenchContentProvider()); diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,22 +14,14 @@ *******************************************************************************/ package org.eclipse.compare.internal.patch; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.io.*; +import java.util.*; import org.eclipse.compare.internal.CompareUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Platform; public class LineReader { /** @@ -80,9 +75,7 @@ public class LineReader { public static List readLines(BufferedReader reader) { List lines; LineReader lr = new LineReader(reader); - if (!Platform.WS_CARBON.equals(Platform.getWS())) - // Don't treat single CRs as line feeds to be consistent with command line patch - lr.ignoreSingleCR(); + lr.ignoreSingleCR(); // Don't treat single CRs as line feeds to be consistent with command line patch lines = lr.readLines(); return lines; } diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareEditorInput.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareEditorInput.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareEditorInput.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareEditorInput.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchDiffNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchDiffNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchDiffNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchDiffNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileDiffNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileDiffNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileDiffNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileDiffNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileTypedElement.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileTypedElement.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileTypedElement.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileTypedElement.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2011 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizardDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizardDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizardDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizardDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2012 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/RetargetPatchElementDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/RetargetPatchElementDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/RetargetPatchElementDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/RetargetPatchElementDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/UnmatchedHunkTypedElement.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/UnmatchedHunkTypedElement.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/UnmatchedHunkTypedElement.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/UnmatchedHunkTypedElement.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Utilities.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Utilities.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Utilities.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Utilities.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspaceFileDiffResult.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspaceFileDiffResult.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspaceFileDiffResult.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspaceFileDiffResult.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Policy.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Policy.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Policy.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Policy.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015, 2017 Google, Inc and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stefan Xenos (Google) - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2011 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithPreviousEditionAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithPreviousEditionAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithPreviousEditionAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithPreviousEditionAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResizableDialog.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResizableDialog.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResizableDialog.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResizableDialog.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/StreamMergerDescriptor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/StreamMergerDescriptor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/StreamMergerDescriptor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/StreamMergerDescriptor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/StructureCreatorDescriptor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/StructureCreatorDescriptor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/StructureCreatorDescriptor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/StructureCreatorDescriptor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextEditorPropertyAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextEditorPropertyAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextEditorPropertyAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextEditorPropertyAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextMergeViewerCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextMergeViewerCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextMergeViewerCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextMergeViewerCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerSwitchingCancelled.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerSwitchingCancelled.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerSwitchingCancelled.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerSwitchingCancelled.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2013 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkerJob.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkerJob.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkerJob.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkerJob.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkQueue.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkQueue.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkQueue.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/WorkQueue.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IPropertyChangeNotifier.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IPropertyChangeNotifier.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IPropertyChangeNotifier.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IPropertyChangeNotifier.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IResourceProvider.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ISharedDocumentAdapter.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ISharedDocumentAdapter.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ISharedDocumentAdapter.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ISharedDocumentAdapter.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessor.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessor.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessor.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessor.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ITypedElement.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ITypedElement.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ITypedElement.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ITypedElement.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IViewerCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IViewerCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IViewerCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/IViewerCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/NavigationAction.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/NavigationAction.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/NavigationAction.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/NavigationAction.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/ApplyPatchOperation.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/ApplyPatchOperation.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/ApplyPatchOperation.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/ApplyPatchOperation.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/IFilePatch.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/IFilePatch.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/IFilePatch.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/IFilePatch.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/WorkspacePatcherUI.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/WorkspacePatcherUI.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/WorkspacePatcherUI.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/WorkspacePatcherUI.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/SharedDocumentAdapter.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/SharedDocumentAdapter.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/SharedDocumentAdapter.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/SharedDocumentAdapter.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2013 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2009 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2011 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInputChangeListener.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInputChangeListener.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInputChangeListener.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInputChangeListener.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInput.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInput.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInput.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInput.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffElement.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffElement.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffElement.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffElement.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/SharedDocumentAdapterWrapper.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/SharedDocumentAdapterWrapper.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/SharedDocumentAdapterWrapper.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/SharedDocumentAdapterWrapper.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureRootNode.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureRootNode.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureRootNode.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureRootNode.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2011 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java --- 4.8-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java 2018-08-27 13:38:05.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.compare/component.xml 4.9-1/bundles/org.eclipse.compare/component.xml --- 4.8-1/bundles/org.eclipse.compare/component.xml 2018-05-15 08:58:13.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.compare/component.xml 2018-08-27 13:38:05.000000000 +0000 @@ -2,10 +2,13 @@