Skip to content
Commits on Source (6)
Show whitespace changes
Inline Side-by-side
bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
View file @ 17a2ec42
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.core
Bundle-Version: 3.6.300.qualifier
Bundle-Version: 3.6.400.qualifier
Bundle-Activator: org.eclipse.compare.internal.core.ComparePlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
......
bundles/org.eclipse.compare.core/pom.xml
View file @ 17a2ec42
......@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.team</artifactId>
<groupId>eclipse.platform.team</groupId>
<version>4.10.0-SNAPSHOT</version>
<version>4.11.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.core</artifactId>
<version>3.6.300-SNAPSHOT</version>
<version>3.6.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/TextLineLCS.java
View file @ 17a2ec42
......@@ -129,7 +129,7 @@ public class TextLineLCS extends LCS {
* @return the array of TextLine object each corresponding to a line of text
*/
public static TextLine[] getTextLines(String text) {
List lines = new ArrayList();
List<TextLine> lines = new ArrayList<>();
int begin = 0;
int end = getEOL(text, 0);
int lineNum = 0;
......
bundles/org.eclipse.compare.core/src/org/eclipse/compare/patch/PatchBuilder.java
View file @ 17a2ec42
......@@ -237,9 +237,9 @@ public class PatchBuilder {
}
}
static class HunkComparator implements Comparator {
static class HunkComparator implements Comparator<IHunk> {
@Override
public int compare(Object arg0, Object arg1) {
public int compare(IHunk arg0, IHunk arg1) {
if ((arg0 != null && arg0 instanceof Hunk)
&& (arg1 != null && arg1 instanceof Hunk)) {
Hunk hunk0 = (Hunk) arg0;
......
bundles/org.eclipse.compare.core/src/org/eclipse/compare/patch/PatchConfiguration.java
View file @ 17a2ec42
......@@ -13,9 +13,7 @@
*******************************************************************************/
package org.eclipse.compare.patch;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.*;
/**
* A patch configuration allows clients to set parameters that control how a
......@@ -32,8 +30,8 @@ public class PatchConfiguration {
private int fFuzz;
private boolean fIgnoreWhitespace= false;
private boolean fReverse= false;
private HashMap properties = new HashMap();
private List hunkFilters = new ArrayList();
private HashMap<String, Object> properties = new HashMap<>();
private List<IHunkFilter> hunkFilters = new ArrayList<>();
/**
* Return whether the patch should be reversed when applied.
......@@ -154,7 +152,7 @@ public class PatchConfiguration {
* @since org.eclipse.compare.core 3.5
*/
public IHunkFilter[] getHunkFilters() {
return (IHunkFilter[]) this.hunkFilters.toArray(new IHunkFilter[this.hunkFilters
return this.hunkFilters.toArray(new IHunkFilter[this.hunkFilters
.size()]);
}
......
bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
View file @ 17a2ec42
......@@ -22,7 +22,7 @@ import java.util.List;
*/
/* package */ class DifferencesIterator {
List fRange;
List<RangeDifference> fRange;
int fIndex;
RangeDifference[] fArray;
RangeDifference fDifference;
......@@ -34,7 +34,7 @@ import java.util.List;
this.fArray= differenceRanges;
this.fIndex= 0;
this.fRange= new ArrayList();
this.fRange= new ArrayList<>();
if (this.fIndex < this.fArray.length)
this.fDifference= this.fArray[this.fIndex++];
else
......
bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java
View file @ 17a2ec42
......@@ -18,9 +18,7 @@ import java.util.List;
import org.eclipse.compare.internal.core.LCS;
import org.eclipse.compare.internal.core.Messages;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.*;
/* package */ class RangeComparatorLCS extends LCS {
......@@ -73,7 +71,7 @@ import org.eclipse.core.runtime.SubMonitor;
public RangeDifference[] getDifferences(SubMonitor subMonitor, AbstractRangeDifferenceFactory factory) {
try {
List differences = new ArrayList();
List<RangeDifference> differences = new ArrayList<>();
int length = getLength();
if (length == 0) {
differences.add(factory.createRangeDifference(RangeDifference.CHANGE, 0, this.comparator2.getRangeCount(), 0, this.comparator1.getRangeCount()));
......@@ -131,7 +129,7 @@ import org.eclipse.core.runtime.SubMonitor;
}
}
return (RangeDifference[]) differences.toArray(new RangeDifference[differences.size()]);
return differences.toArray(new RangeDifference[differences.size()]);
} finally {
subMonitor.done();
}
......
bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
View file @ 17a2ec42
......@@ -17,9 +17,7 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.compare.internal.core.Messages;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.*;
/**
* A <code>RangeDifferencer</code> finds the differences between two or three <code>IRangeComparator</code>s.
......@@ -168,7 +166,7 @@ public final class RangeDifferencer {
DifferencesIterator myIter= new DifferencesIterator(rightAncestorScript);
DifferencesIterator yourIter= new DifferencesIterator(leftAncestorScript);
List diff3= new ArrayList();
List<RangeDifference> diff3= new ArrayList<>();
diff3.add(factory.createRangeDifference(RangeDifference.ERROR)); // add a sentinel
int changeRangeStart= 0;
......@@ -239,7 +237,7 @@ public final class RangeDifferencer {
// remove sentinel
diff3.remove(0);
return (RangeDifference[]) diff3.toArray(EMPTY_RESULT);
return diff3.toArray(EMPTY_RESULT);
} finally {
if (pm != null)
pm.done();
......@@ -289,7 +287,7 @@ public final class RangeDifferencer {
*/
public static RangeDifference[] findRanges(AbstractRangeDifferenceFactory factory, IProgressMonitor pm, IRangeComparator left, IRangeComparator right) {
RangeDifference[] in= findDifferences(factory, pm, left, right);
List out= new ArrayList();
List<RangeDifference> out= new ArrayList<>();
RangeDifference rd;
......@@ -312,7 +310,7 @@ public final class RangeDifferencer {
if (rd.maxLength() > 0)
out.add(rd);
return (RangeDifference[]) out.toArray(EMPTY_RESULT);
return out.toArray(EMPTY_RESULT);
}
/**
......@@ -369,7 +367,7 @@ public final class RangeDifferencer {
return findRanges(factory,pm, left, right);
RangeDifference[] in= findDifferences(factory, pm, ancestor, left, right);
List out= new ArrayList();
List<RangeDifference> out= new ArrayList<>();
RangeDifference rd;
......@@ -394,7 +392,7 @@ public final class RangeDifferencer {
if (rd.maxLength() > 0)
out.add(rd);
return (RangeDifference[]) out.toArray(EMPTY_RESULT);
return out.toArray(EMPTY_RESULT);
}
//---- private methods
......@@ -403,13 +401,13 @@ public final class RangeDifferencer {
* Creates a <code>RangeDifference3</code> given the
* state of two DifferenceIterators.
*/
private static RangeDifference createRangeDifference3(AbstractRangeDifferenceFactory configurator, DifferencesIterator myIter, DifferencesIterator yourIter, List diff3,
private static RangeDifference createRangeDifference3(AbstractRangeDifferenceFactory configurator, DifferencesIterator myIter, DifferencesIterator yourIter, List<RangeDifference> diff3,
IRangeComparator right, IRangeComparator left, int changeRangeStart, int changeRangeEnd) {
int rightStart, rightEnd;
int leftStart, leftEnd;
int kind= RangeDifference.ERROR;
RangeDifference last= (RangeDifference) diff3.get(diff3.size() - 1);
RangeDifference last= diff3.get(diff3.size() - 1);
Assert.isTrue((myIter.getCount() != 0 || yourIter.getCount() != 0)); // At least one range array must be non-empty
//
......@@ -420,8 +418,8 @@ public final class RangeDifferencer {
rightEnd= changeRangeEnd - last.ancestorEnd() + last.rightEnd();
kind= RangeDifference.LEFT;
} else {
RangeDifference f= (RangeDifference) myIter.fRange.get(0);
RangeDifference l= (RangeDifference) myIter.fRange.get(myIter.fRange.size() - 1);
RangeDifference f= myIter.fRange.get(0);
RangeDifference l= myIter.fRange.get(myIter.fRange.size() - 1);
rightStart= changeRangeStart - f.leftStart + f.rightStart;
rightEnd= changeRangeEnd - l.leftEnd() + l.rightEnd();
}
......@@ -431,8 +429,8 @@ public final class RangeDifferencer {
leftEnd= changeRangeEnd - last.ancestorEnd() + last.leftEnd();
kind= RangeDifference.RIGHT;
} else {
RangeDifference f= (RangeDifference) yourIter.fRange.get(0);
RangeDifference l= (RangeDifference) yourIter.fRange.get(yourIter.fRange.size() - 1);
RangeDifference f= yourIter.fRange.get(0);
RangeDifference l= yourIter.fRange.get(yourIter.fRange.size() - 1);
leftStart= changeRangeStart - f.leftStart + f.rightStart;
leftEnd= changeRangeEnd - l.leftEnd() + l.rightEnd();
}
......
bundles/org.eclipse.compare.win32/.settings/.api_filters deleted 100644 → 0
View file @ 919d8a4a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.compare.win32" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Bug 516457: Many of plug-ins need a version increase" id="926941240">
<message_arguments>
<message_argument value="1.2.0"/>
<message_argument value="1.1.0"/>
</message_arguments>
</filter>
</resource>
</component>
bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF
View file @ 17a2ec42
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.win32;singleton:=true
Bundle-Version: 1.2.300.qualifier
Bundle-Version: 1.2.400.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (osgi.os=win32)
......
bundles/org.eclipse.compare.win32/pom.xml
View file @ 17a2ec42
......@@ -14,12 +14,12 @@
<parent>
<artifactId>eclipse.platform.team</artifactId>
<groupId>eclipse.platform.team</groupId>
<version>4.10.0-SNAPSHOT</version>
<version>4.11.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.win32</artifactId>
<version>1.2.300-SNAPSHOT</version>
<version>1.2.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
......
bundles/org.eclipse.compare/.settings/.api_filters deleted 100644 → 0
View file @ 919d8a4a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.compare" version="2">
<resource path="compare/org/eclipse/compare/ICompareFilter.java" type="org.eclipse.compare.ICompareFilter">
<filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="406052990">
<message_arguments>
<message_argument value="org.eclipse.compare.ICompareFilter"/>
<message_argument value="canCacheFilteredRegions()"/>
</message_arguments>
</filter>
<filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="406052990">
<message_arguments>
<message_argument value="org.eclipse.compare.ICompareFilter"/>
<message_argument value="getFilteredRegions(HashMap)"/>
</message_arguments>
</filter>
<filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="406052990">
<message_arguments>
<message_argument value="org.eclipse.compare.ICompareFilter"/>
<message_argument value="isEnabledInitially()"/>
</message_arguments>
</filter>
<filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="406052990">
<message_arguments>
<message_argument value="org.eclipse.compare.ICompareFilter"/>
<message_argument value="setInput(Object, Object, Object, Object)"/>
</message_arguments>
</filter>
</resource>
</component>
bundles/org.eclipse.compare/.settings/org.eclipse.jdt.ui.prefs
View file @ 17a2ec42
......@@ -5,9 +5,9 @@ formatter_settings_version=14
internal.default.compliance=user
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=java;javax;org;com;
org.eclipse.jdt.ui.ondemandthreshold=3
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.staticondemandthreshold=99
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n *\r\n * Contributors\:\r\n * IBM Corporation - initial API and implementation\r\n *******************************************************************************/\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier\: EPL-2.0\r\n *\r\n * Contributors\:\r\n * IBM Corporation - initial API and implementation\r\n *******************************************************************************/\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=false
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=false
......
bundles/org.eclipse.compare/META-INF/MANIFEST.MF
View file @ 17a2ec42
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare; singleton:=true
Bundle-Version: 3.7.400.qualifier
Bundle-Version: 3.7.500.qualifier
Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......@@ -23,7 +23,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
org.eclipse.compare.core;bundle-version="[3.5.0,4.0.0)";visibility:=reexport
org.eclipse.compare.core;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Import-Package: com.ibm.icu.util,
com.ibm.icu.text
......
bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
View file @ 17a2ec42
......@@ -58,7 +58,13 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.IFindReplaceTarget;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.*;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
......@@ -610,7 +616,8 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
/**
* @param parent the parent control under which the control must be created
* @param direction the layout direction of the contents, either </code>SWT.HORIZONTAL<code> or </code>SWT.VERTICAL<code>
* @param direction the layout direction of the contents, either
* <code>SWT.HORIZONTAL</code> or <code>SWT.VERTICAL</code>
* @return the SWT control hierarchy for the outline part of the compare editor
* @since 3.0
*/
......@@ -1153,13 +1160,13 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
/**
* Saves any unsaved changes.
* Subclasses must override to save any changes.
* This implementation tries to flush changes in all viewers by
* calling <code>ISavable.save</code> on them.
* Saves any unsaved changes. Subclasses must override to save any changes. This
* implementation tries to flush changes in all viewers by calling
* <code>ISavable.save</code> on them.
*
* @param monitor an <code>IProgressMonitor</code> that the implementation of save may use to show progress
* @throws CoreException
* @param monitor an <code>IProgressMonitor</code> that the implementation of
* save may use to show progress
* @throws CoreException If save fails.
* @since 2.0
*/
public void saveChanges(IProgressMonitor monitor) throws CoreException {
......@@ -1182,7 +1189,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
/**
* @param monitor
* @param monitor a progress monitor
* @noreference This method is not intended to be referenced by clients.
*/
protected void flushLeftViewers(IProgressMonitor monitor) {
......@@ -1194,7 +1201,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
}
/**
* @param monitor
* @param monitor a progress monitor
* @noreference This method is not intended to be referenced by clients.
*/
protected void flushRightViewers(IProgressMonitor monitor) {
......
bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
View file @ 17a2ec42
......@@ -15,7 +15,10 @@ package org.eclipse.compare;
import java.util.ResourceBundle;
import org.eclipse.compare.internal.*;
import org.eclipse.compare.internal.CompareUIPlugin;
import org.eclipse.compare.internal.DocumentManager;
import org.eclipse.compare.internal.ICompareUIConstants;
import org.eclipse.compare.internal.StructureCreatorDescriptor;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.compare.structuremergeviewer.IStructureCreator;
import org.eclipse.core.runtime.IAdaptable;
......
bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
View file @ 17a2ec42
......@@ -13,10 +13,31 @@
*******************************************************************************/
package org.eclipse.compare;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.MessageFormat;
import com.ibm.icu.util.Calendar;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.ResourceBundle;
import org.eclipse.compare.internal.CompareContainer;
import org.eclipse.compare.internal.CompareUIPlugin;
import org.eclipse.compare.internal.ResizableDialog;
import org.eclipse.compare.internal.StructureCreatorDescriptor;
import org.eclipse.compare.internal.Utilities;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.compare.structuremergeviewer.IStructureComparator;
import org.eclipse.compare.structuremergeviewer.IStructureCreator;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
......@@ -35,24 +56,9 @@ import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.*;
import java.util.*;
import org.eclipse.compare.internal.CompareContainer;
import org.eclipse.compare.internal.CompareUIPlugin;
import org.eclipse.compare.internal.ResizableDialog;
import org.eclipse.compare.internal.StructureCreatorDescriptor;
import org.eclipse.compare.internal.Utilities;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.compare.structuremergeviewer.IStructureComparator;
import org.eclipse.compare.structuremergeviewer.IStructureCreator;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.MessageFormat;
import com.ibm.icu.util.Calendar;
/**
......
bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
View file @ 17a2ec42
......@@ -13,25 +13,22 @@
*******************************************************************************/
package org.eclipse.compare;
import java.io.InputStream;
import java.io.BufferedInputStream;
import java.io.InputStream;
import org.eclipse.swt.graphics.Image;
import org.eclipse.compare.IResourceProvider;
import org.eclipse.core.resources.IEncodedStorage;
import org.eclipse.core.resources.IFileState;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.swt.graphics.Image;
/**
* A combination <code>IFileState</code> and <code>ITypedElement</code> that can be used as
* an input to a compare viewer or other places where an <code>IStreamContentAccessor</code>
* is needed.
* <p>
* <p>
* Clients may instantiate this class; it is not intended to be subclassed.
* </p>
* @noextend This class is not intended to be subclassed by clients.
......
bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareContainer.java
View file @ 17a2ec42
......@@ -19,7 +19,9 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.ui.*;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.services.IServiceLocator;
/**
......
bundles/org.eclipse.compare/compare/org/eclipse/compare/IViewerCreator.java
View file @ 17a2ec42
......@@ -13,9 +13,8 @@
*******************************************************************************/
package org.eclipse.compare;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Composite;
/**
* A factory object for <code>Viewer</code>.
......