Skip to content
Commits on Source (4)
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.core
Bundle-Version: 3.6.400.qualifier
Bundle-Version: 3.6.500.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)"
......
......@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.team</artifactId>
<groupId>eclipse.platform.team</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.core</artifactId>
<version>3.6.400-SNAPSHOT</version>
<version>3.6.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -185,9 +185,6 @@ import org.eclipse.core.runtime.*;
}
}
/* (non-Javadoc)
* @see org.eclipse.compare.internal.LCS#longestCommonSubsequence(org.eclipse.core.runtime.SubMonitor)
*/
@Override
public void longestCommonSubsequence(SubMonitor subMonitor) {
super.longestCommonSubsequence(subMonitor);
......
......@@ -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.400.qualifier
Bundle-Version: 1.2.500.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (osgi.os=win32)
......
......@@ -14,12 +14,12 @@
<parent>
<artifactId>eclipse.platform.team</artifactId>
<groupId>eclipse.platform.team</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.win32</artifactId>
<version>1.2.400-SNAPSHOT</version>
<version>1.2.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
......
......@@ -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.500.qualifier
Bundle-Version: 3.7.600.qualifier
Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
......@@ -46,9 +46,6 @@ public abstract class BufferedContent implements IContentChangeNotifier, IStream
// empty implementation
}
/* (non-Javadoc)
* see IStreamContentAccessor.getContents
*/
@Override
public InputStream getContents() throws CoreException {
if (fContent != null)
......@@ -102,9 +99,6 @@ public abstract class BufferedContent implements IContentChangeNotifier, IStream
fContent= null;
}
/* (non-Javadoc)
* see IContentChangeNotifier.addChangeListener
*/
@Override
public void addContentChangeListener(IContentChangeListener listener) {
if (fChangeNotifier == null)
......@@ -112,9 +106,6 @@ public abstract class BufferedContent implements IContentChangeNotifier, IStream
fChangeNotifier.addContentChangeListener(listener);
}
/* (non-Javadoc)
* see IContentChangeNotifier.removeChangeListener
*/
@Override
public void removeContentChangeListener(IContentChangeListener listener) {
if (fChangeNotifier != null) {
......
......@@ -51,49 +51,31 @@ public class HistoryItem implements IEncodedStreamContentAccessor, ITypedElement
fFileState= fileState;
}
/* (non-Javadoc)
* see ITypedElement.getName
*/
@Override
public String getName() {
return fBase.getName();
}
/* (non-Javadoc)
* see ITypedElement.getImage
*/
@Override
public Image getImage() {
return fBase.getImage();
}
/* (non-Javadoc)
* see ITypedElement.getType
*/
@Override
public String getType() {
return fBase.getType();
}
/* (non-Javadoc)
* see IModificationDate.getModificationDate
*/
@Override
public long getModificationDate() {
return fFileState.getModificationTime();
}
/* (non-Javadoc)
* see IStreamContentAccessor.getContents
*/
@Override
public InputStream getContents() throws CoreException {
return new BufferedInputStream(fFileState.getContents());
}
/* (non-Javadoc)
* @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
*/
@Override
public String getCharset() throws CoreException {
String charset= fFileState.getCharset();
......@@ -105,9 +87,6 @@ public class HistoryItem implements IEncodedStreamContentAccessor, ITypedElement
return charset;
}
/* (non-Javadoc)
* @see org.eclipse.compare.internal.IResourceProvider#getResource()
*/
@Override
public IResource getResource() {
IPath fullPath= fFileState.getFullPath();
......